Commit Graph

100672 Commits

Author SHA1 Message Date
Laurent Destailleur
068622bced Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-06-30 15:00:23 +02:00
Laurent Destailleur
a914ffa42c CSS 2021-06-30 15:00:04 +02:00
Laurent Destailleur
b6a538f439 Merge pull request #18056 from aspangaro/14b16
FIX Accountancy - Clean virtual zero on the import
2021-06-30 14:44:12 +02:00
Alexandre SPANGARO
f95b5be971 FIX Accountancy - Clean virtual zero on the import 2021-06-30 04:55:22 +02:00
Alexandre SPANGARO
6f12812329 FIX Accountancy - Clean virtual zero on the import 2021-06-29 23:07:20 +02:00
Laurent Destailleur
c7befd9acc Fix php8 (related to #18019) 2021-06-29 19:49:37 +02:00
Laurent Destailleur
2a876d139b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-06-29 19:25:09 +02:00
Laurent Destailleur
c74060d02c Fix lost change in merge 2021-06-29 19:24:46 +02:00
Laurent Destailleur
d59dfcb08a Update list.php 2021-06-29 19:21:35 +02:00
Laurent Destailleur
d379151da6 Fix doc 2021-06-29 19:19:38 +02:00
Laurent Destailleur
eab6fc9347 Merge pull request #18053 from fappels/14_fix_php8_part2
Fix php8 warning
2021-06-29 19:17:09 +02:00
Laurent Destailleur
2860e12b65 Update objectline_view.tpl.php 2021-06-29 19:16:29 +02:00
Laurent Destailleur
56787bc292 Update card.php 2021-06-29 19:14:03 +02:00
Laurent Destailleur
0f020d5b20 Fix for phpv8 2021-06-29 19:05:18 +02:00
Laurent Destailleur
0577229a8b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-06-29 18:22:53 +02:00
Laurent Destailleur
7aeb652c66 Better sanitizing, fix phpcs 2021-06-29 18:22:36 +02:00
Laurent Destailleur
796b2d201a Enhance the sanitizing. 2021-06-29 18:17:27 +02:00
Francis Appels
1b7b45d72a Merge remote-tracking branch 'Dolibarr/14.0' into 14_fix_php8_part2 2021-06-29 16:56:48 +02:00
Francis Appels
051bb3f3ef Fix some core php8 warnings.
Fixing php 8 warnings seems also to solve some situations like a paiment condition removed from dictionary can not be selected.
2021-06-29 16:37:07 +02:00
Laurent Destailleur
0d7fccc7b3 Fix test 2021-06-29 16:33:53 +02:00
Francis Appels
e4f61d430f Invoice php 8 issue and warnings.
Seems if ("" < 0) is true in php 8
2021-06-29 16:33:24 +02:00
Francis Appels
b8f5dc74d7 Some order php 8 warning 2021-06-29 16:30:36 +02:00
Francis Appels
b83f57da48 Fix some proposal php 8 warning 2021-06-29 16:26:48 +02:00
Laurent Destailleur
9236d38821 Merge pull request #18035 from frederic34/patch-7
fix php warning
2021-06-29 16:03:11 +02:00
Laurent Destailleur
1982ab47ac Merge branch '14.0' into patch-7 2021-06-29 16:02:47 +02:00
Laurent Destailleur
25c6b64b1e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/core/modules/delivery/doc/pdf_storm.modules.php
	htdocs/core/modules/reception/doc/pdf_squille.modules.php
	htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
	htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
2021-06-29 15:58:26 +02:00
Laurent Destailleur
24fccc2b72 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-06-29 15:53:22 +02:00
Laurent Destailleur
1cf3408f5b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/contact/class/contact.class.php
2021-06-29 15:52:39 +02:00
Laurent Destailleur
ce18eff133 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-06-29 15:48:06 +02:00
Laurent Destailleur
e2c4a14939 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-06-29 15:47:58 +02:00
Laurent Destailleur
d788e58f67 Merge pull request #18036 from frederic34/codesample
remove unused code
2021-06-29 15:47:03 +02:00
Laurent Destailleur
6a877074a5 Merge pull request #18041 from Hystepik/develop#1
Fix #18014 : update of compta/facture/card.php
2021-06-29 15:46:24 +02:00
Laurent Destailleur
80759541b4 Merge pull request #18038 from atm-maxime/fix_order_delay_warning
Fix #17836 : order delay warning in list was wrong
2021-06-29 15:38:14 +02:00
Laurent Destailleur
0472ab4690 Merge pull request #18040 from OPEN-DSI/v11-fix-contact-update-perso-birthday-alert
FIX update contact birthday alert
2021-06-29 15:37:38 +02:00
Laurent Destailleur
ba242b4ecf Merge pull request #18044 from fappels/14_fix_php8
Fix php 8 warnings
2021-06-29 15:33:07 +02:00
Laurent Destailleur
9b328bd8be Trans 2021-06-29 15:31:42 +02:00
Laurent Destailleur
a123154446 Fix clean alias 2021-06-29 15:29:28 +02:00
Alexandre SPANGARO
52b8044517 FIX Accountancy - Suggested account of product not concerned by account of thirdparty 2021-06-29 04:25:32 +02:00
Laurent Destailleur
69e0381e55 Prepare v14 2021-06-29 02:39:20 +02:00
Francis Appels
9b59f264fd Fix some php 8 warning 2021-06-28 20:00:10 +02:00
Francis Appels
4558efdea3 Fix travis, also fixed upstream transifex 2021-06-28 19:21:29 +02:00
Francis Appels
b534fbae77 Fix warning php 8 in product ajax. 2021-06-28 19:12:19 +02:00
Laurent Destailleur
d7fbddb8e1 Add rowid/ref in response 2021-06-28 16:45:29 +02:00
Francis Appels
69affc5df5 Fix php 8 warnings 2021-06-28 16:25:16 +02:00
lmarcouiller
923a015aac Fix #18014 : update of compta/facture/card.php 2021-06-28 11:38:34 +02:00
lvessiller
fa28a02d74 FIX update contact birthday alert 2021-06-28 11:03:22 +02:00
Laurent Destailleur
813440bd16 Trans 2021-06-27 18:29:54 +02:00
Laurent Destailleur
2e2d9002ad Code comment 2021-06-27 14:54:17 +02:00
Maxime Kohlhaas
c3cbd29542 Fix #17836 : order delay warning in list was wrong, date_commande is deprecated 2021-06-27 09:04:47 +02:00
Laurent Destailleur
15fdf95c22 css 2021-06-27 00:02:25 +02:00