Commit Graph

74287 Commits

Author SHA1 Message Date
stickler-ci
375bcf8720 Fixing style errors. 2020-03-15 07:01:36 +00:00
Alexandre SPANGARO
789529c0e0 Work on reconciliation of accouting account 2020-03-15 07:55:35 +01:00
Alexandre SPANGARO
bc717bc6ae Work on reconciliation of accouting account 2020-03-15 07:49:24 +01:00
Laurent Destailleur
92f4250a02 Fxi trans 2020-03-14 22:22:55 +01:00
Laurent Destailleur
54d9f6a703 Deprecated comment 2020-03-14 16:35:16 +01:00
Laurent Destailleur
aef827f826 Alias on same line than name 2020-03-14 14:47:01 +01:00
Laurent Destailleur
f92943bee2 css 2020-03-14 03:24:46 +01:00
Laurent Destailleur
0d2d2302d5 Removed not relevant graph on stats on project 2020-03-14 03:18:49 +01:00
Laurent Destailleur
6e71bb8707 Look and feel v12: Use color of status for dotnuts 2020-03-14 02:17:08 +01:00
Laurent Destailleur
3b72005f93 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/card.php
	htdocs/filefunc.inc.php
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/cashdesk.lang
	htdocs/langs/fr_FR/errors.lang
	htdocs/langs/fr_FR/products.lang
	htdocs/langs/fr_FR/projects.lang
2020-03-14 00:22:11 +01:00
Laurent Destailleur
8a9553522f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-03-14 00:14:52 +01:00
Laurent Destailleur
f774733fcb Sync transifex 2020-03-14 00:14:42 +01:00
Laurent Destailleur
30bcf1d244 Uniformize code 2020-03-13 18:51:58 +01:00
Laurent Destailleur
880cfd1659 FIX #13332 Add more details on screen and help so it is easier to
understand the choices of the computer. Copy code into the automatic
binding to have rule consistent.
2020-03-13 18:10:00 +01:00
Laurent Destailleur
36873f2db7 Fix bad include 2020-03-13 17:22:54 +01:00
Laurent Destailleur
41a2304470
Merge pull request #13332 from aspangaro/12.0_a21
FIX: Accounting management of intra-community sales to a non-taxable thirdparty
2020-03-13 17:01:13 +01:00
Laurent Destailleur
a437125962
Merge pull request #13341 from OPEN-DSI/new-takepos-numbering-modules
NEW add numbering module for cash desk
2020-03-13 16:58:27 +01:00
Laurent Destailleur
6948e347c4
Merge pull request #13329 from atm-florian/fix_11_multiEntityOnCommCardElement
Fix 11 multi entity on comm card element
2020-03-13 16:57:10 +01:00
Laurent Destailleur
618d276349
Merge pull request #13335 from FHenry/dev_ldcompta10
NEW : accounting export LD compta version 10
2020-03-13 16:55:42 +01:00
Laurent Destailleur
4841a5bf4a Fix look and feel v11 2020-03-13 16:53:37 +01:00
Laurent Destailleur
c605b743e6 Fix look and feel v11 2020-03-13 16:52:00 +01:00
Laurent Destailleur
99669583d5 Fix phpcs 2020-03-13 16:46:07 +01:00
florian HENRY
ca269864f7 let keep it to expedition 2020-03-13 14:55:34 +01:00
Laurent Destailleur
d90bf25351 Fix phpcs 2020-03-13 13:11:04 +01:00
Laurent Destailleur
33c5db9cc3 Prepare code for the new pagination possibility 2020-03-13 13:07:11 +01:00
Laurent Destailleur
52290b002a NEW Another way to navigate between pages for some lists 2020-03-13 12:53:22 +01:00
Laurent Destailleur
893ae21d3a Fix phpcs 2020-03-13 11:29:27 +01:00
Laurent Destailleur
1ff102f62a Prepare 11.0.3 2020-03-13 10:31:28 +01:00
Laurent Destailleur
d3447bb44b Fix duplicate / 2020-03-13 10:14:26 +01:00
Laurent Destailleur
3cf7105635 Fix language in sublang dir 2020-03-13 10:05:54 +01:00
Laurent Destailleur
4bd1c6c717 Fix hreflink 2020-03-13 09:51:41 +01:00
Laurent Destailleur
68f14ef483 Fix missing js 2020-03-13 09:37:26 +01:00
VESSILLER
826ed67921 FIX travis errors sql escape 2020-03-13 09:01:22 +01:00
Laurent Destailleur
6dda972ff5 Doxygen 2020-03-13 04:12:42 +01:00
Laurent Destailleur
29843165ec Use the header and footer of public pages for the payment ok and ko page 2020-03-13 03:28:13 +01:00
Laurent Destailleur
35fae3ec5d NEW Upgrade Stripe library to 6.43.1 2020-03-13 03:07:28 +01:00
Laurent Destailleur
f3996c0038 Code comment 2020-03-13 02:35:28 +01:00
Laurent Destailleur
94589158c0 Move class from external project as internal class (project is dead) 2020-03-13 02:32:33 +01:00
Laurent Destailleur
f07d228537 Upgrade mobiledetect from 2.8.33 to 2.8.34 2020-03-13 02:28:01 +01:00
Laurent Destailleur
fede6da5cf Move Chartjs into correct dir name 2020-03-13 02:17:15 +01:00
Laurent Destailleur
6f636d6d69 NEW Add field author public alias for blog post on website module 2020-03-12 20:50:36 +01:00
Laurent Destailleur
864c903d05 FIX #13294 2020-03-12 18:55:08 +01:00
Laurent Destailleur
7e428885cc Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-03-12 18:34:43 +01:00
VESSILLER
04c0332bee FIX travis errors 2020-03-12 18:31:43 +01:00
VESSILLER
1379b2ce87 FIX travis errors 2020-03-12 18:21:44 +01:00
Laurent Destailleur
74b8b9f47d
Merge pull request #13340 from atm-lena/11.0_FIX_loadCacheMsgTicket_PrivateStatus
FIX - Ticket Public  - Private messages are displayed
2020-03-12 17:59:13 +01:00
Laurent Destailleur
6d9967a5d3 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-03-12 17:59:03 +01:00
Laurent Destailleur
dea03efd4f Look and feel v11 2020-03-12 17:58:51 +01:00
VESSILLER
70ebc61c1f Module TakePos - NEW add numbering module for cash desk 2020-03-12 17:43:59 +01:00
Laurent Destailleur
09359b8025
Merge pull request #13338 from altatof/box_shipments
FIX : missing class declaration
2020-03-12 17:06:50 +01:00