Commit Graph

488 Commits

Author SHA1 Message Date
Frédéric France
1c2a89f52d Merge remote-tracking branch 'upstream/develop' into loaddolibarrenv 2022-09-09 08:09:12 +02:00
Laurent Destailleur
7c7ccc2393 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-09 01:45:59 +02:00
Laurent Destailleur
fb60c100e5 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-09-09 01:39:52 +02:00
Laurent Destailleur
3177a065cd Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-09-09 01:31:43 +02:00
Laurent Destailleur
da0cf1cbf2 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-08 23:00:10 +02:00
Laurent Destailleur
764e6158eb Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-09-08 22:57:50 +02:00
Frédéric France
8d33953142 add comment 2022-09-07 20:08:59 +02:00
Gauthier PC portable 024
4d396bbf50 FIX : same thing in deleteline 2022-09-06 09:48:10 +02:00
Laurent Destailleur
c28966864b FIX data integrity for llx_delivery table 2022-09-06 01:42:48 +02:00
Gauthier PC portable 024
aff9a423ab FIX : fk_expedition in $line can be usefull for triggers 2022-09-05 12:28:59 +02:00
Frédéric FRANCE
9150f5102e Merge remote-tracking branch 'upstream/develop' into pr/grandoc/22009 2022-09-02 11:44:45 +02:00
Philippe GRAND
7093da9051 update code 2022-08-31 22:22:49 +02:00
Frédéric France
8e66b7207e replace ! empty by !empty 2022-08-31 22:14:20 +02:00
Frédéric France
fc01cc66cd fix php8 warnings 2022-08-31 21:55:55 +02:00
Laurent Destailleur
5d8c7d2f0b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-08-31 15:53:19 +02:00
Laurent Destailleur
215f89d545 Fix phpcs 2022-08-25 23:44:57 +02:00
JC Prieto
804480ca2d Update card.php
Same behavior as  products with not lot. (See line 1338).
2022-08-25 12:51:18 +02:00
Frédéric France
e78f9a56be use isModEnabled 2022-08-23 20:16:28 +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
lvessiller
8ac5bd4228 NEW show sell-by and eat-by dates only if not empty 2022-08-12 15:20:25 +02:00
lvessiller
9a780a25d8 NEW show SellBy/EatBy dates for each batch product in shipment card 2022-08-11 17:33:28 +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
bd3af19978 Merge pull request #21335 from atm-GregM/NEW_exped_ObjectLink
NEW add objectLink on expedition
2022-07-10 19:33:49 +02:00
Christian Foellmann
aaca9bc03d default to create on card.php if $action is empty 2022-07-08 09:16:02 +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
Christian Foellmann
89d1389e2d fix page titles 2022-06-27 12:48:04 +02:00
Laurent Destailleur
cf34d07d5d Update card.php 2022-06-27 12:22:46 +02:00
Laurent Destailleur
69cbe48a75 doc 2022-06-27 12:07:34 +02:00
Anthony Berton
bcdbcf5070 Update card.php 2022-06-27 11:18:38 +02:00
Anthony Berton
3a8f479db7 Update card.php 2022-06-27 11:16:50 +02:00
BB2A Anthony Berton
6a80d81d4a FIX 2022-06-27 09:11:33 +02:00
BB2A Anthony Berton
324b145833 FIX - php V8 expedition card 2022-06-27 08:42:33 +02:00
Laurent Destailleur
14832bb543 FIX timeout due to too many the same request 2022-06-25 04:15:04 +02:00
atm-GregM
e8a5d4f008 Merge branch 'develop' into NEW_exped_ObjectLink 2022-06-21 15:31:45 +02:00
GregM
8c0b1efce4 NEW add objectLink expedition 2022-06-21 15:21:45 +02:00
Laurent Destailleur
dd392143e1 Fix conf->projet conf->project 2022-06-14 17:53:17 +02:00
Laurent Destailleur
b5f77b4035 FIX #21237 2022-06-14 17:36:42 +02:00
Laurent Destailleur
6c1c8058c1 Doc 2022-06-14 16:56:03 +02:00
Frédéric France
3fdbce7a31 use isModEnabled function 2022-06-11 09:46:28 +02:00
Laurent Destailleur
4de50da0dd Repare code to forbidden var_dump() into code 2022-05-17 14:55:38 +02:00
Josep Lluís
eb14d1d31f BUG expedition and warehouse with childen
if a warehouse was selected by user, picking is limited to this warehouse and his children (same check is done in products without batch)
2022-04-01 16:37:32 +02:00
stickler-ci
aec5f4da13 Fixing style errors. 2022-03-21 11:25:46 +00:00
GregM
362352b198 replacing to dolGetButtonAction on Expedition card 2022-03-21 12:18:36 +01:00
Laurent Destailleur
893e1571b8 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-04 22:43:35 +01:00
Laurent Destailleur
c45d6a3bc7 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-03-04 19:45:02 +01:00
Laurent Destailleur
792dcc6334 FIX creation of the shipment if order contains services - 2/2 2022-03-04 19:14:57 +01:00