Commit Graph

111098 Commits

Author SHA1 Message Date
Laurent Destailleur
db0ef784cd
Merge pull request #21450 from Easya-Solutions/new-mail-template-substitute-project-title
NEW substitue project title in mail template
2022-07-24 20:28:37 +02:00
Laurent Destailleur
25d01b2be5
Merge pull request #21502 from Easya-Solutions/new-comm-action-card-hook-formconfirm
NEW hook formConfirm on action comm card
2022-07-24 20:23:40 +02:00
Laurent Destailleur
44ae25b4cd
Merge pull request #21534 from defrance/patch-216
Some Fix on Variant module
2022-07-24 20:15:56 +02:00
Laurent Destailleur
083b785ec8
Update combinations.php 2022-07-24 20:13:48 +02:00
Laurent Destailleur
54c24dd74a
Merge pull request #21554 from defrance/patch-217
fix php 8 warning (and error)
2022-07-24 20:11:07 +02:00
Laurent Destailleur
99f632b3ff Add transaction db missing 2022-07-24 15:40:55 +02:00
Laurent Destailleur
481bd93ab8 Fix var_dump 2022-07-24 15:12:08 +02:00
Laurent Destailleur
e7161edffe Fix missing @ in dolEval 2022-07-24 15:11:00 +02:00
Laurent Destailleur
2503b37bdd Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-24 14:33:55 +02:00
Laurent Destailleur
4b562121ec Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-07-24 14:33:02 +02:00
Laurent Destailleur
af73f2b683 Fix php8 2022-07-24 14:32:35 +02:00
Laurent Destailleur
0bcc03cd5d css 2022-07-24 14:32:13 +02:00
Laurent Destailleur
a945c89041 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-24 14:30:55 +02:00
Laurent Destailleur
c3016c6175 Fix php8 2022-07-24 13:44:47 +02:00
Laurent Destailleur
505531c9d6
Merge pull request #21552 from spooky360/15.0
FIX : fourn/commande/card.php Added "$object" parameter to $formfile->showdocuments call
2022-07-24 11:39:00 +02:00
Florian HENRY
c342d0cde9 fix: display message only if change 2022-07-24 11:37:42 +02:00
Laurent Destailleur
336960453f
Merge pull request #21555 from FHenry/15_fix_message_only_when_updtae
fix: display message only if change (with emballage on)
2022-07-24 11:36:39 +02:00
Laurent Destailleur
9463f24a73 Better fix 2022-07-24 11:35:56 +02:00
Laurent Destailleur
fbf70beedb
Merge pull request #21557 from emheyarssi/15.0.2
Fix #21449
2022-07-24 11:35:24 +02:00
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