Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
140,250 Commits 36 Branches 189 Tags
901b9dab72357dad4e162f94d6b53e1e84d20dd5
Commit Graph

654 Commits

Author SHA1 Message Date
Laurent Destailleur
8571a83f76 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-11-27 16:47:50 +01:00
daGrumpf
ef41ebb864 PR#28448 broke qty float on xpedition same correction as #31794 (#32055) 2024-11-22 13:07:23 +01:00
Noé Cendrier
9f56bfe5b7 FIX: shipping date was not editable in view mode (#32022) 2024-11-20 20:06:43 +01:00
Laurent Destailleur
59ffaa538c Clean code 2024-11-20 01:29:01 +01:00
Laurent Destailleur
b71e3742e6 Fix avoid to show button without permissions 2024-11-19 21:12:49 +01:00
Noé Cendrier
ed6bf372cd NEW: use Expedition::$date_shipping property in card and list (#31701) 
* NEW: use Expedition::$date_shipping property in card and list

* FIX: translation

* FIX: PHPStan rebutal

* FIX: not a great idea to copy and not edit comment

* FIX: on create, expected delivery date should precede sending date

* Update card.php

* Update list.php

* Update list.php

* Update list.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-11-14 13:23:22 +01:00
Frédéric FRANCE
15490b292f fix phpstan and fix CI (#31739) 
* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan
 2024-11-10 11:16:23 +01:00
Frédéric FRANCE
1adc883b56 add baseline exclude for phpstan (#31632) 
* add baseline exclude for phpstan

* update

* update

* update

* update

* update

* merge

* restore one filter

* delete old errors

* fix

* fix

* fix

* $moreforfilter can t be empty

* fix

* enable check

* refresh baseline

* add phpdoc

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-11-04 23:53:20 +01:00
Je2fb
408215b873 Fix issue product multicurrency price in form list and incoterm location (#31651) 
* Update html.form.class.php for multicurrency issue

Error in the name of the parameter data-multicurrency-up replaced by data-multicurrency-unitprice

* Fix Incoterm location

Replacement of function to retrieve the data from GET argument form GETPOSTINT to GETPOST, location_incoterms is a string and not a number

* Update card.php

* Update card.php

* Update card.php

* Update card.php

* Update shipment.php

* Update card.php

* Update card.php

* Update stocktransfer_card.php

* Update card.php

* Update card.php
 2024-10-31 18:45:24 +01:00
ptibogxiv
4cc5eb4dce FIX card.php for services in shipment card (#31622) 2024-10-29 17:30:25 +01:00
Laurent Destailleur
f5e4ab0220 Rewrite code to prepare refactoring 2024-10-26 15:24:54 +02:00
Frédéric FRANCE
331c5e9f4b fix phpstan (#31547) 
* fix phpstan

* fix phpstan

* fix phpstan
 2024-10-25 13:24:10 +02:00
MDW
1834c37c16 Qual: Fix phan notices (#31212) 
* Qual: Fix phan notices

# Qual: Fix phan notices

Fix several phan notices related to classes with UnknownObject
classes.

* Qual: Fix phan notices

* Qual: Fix phan notices

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-10-03 19:40:34 +02:00
Laurent Destailleur
6b72c665af Fix phan warning 2024-09-26 16:38:23 +02:00
Frédéric FRANCE
13d4d96dfc fix phpstan (#31061) 
* fix phpstan

* fix phpstan
 2024-09-20 17:25:39 +02:00
Frédéric FRANCE
d5fe4f998a fix phpstan (#30989) 
* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan
 2024-09-18 02:45:54 +02:00
Laurent Destailleur
bf697f83eb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2024-09-12 21:50:31 +02:00
ptibogxiv
7169c9258b Fix for SHIPMENT_SUPPORTS_SERVICES option (#30934) 
add correct quantity of service and not. 0 only for a service with the hidden option SHIPMENT_SUPPORTS_SERVICES activated
 2024-09-12 21:13:03 +02:00
Laurent Destailleur
e003c6a516 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-09-07 02:20:15 +02:00
Laurent Destailleur
bd04568799 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-09-07 02:18:33 +02:00
Frédéric FRANCE
80d1f47d4d fix ignored phpstan (most of expects string, int given) (#30649) 
* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

fix ignored phpstan

fix ignored phpstan

fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

fix ignored phpstan

fix ignored phpstan

fix ignored phpstan

fix ignored phpstan

fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* more ignore

* more ignore

* more ignore

* more ignore

* more ignore

* more ignore

* more ignore

* more ignore

* more ignore

* more ignore

* more ignore

* more ignore

* more ignore

* more ignore

* more ignore

* more ignore

* more ignore

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan
 2024-09-05 16:05:37 +02:00
Laurent Destailleur
538ab5a9f3 FIX #30836 2024-09-04 23:00:05 +02:00
hansemschnokeloch
9ea29c01a6 Fix countable error (#30839) 2024-09-04 21:19:07 +02:00
hansemschnokeloch
bab6c9bc68 Fix countable error (#30839) 2024-09-04 21:18:11 +02:00
Laurent Destailleur
c79f72f785 Fix missing tests on permissions 2024-09-03 16:19:18 +02:00
Laurent Destailleur
84ce31b8f8 Fix missing test on permissions 2024-09-01 14:04:10 +02:00
Laurent Destailleur
e7cfa4ddcc Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-08-27 07:26:26 +02:00
Laurent Destailleur
c03617d5b7 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-08-27 04:46:30 +02:00
Thibault Fiacre
48670dbd2f Fix prevent batch shipment for same product (#30740) 
* FIX prevent batch shipment for same product

* Add variable declaration
 2024-08-23 15:00:33 +02:00
Laurent Destailleur
ba25c49333 Fix permiss 2024-08-22 14:10:59 +02:00
Laurent Destailleur
d7d1e73ac9 Fix test on permissions 2024-08-22 14:06:29 +02:00
Laurent Destailleur
5797a0db3f Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-08-22 02:54:55 +02:00
Laurent Destailleur
fee2185170 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-08-22 02:52:27 +02:00
HENRY Florian
0885cd183e fix: expedition set Draft do not reset display (#30699) 2024-08-20 23:58:06 +02:00
atm-lena
6ba6eef247 NEW llxHeader CSS Body Expedition (#30384) 
Co-authored-by: atm-lena <lena.papazian@atm-consulting.fr>
 2024-07-15 20:37:16 +02:00
Laurent Destailleur
147a8bfaee Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/subscription/list.php
	htdocs/categories/viewcat.php
	htdocs/contrat/card.php
	htdocs/contrat/list.php
	htdocs/eventorganization/conferenceorbooth_list.php
	htdocs/expedition/list.php
	htdocs/societe/card.php
 2024-07-11 10:44:39 +02:00
atm-jonathan
58bba2d58c missing token (#30313) 2024-07-08 21:46:59 +02:00
Frédéric FRANCE
29f223fd3c fix checkFunctionArgumentTypes (#30249) 
* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes
 2024-07-04 17:47:31 +02:00
Alexandre SPANGARO
96afcaa476 Better comments (#30200) 
* Fix language

* Fix language

* Fix language

* Fix language

* Fix language

* Fix language

* Fix language

* CI Missing language key

* Update eventorganization.lang

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-06-30 21:02:50 +02:00
Christian Humpel
ada3ed0a7c Fix: different behavior on extrafield updates. (#30150) 2024-06-25 10:44:36 +02:00
Laurent Destailleur
918c5aab43 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-06-03 21:44:15 +02:00
Laurent Destailleur
699d5047b1 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-06-03 21:42:06 +02:00
HENRY Florian
5a2bcc47b6 fix: do not allow/suggest create shipping with 2 time the same serial for the same product (#29749) 
* fix: #29674

* fix: #29674

* review
 2024-06-03 21:36:24 +02:00
lamrani abdelwadoud
999bdaa719 NEW online signature of shipments (#29559) 
* New functionality for signed shipment

* Add attribute for check if was already signed

* Update expedition.class.php

* Update onlineSign.php

* Update expedition.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-05-05 02:48:02 +02:00
Zephyriony
6f524405af QUAL Rename column fk_origin_line on shipment lines into fk_elementdet to match a generic use. (#28989) 
* Update expedition.class.php 

Adapting the query and code to the new table format

* Update llx_expeditiondet.sql

* Update expedition.class.php

* Update expedition.class.php

* Update expedition.class.php

* Update expedition.class.php

* Update expedition.class.php

* Update expedition.class.php

* Update expedition.class.php

* Update expedition.class.php

* Update expedition.class.php

* Update llx_expeditiondet.sql

* Update expedition.class.php

* rename fk_origin_line to fk_elementdet

* rename fk_origin_line to fk_elementdet

* rename fk_origin_line to fk_elementdet

* rename fk_origin_line to fk_elementdet

* rename fk_origin_line to fk_elementdet

* rename fk_origin_line to fk_elementdet

* rename fk_origin_line to fk_elementdet

* rename fk_origin_line to fk_elementdet

* rename fk_origin_line to fk_elementdet

* rename fk_origin_line to fk_elementdet

* Update expedition.class.php

* Update expedition.class.php

* rename fk_origin_line to fk_elementdet

* rename fk_origin_line to fk_elementdet

* Update 19.0.0-20.0.0.sql

---------

Co-authored-by: sonikf <93765174+sonikf@users.noreply.github.com>
 2024-04-08 12:44:49 +02:00
Laurent Destailleur
3e8c3edd6d Clean code from _GET 2024-03-28 17:10:22 +01:00
Laurent Destailleur
59c87c7cb6 Clean usage of ->origin_object instead of ->origin that was a string. 2024-03-24 06:12:18 +01:00
MDW
1fe9527e80 Fix GETPOSTINT(trackingurl), is_numeric(GETPOSTINT()), unneeded trim 2024-03-17 14:57:16 +01:00
Laurent Destailleur
24bf23e68b Use ->statut instead of status 2024-03-12 22:06:03 +01:00
Laurent Destailleur
0f2121e3ba Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-03-11 13:46:08 +01:00