Commit Graph

111067 Commits

Author SHA1 Message Date
Laurent Destailleur
cf0a1d1e14 Merge 2022-07-24 11:26:10 +02:00
Laurent Destailleur
252c581ea6 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-07-24 11:23:52 +02:00
Laurent Destailleur
f20aaee731 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/product/inventory/inventory.php
2022-07-24 11:22:00 +02:00
Laurent Destailleur
58923ec3d7 Merge 2022-07-24 11:21:02 +02:00
Laurent Destailleur
e9c42bf715 Add option ACCOUNTANCY_DISABLE_CLOSURE_LINE_BY_LINE
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
2022-07-24 11:15:44 +02:00
Laurent Destailleur
f93a4ce0c0
Merge pull request #21560 from aspangaro/14p35
FIX Accountancy - Label of VAT account is empty
2022-07-24 11:13:44 +02:00
Laurent Destailleur
147b7516dd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-24 11:10:23 +02:00
Laurent Destailleur
8c5554a6e6 Add option ACCOUNTANCY_DISABLE_CLOSURE_LINE_BY_LINE 2022-07-24 11:09:59 +02:00
Laurent Destailleur
c7fd9f5a3a Trans 2022-07-24 10:57:46 +02:00
Laurent Destailleur
5358d88864 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-07-24 00:07:41 +02:00
Laurent Destailleur
11640d05b4
Merge pull request #21556 from defrance/patch-218
PHP V8 warning fix
2022-07-24 00:05:27 +02:00
Laurent Destailleur
f0b21d2ba7
Merge pull request #21561 from bugness-chl/tmp-fix-20476-14.0
FIX #20476 migration postgresql 13.0.x to 14.0.x packaging type
2022-07-24 00:04:15 +02:00
Laurent Destailleur
32c43e6bde
Merge pull request #21558 from fappels/16_fix_mo
Add missing require for MoLine
2022-07-24 00:03:59 +02:00
Laurent Destailleur
c4e317a977
Merge pull request #21562 from bugness-chl/tmp-fix-20476-develop
FIX #20476 migration 13.0.x to 14.0.x + discrepancy between MySQL and PostgreSQL
2022-07-24 00:03:44 +02:00
Laurent Destailleur
8e1d80e294
Merge pull request #21564 from FHenry/15_fix_21553
fix: #21553 fourn prod Id is required to find packaging value
2022-07-24 00:01:40 +02:00
Laurent Destailleur
274b0ff6b8 Remove useless test 2022-07-24 00:01:03 +02:00
Laurent Destailleur
da519f3ab5 Fix bad constructor 2022-07-23 23:55:57 +02:00
Florian HENRY
3af167db6c fix: #21553, fourn prod Id is required to find emballage value 2022-07-23 13:54:07 +02:00
Chl
b4d4c42cfb FIX #20476 discrepancy between MySQL & PostgreSQL default value 2022-07-22 21:10:23 +02:00
Chl
50e1597ef1 FIX #20476 migration postgresql 13.0.x to 14.0.x packaging type 2022-07-22 21:09:19 +02:00
Laurent Destailleur
7275ac1511 Trans 2022-07-22 20:14:25 +02:00
Laurent Destailleur
56a8912c9b Fix do not erase global option when configuring ticket 2022-07-22 19:47:59 +02:00
Laurent Destailleur
ca323f99ba Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-22 19:37:55 +02:00
Laurent Destailleur
8c8db25dd9 Fix trans 2022-07-22 19:37:27 +02:00
Laurent Destailleur
16c087e04c Clean htmlentities 2022-07-22 19:25:15 +02:00
Chl
1dec64e320 FIX #20476 migration postgresql 13.0.x to 14.0.x packaging type
Taken from ff35bf8d47
2022-07-22 19:17:03 +02:00
Laurent Destailleur
24f8e9c401 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-22 18:09:38 +02:00
Laurent Destailleur
3761c920eb Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
Conflicts:
	htdocs/core/modules/modPartnership.class.php
	htdocs/modulebuilder/template/core/modules/modMyModule.class.php
2022-07-22 17:43:35 +02:00
Laurent Destailleur
6d8b5bcfac Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-07-22 17:39:08 +02:00
Laurent Destailleur
d9f7a3efd1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/product/inventory/inventory.php
2022-07-22 17:38:24 +02:00
Laurent Destailleur
50af2747a2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-07-22 17:35:03 +02:00
Yoan Mollard
edb2e95aaf Fixed labels for permission errors 2022-07-22 17:33:04 +02:00
Anthony Berton
36c0936856 FIX - php8 migration 2022-07-22 17:32:28 +02:00
lmarcouiller
bac8efd4c8 Fix : PHP 8.1 warnings 2022-07-22 17:32:18 +02:00
Alexandre SPANGARO
e9ae888fc7 FIX Accountancy - Label of VAT account is empty 2022-07-22 16:01:39 +02:00
Francis Appels
43ea5f73e3 Add missing require for MoLine 2022-07-22 13:41:24 +02:00
stickler-ci
42809c62d2 Fixing style errors. 2022-07-22 09:05:51 +00:00
This Charlène
bd0b28d30a
fix special_code PHP V8 by adding on addline fct 2022-07-22 11:00:06 +02:00
This Charlène
762cea2416
php V8 fix warning 2022-07-22 10:51:45 +02:00
Laurent Destailleur
5466fd0562
Merge pull request #21476 from atm-kevin/FIX_Perms_Absence
FIX permissions création d'absence
2022-07-21 16:54:43 +02:00
Laurent Destailleur
a0698bbdf5
Merge pull request #21532 from ymollard/bugfix-perms
Fix labels for permission errors
2022-07-21 16:51:00 +02:00
Laurent Destailleur
ed0b4dfb85
Merge pull request #21537 from Hystepik/develop#2
Fix : PHP 8.1 warnings
2022-07-21 16:46:24 +02:00
Laurent Destailleur
393db04724
Merge pull request #21538 from bb2a/FIX
FIX - php8 migration
2022-07-21 16:44:33 +02:00
Laurent Destailleur
983d809549
Merge pull request #21541 from comaiteseb/16.0
16.0
2022-07-21 16:43:55 +02:00
Laurent Destailleur
4079afee81
Merge pull request #21542 from comaiteseb/develop
correction warning php Undefined property: stdClass:: in /space/www/d…
2022-07-21 16:20:27 +02:00
Laurent Destailleur
0c524f17f1
Merge pull request #21546 from Quatadah/template01
#NEW template
2022-07-21 16:18:56 +02:00
Laurent Destailleur
1279384732
Merge pull request #21549 from atm-lena/15.0_FIX_TaskListSearch_SeveralSameLines
Tasks List Search : several same lines
2022-07-21 16:18:08 +02:00
atm-lena
46075188b2 Tasks List Search : several same lines 2022-07-21 15:59:46 +02:00
Quatadah Nasdami
82eaf4524a adding second template 2022-07-21 15:01:53 +02:00
Quatadah Nasdami
1701982ab5 pushing first tempalte 2022-07-21 14:36:18 +02:00