2
0
forked from Wavyzz/dolibarr
Commit Graph

6065 Commits

Author SHA1 Message Date
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
spooky360
5d75ea015b Added "$object" parameter to $formfile->showdocuments call
Added "$object" parameter to $formfile->showdocuments call in order to use the $object reference on the showDocuments hook called inside showdocuments function.
Otherwise, the hook is called with a null reference.
2022-07-22 09:51:57 +02:00
Laurent Destailleur
fb96145b49 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-12 02:05:20 +02:00
Francis Appels
490944baac Fix php 8 warning 2022-07-11 17:29:26 +02:00
Laurent Destailleur
25e034721c Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-11 00:06:57 +02:00
Laurent Destailleur
24dc936000 Revert "default to create on card.php if $action is empty"
This reverts commit e0b664066b.
2022-07-11 00:05:50 +02:00
Christian Foellmann
e0b664066b default to create on card.php if $action is empty 2022-07-11 00:01:42 +02:00
Laurent Destailleur
2ce695f939 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-10 19:48:20 +02:00
Laurent Destailleur
9a92c7d9b0 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/class/extrafields.class.php
2022-07-10 19:28:16 +02:00
Laurent Destailleur
c0977e5ee8 Merge pull request #21469 from cfoellmann/PR/card-empty-action
FIX default to create on card.php if $action is empty
2022-07-10 18:50:48 +02:00
Laurent Destailleur
cccb453a05 Fix doc 2022-07-10 18:40:53 +02:00
Laurent Destailleur
8f819abd61 Fix doc 2022-07-10 18:35:23 +02:00
Laurent Destailleur
9db3c1bbd6 Fix currency missing 2022-07-08 10:56:36 +02:00
Christian Foellmann
aeb86a4faf fix actionbuttons on editline or presend 2022-07-08 10:05:55 +02:00
Christian Foellmann
aaca9bc03d default to create on card.php if $action is empty 2022-07-08 09:16:02 +02:00
Laurent Destailleur
33a65dd9b8 Merge pull request #21246 from Easya-Solutions/new-inventory-list-show-product-ref-with-label
NEW show product label on inventory
2022-07-07 22:08:06 +02:00
Laurent Destailleur
b7a99463a6 Merge pull request #21341 from fboitel/NEW#21000
NEW #21000
2022-07-07 22:06:59 +02:00
Christian Foellmann
4c5e05e411 fix page titles
Conflicts:
	htdocs/compta/bank/annuel.php
	htdocs/contact/list.php
	htdocs/product/stock/movement_list.php
	htdocs/user/list.php
2022-07-06 19:19:08 +02:00
Laurent Destailleur
76e3c10c06 Revert "fix page titles" 2022-07-06 15:56:04 +02:00
Laurent Destailleur
59816ce171 Fix scrutinizer 2022-07-06 03:08:30 +02:00
Laurent Destailleur
bd28a7e038 Debug v16 2022-07-03 12:54:58 +02:00
Laurent Destailleur
941245c5e2 Debug v16 2022-06-28 12:26:49 +02:00