2
0
forked from Wavyzz/dolibarr
Commit Graph

6320 Commits

Author SHA1 Message Date
Laurent Destailleur
ede05e03ba Merge pull request #12417 from frederic34/patch-7
doxygen
2019-11-13 18:34:29 +01:00
Laurent Destailleur
7118dbbd1d Fix var not defined 2019-11-13 18:25:48 +01:00
Laurent Destailleur
89bf35a8bf Fix default value show must match the theme selected 2019-11-12 21:54:41 +01:00
Frédéric FRANCE
7ce297c6cc doxygen 2019-11-12 21:53:17 +01:00
Laurent Destailleur
03e35623c6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-11-12 00:43:37 +01:00
Laurent Destailleur
8be0a6d470 Fix: Can set savingdocmask by caller. Fix permissions names.
Fix: Disable crop on svg images.
2019-11-12 00:43:26 +01:00
Scrutinizer Auto-Fixer
038bda254d Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-11 22:59:36 +00:00
Laurent Destailleur
5eb03cf6ad Avoid false positive. 2019-11-11 13:26:48 +01:00
Laurent Destailleur
771f304c79 Fix typo 2019-11-09 18:40:08 +01:00
Anthony Berton
4449c6d2a7 Update functions.lib.php 2019-11-08 16:34:20 +01:00
Laurent Destailleur
d1c49c7021 Fix trans 2019-11-08 10:24:03 +01:00
Laurent Destailleur
34beca0758 Fix var not not consistent 2019-11-07 16:33:11 +01:00
Laurent Destailleur
8318db85a3 Fix typo 2019-11-07 16:32:44 +01:00
Laurent Destailleur
c0b8684475 Merge pull request #12341 from inoveaconseil/bankStatementDocument
NEW add upload for account statement
2019-11-07 15:06:47 +01:00
Nicolas
f18bca7687 Merge remote-tracking branch 'origin/bankStatementDocument' into bankStatementDocument 2019-11-06 20:51:17 +01:00
Inovea Conseil
fed6ed8760 Merge remote-tracking branch 'Dolibarr/develop' into bankStatementDocument 2019-11-06 20:48:24 +01:00
Frédéric FRANCE
35751a80ab 100% centpercent 2019-11-05 21:24:41 +01:00
stickler-ci
f537ae60b6 Fixing style errors. 2019-11-05 12:52:58 +00:00
Nicolas
991e1b2747 NEW Add upload document on account statement 2019-11-05 13:51:52 +01:00
Laurent Destailleur
747113551b Debug pagination of bookmark list 2019-11-05 09:52:33 +01:00
Laurent Destailleur
1aef1c60dd Merge pull request #11867 from frederic34/socialnetworks
NEW add socialnetworks dictionary
2019-11-04 21:10:22 +01:00
Laurent Destailleur
c276659acd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/core/lib/ticket.lib.php
2019-11-04 20:37:49 +01:00
Laurent Destailleur
e60fff39d9 Fix phpcs 2019-11-04 20:36:55 +01:00
Laurent Destailleur
0347d82660 Merge pull request #12303 from frederic34/patch-2
css
2019-11-04 20:31:02 +01:00
Laurent Destailleur
ec8bd6327d Fix css 2019-11-04 18:53:46 +01:00
Laurent Destailleur
6e591d2be0 Fix css 2019-11-04 18:25:32 +01:00
Laurent Destailleur
8aa2fd04ad NEW The integrity checker now show the expected size of files 2019-11-04 13:23:48 +01:00
Frédéric FRANCE
872f58f261 Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-11-03 21:48:24 +01:00
Laurent Destailleur
99a4781a42 Fix better support for multicurrency for template invoices 2019-11-03 18:58:26 +01:00
Frédéric FRANCE
3e2d89dc02 Update ticket.lib.php 2019-11-02 18:16:09 +01:00
Laurent Destailleur
496f93911f Merge pull request #11821 from Tim-Otte/develop
NEW Extrafields support in product supplier prices
2019-11-02 16:19:13 +01:00
Laurent Destailleur
df750b6a9d Merge pull request #12287 from TobiasSekan/AddAttendeeToIcal
NEW Add attendee to ical export + cleanup
2019-11-02 13:40:27 +01:00
Laurent Destailleur
e087ac434d Merge pull request #12283 from frederic34/socid
replace deprecated user->societe_id by user->socid
2019-11-02 13:34:21 +01:00
Laurent Destailleur
04a5054e1c Merge pull request #12279 from atm-john/develop_ticket_file_display
New - ticket file download button display
2019-11-02 13:32:33 +01:00
Laurent Destailleur
58ffb73627 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-11-02 12:59:49 +01:00
Laurent Destailleur
45c77b4560 Renaming some libelle into label 2019-11-02 12:59:38 +01:00
Laurent Destailleur
25e64b0610 Merge branch 'develop' into socid 2019-11-02 12:01:06 +01:00
stickler-ci
b43d06db37 Fixing style errors. 2019-11-02 10:55:24 +00:00
Laurent Destailleur
37f4ebb1b2 Update xcal.lib.php 2019-11-02 11:56:01 +01:00
Laurent Destailleur
d9f333d828 Merge pull request #12289 from frederic34/datetime
php is > 5.4
2019-11-02 11:46:34 +01:00
Laurent Destailleur
f9031cdbfd Clean code 2019-11-02 11:36:48 +01:00
Frédéric FRANCE
77d4ca81dc Merge remote-tracking branch 'upstream/develop' into socid 2019-11-02 09:14:15 +01:00
Laurent Destailleur
cea2c3a9f4 Look and feel v11 2019-11-01 23:58:14 +01:00
Laurent Destailleur
8608c5db9c Fix color of task progression 2019-11-01 23:16:08 +01:00
Frédéric FRANCE
dbed10a701 Merge remote-tracking branch 'upstream/develop' into socid 2019-11-01 21:39:20 +01:00
Laurent Destailleur
2af23aa658 Enhance modulebuilder 2019-11-01 17:54:17 +01:00
Laurent Destailleur
a1b2130247 Enhance the progress bar of tasks 2019-11-01 16:09:31 +01:00
Laurent Destailleur
135e65c4aa Look and feel v11
Enhance the progress bar of tasks
2019-11-01 15:53:57 +01:00
Frédéric FRANCE
da238e94e1 php is > 5.4 2019-11-01 15:21:21 +01:00
Sekan, Tobias
e27f1c623d Merge branch 'AddAttendeeToIcal' of https://github.com/TobiasSekan/dolibarr into develop 2019-11-01 13:16:54 +01:00