Commit Graph

5835 Commits

Author SHA1 Message Date
Laurent Destailleur
e0b1ad308b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-08-30 19:38:35 +02:00
Francis Appels
aca6609f21 Close Remove trigger ORDER_SUPPLIER_DISPATCH #18486 2022-08-29 11:36:19 +02:00
Philippe GRAND
2b96fbaee6 FIX php8 compatibility 2022-08-28 14:13:03 +02:00
Laurent Destailleur
63a1daa091 Clean code 2022-08-26 19:27:38 +02:00
Laurent Destailleur
9cdcc08a4c
Merge pull request #21844 from defrance/patch-236
php V8 warning on supplier order
2022-08-25 17:44:44 +02:00
Laurent Destailleur
2e905b127a Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/accountancy/index.php
	htdocs/product/admin/product.php
2022-08-25 14:35:08 +02:00
Laurent Destailleur
53e2bb994a
Merge branch 'develop' into patch-236 2022-08-25 13:48:28 +02:00
Laurent Destailleur
808a1e82b9
Merge pull request #21865 from fappels/16_best_buy_price_sharing
FIX: Sharing of best buy price
2022-08-24 18:06:55 +02:00
Francis Appels
7d6b46d856 HAR-19 Fix best buyprice sharing 2022-08-24 10:58:58 +02:00
Francis Appels
ce8489724e Merge remote-tracking branch 'Dolibarr/16.0' into 16_fix_warning_dispatch 2022-08-24 10:42:53 +02:00
Frédéric France
e78f9a56be use isModEnabled 2022-08-23 20:16:28 +02:00
Frédéric France
86a7a7c8bb use isModEnabled 2022-08-23 20:05:09 +02:00
Frédéric France
582f6b196e use isModEnabled 2022-08-23 20:02:37 +02:00
Frédéric France
4bef0f5745 use isModEnabled 2022-08-23 20:01:34 +02:00
stickler-ci
e4b7fbe1ac Fixing style errors. 2022-08-23 10:10:39 +00:00
This Charlène
9ce6ed74a7
Update fournisseur.commande.class.php 2022-08-23 12:05:54 +02:00
This Charlène
8c71118fa8
php V8 warning 2022-08-23 12:04:03 +02:00
Laurent Destailleur
e9b370e7c0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-08-23 04:03:56 +02:00
Laurent Destailleur
7a66442cc4
Merge pull request #18284 from cfoellmann/fix-actionbuttons
fix actionbuttons on editline or presend
2022-08-23 01:49:56 +02:00
Laurent Destailleur
456c0f8dff
Merge pull request #21833 from defrance/patch-235
php V8 warning (supplier order)
2022-08-22 15:10:13 +02:00
This Charlène
5ddd0c20ae
php V8 warning 2022-08-22 13:57:23 +02:00
This Charlène
510b0c278c
php V8 warning 2022-08-22 13:49:01 +02:00
Laurent Destailleur
2b5205b639 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-08-22 13:05:22 +02:00
Laurent Destailleur
558ae00f66 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
Conflicts:
	htdocs/core/ajax/onlineSign.php
2022-08-21 23:48:44 +02:00
Frédéric FRANCE
7f60a34799 use isModEnabled 2022-08-19 18:07:21 +02:00
ksar
1d1228286c
FIX #21772 2022-08-17 09:45:27 +02:00
Laurent Destailleur
6a61c495b3 # WARNING: head commit changed in the meantime
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-08-14 19:22:58 +02:00
Laurent Destailleur
35822d9431 css 2022-08-13 15:08:36 +02:00
Laurent Destailleur
533e4f2424 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/fr_FR/accountancy.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/cashdesk.lang
	htdocs/langs/fr_FR/main.lang
	htdocs/langs/fr_FR/members.lang
	htdocs/langs/fr_FR/products.lang
2022-08-12 16:03:09 +02:00
Laurent Destailleur
059d0073ff FIX Maxi debug v16 2022-08-12 15:54:50 +02:00
Francis Appels
4167cca051 No need to set tmpproduct properties because fetched. 2022-08-11 18:26:18 +02:00
Francis Appels
251e0b1364 Fix dispatch - php warning on tmpproduct 2022-08-11 18:11:16 +02:00
Laurent Destailleur
a60a8d5057 sql error 2022-08-04 00:10:18 +02:00
Laurent Destailleur
528d54ba79 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-08-02 20:28:07 +02:00
Laurent Destailleur
4c4dd53385 Fix filter on company 2022-07-31 22:46:53 +02:00
This Charlène
7ff956a1e2
PHP V8 warning 2022-07-29 14:24:29 +02:00
Laurent Destailleur
f032a89c49
Merge pull request #21566 from FHenry/15_fix_21553
fix: #21553, fourn prod Id is required to find packaging value
2022-07-24 15:50:17 +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
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
cf0a1d1e14 Merge 2022-07-24 11:26:10 +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
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
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
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
Florian HENRY
0ee6e92dc0 fix: display message only if change 2022-07-22 10:51:28 +02:00