Commit Graph

2144 Commits

Author SHA1 Message Date
Laurent Destailleur
eaa0e5eb3e CSS 2023-02-19 02:39:39 +01:00
Laurent Destailleur
2168578f2e Fix inline css 2023-02-18 14:00:25 +01:00
Frédéric FRANCE
8765e00e00 Merge remote-tracking branch 'upstream/develop' into membertooltip 2023-02-16 21:27:56 +01:00
Frédéric FRANCE
ae48571135 use user->hasRight 2023-02-14 22:56:12 +01:00
Frédéric FRANCE
adc7d1fae2 enhance shipping tooltip 2023-02-13 23:42:08 +01:00
Frédéric FRANCE
b9243376af enhance shipping tooltip 2023-02-13 23:29:10 +01:00
Laurent Destailleur
17ae12abfd Fix warning 2023-02-10 21:09:20 +01:00
Laurent Destailleur
7d6db10710
Merge pull request #23658 from FliyFly/qodanaincompatiblereturn
Fix (qodana)
2023-02-08 16:06:25 +01:00
Laurent Destailleur
fe35f5ec28 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-06 14:21:25 +01:00
Philippe GRAND
7a1c9b468a fix : Warning: Undefined array key label in /home/httpd/vhosts/aflac.fr/domains/dev.aflac.fr/httpdocs/expedition/card.php on line 340 2023-02-05 17:04:13 +01:00
FLIO
0080b0a80f fix (qodana) fix condlicts 2023-02-01 23:38:49 +01:00
FLIO
02f4f47083 fix (qodana) Return value type is not compatible with declared 2023-01-24 23:11:28 +01:00
Laurent Destailleur
80d46a22f1 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-01-18 21:36:57 +01:00
Laurent Destailleur
48161b8400 Debug v17. Bad param for selection of project 2023-01-17 13:50:23 +01:00
Laurent Destailleur
9aa6e59f9b Look and feel v18 2023-01-05 04:04:16 +01:00
Laurent Destailleur
fc9a4df845
Merge pull request #23378 from Je2fb/develop
Fix issue #23345 and create an api for multicurrencies
2023-01-02 00:28:02 +01:00
Laurent Destailleur
5c8dc4ed58 Fix warning 2023-01-01 23:50:37 +01:00
Laurent Destailleur
e523c04ce7 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-12-31 14:25:11 +01:00
Laurent Destailleur
751f79b672 Debug v17 2022-12-31 14:21:16 +01:00
stickler-ci
8a2f44aec4 Fixing style errors. 2022-12-30 15:20:12 +00:00
Je2fb
e80425ec75
Fix issue #23345 2022-12-30 16:07:10 +01:00
Laurent Destailleur
c886bad8b6 Fix warning 2022-12-28 17:00:28 +01:00
Laurent Destailleur
6824f82cc8 Fix warnings 2022-12-28 13:58:23 +01:00
Lamrani Abdel
7367d77cb1 Add mode Kanban to expedition list 2022-12-20 17:00:15 +01:00
Laurent Destailleur
a0e53a402d Fix reponsive 2022-12-02 19:23:12 +01:00
Florian HENRY
b1a677c150 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_add_not_saved_info_on_mvt_stock 2022-11-29 22:27:01 +01:00
Laurent Destailleur
bb46cdb0af Fix regression sql error 2022-11-27 21:10:37 +01:00
Maxime Kohlhaas
8c597543e1 Fix : use count() in lists - part 1 2022-11-26 00:54:49 +01:00
Maxime Kohlhaas
834d30b9d0 Fix expedition stats abstract method 2022-11-24 23:21:23 +01:00
Florian HENRY
b5dac0e5f5 merge 2022-11-23 08:26:12 +01:00
Florian HENRY
029e1debdc Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_add_not_saved_info_on_mvt_stock 2022-11-23 08:24:23 +01:00
Laurent Destailleur
3d8404ecb3 Standardize code with reception (option to allow negative shipment) 2022-11-22 13:47:01 +01:00
Laurent Destailleur
1c19327454 FIX #22843 2022-11-17 10:48:44 +01:00
Laurent Destailleur
309a7ccf34 Fix missing abstract methods 2022-11-17 10:21:26 +01:00
FLIO
6b4ca7f4fc Fix(Scrutinizer) fix name function https://scrutinizer-ci.com/g/Dolibarr/dolibarr/issues/develop/files/htdocs/expedition/stats/month.php?selectedLabels%5B0%5D=9&selectedSeverities%5B0%5D=10&orderField=lastFound&order=desc&honorSelectedPaths=0 2022-11-16 16:04:45 +01:00
Laurent Destailleur
124a969127 Debug v17 2022-10-31 15:35:00 +01:00
Florian HENRY
84ec5ef218 merge 2022-10-28 09:14:59 +02:00
Laurent Destailleur
9792d4e0aa Fix missing picto in combo list 2022-10-28 01:40:32 +02:00
Laurent Destailleur
fb9ec11ffb Deprecated method set_billed() on shipment and reception class has been
removed. Use setBilled() instead.
2022-10-27 02:37:08 +02:00
Laurent Destailleur
65fc311e0f
Merge pull request #22613 from FHenry/dev_fix_22581
FIX: #22581
2022-10-25 16:03:44 +02:00
Laurent Destailleur
81813225aa Look and feel v17 2022-10-24 01:25:50 +02:00
Laurent Destailleur
d9c2528b62 Clean code 2022-10-21 23:49:45 +02:00
Laurent Destailleur
330a1199e4 Look and feel v17 2022-10-21 15:08:54 +02:00
Laurent Destailleur
3e5273d83b NEW Option PRODUIT_DESC_IN_FORM accept (desktop only or +smartphone) 2022-10-21 11:14:28 +02:00
Florian HENRY
ed060651fb Merge branch '14_fix_22581' into dev_fix_22581 2022-10-18 08:09:03 +02:00
Florian HENRY
c002957b49 FIX: #22581 2022-10-14 12:10:26 +02:00
Florian HENRY
012275cb3e FIX: #22581 2022-10-14 12:10:04 +02:00
Florian HENRY
e1e7ce8074 FIX: #22581 2022-10-14 12:09:02 +02:00
Florian HENRY
7bb334fb5f fix 2022-10-14 11:35:44 +02:00
Florian HENRY
0c0923fbfc new: add information of line detail orgin and source into stock mouvement 2022-10-14 11:28:49 +02:00
Laurent Destailleur
b051da4b04 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-10-07 22:50:58 +02:00
Laurent Destailleur
73c1efecaf Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-10-07 22:47:36 +02:00
Laurent Destailleur
4e4b0e0039 FIX Duplicate creation of invoice when closing shipment linked to order 2022-10-07 22:44:20 +02:00
Alexandre SPANGARO
fee02fa632 Use isModEnabled 2022-09-25 22:53:07 +02:00
Laurent Destailleur
acaf066d1d
Merge pull request #22011 from SylvainLegrand/PR_Option_for_input_of_customer_or_supplier_references
Add an option to manage input size for customer / supplier references
2022-09-25 18:48:55 +02:00
Alexandre SPANGARO
e6e058a713 Use isModEnabled 2022-09-25 15:30:16 +02:00
Alexandre SPANGARO
9e957edc3b Use isModEnabled 2022-09-25 06:30:51 +02:00
Alexandre SPANGARO
eb55b307c0 Use isModEnabled 2022-09-25 06:04:27 +02:00
Philippe GRAND
ed8962c091 update code toward php8 compliance 2022-09-24 14:48:43 +02:00
Laurent Destailleur
e1b5e5033f Clean code of deprecated field 2022-09-23 09:35:17 +02:00
Laurent Destailleur
6fb9a4713c Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-21 01:30:40 +02:00
Laurent Destailleur
36e1bfb297 NEW Option PRODUCTBATCH_SHOW_WAREHOUSE_ON_SHIPMENT showing wh on PDF 2022-09-21 00:50:04 +02:00
Laurent Destailleur
79ac1a2e8d
Merge pull request #22308 from frederic34/patch-10
FIX cannot enter a quantity with a comma
2022-09-20 00:06:35 +02:00
Noé Cendrier
8908011252 this should be cleaned when we click on the eraser 2022-09-19 16:54:12 +02:00
Frédéric FRANCE
3d1595e21b
cannot enter a quantity with a comma 2022-09-16 16:07:07 +02:00
Laurent Destailleur
38676b6c04 Fix phpunit 2022-09-10 00:54:16 +02:00
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
Laurent Destailleur
36b798e9a8 Fix responsive 2022-09-08 22:16:31 +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
Laurent Destailleur
760c6e581e
Merge pull request #22060 from grandoc/new_branch_03_09_2022
Update code
2022-09-03 11:44:36 +02:00
Philippe GRAND
79fc182201 Update code 2022-09-03 11:24:17 +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
Sylvain Legrand
a1bae3453a Add an option to manage input size for customer / supplier references 2022-09-01 08:34:22 +02:00
Philippe GRAND
162cdcc676 update code 2022-08-31 22:24:43 +02:00
Philippe GRAND
d779a42b22 update code 2022-08-31 22:24:03 +02:00
Philippe GRAND
94f4d50035 update code 2022-08-31 22:23:39 +02:00
Philippe GRAND
721b5726f1 update code 2022-08-31 22:23:14 +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
e71692e745 fix php8 warnings 2022-08-31 22:02:31 +02:00
Frédéric France
fc01cc66cd fix php8 warnings 2022-08-31 21:55:55 +02:00
Frédéric France
194c76727e fix php8 warnings 2022-08-31 21:37:10 +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
Laurent Destailleur
06b9b684af
Merge pull request #21722 from Easya-Solutions/new-expedition-card-eat-sell-by-show
NEW show SellBy/EatBy dates for each batch product in shipment card
2022-08-22 15:14:48 +02:00
Laurent Destailleur
75abbc819b Clean code 2022-08-14 16:46:22 +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