Commit Graph

2425 Commits

Author SHA1 Message Date
Laurent Destailleur
9e01c45df6 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-28 16:56:07 +02:00
Laurent Destailleur
e5e1f385b5 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-07-28 16:49:12 +02:00
Regis Houssin
ad74c915b9 FIX missing $object and $action for hook parameters (#30484)
* FIX missing $object and $action for hook parameters

* FIX same missing and wrong object name

* FIX again the same missing

* FIX uniformize hook parameters
2024-07-28 16:35:18 +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
Alexandre SPANGARO
128769811c Add css bodylist on list (#30334)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-07-11 00:45:05 +02:00
atm-jonathan
58bba2d58c missing token (#30313) 2024-07-08 21:46:59 +02:00
Rémi Champlon
d2907b68c0 NEW : Add pagination data to some api routes (#29895)
* Add pagination date

* Spaces to tabs

* fix
2024-07-06 15:04:11 +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
Frédéric FRANCE
f8a34e7489 phpdoc (#30209)
* phpdoc

* phpdoc

* phpdoc

* phpdoc
2024-06-30 21:04:19 +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
Frédéric FRANCE
4b275dc148 add phpdoc (#30208)
* add phpdoc

* add phpdoc

* add phpdoc

* add phpdoc

* clean phpdoc
2024-06-30 19:39:01 +02:00
Christian Humpel
ada3ed0a7c Fix: different behavior on extrafield updates. (#30150) 2024-06-25 10:44:36 +02:00
Noé Cendrier
b0116fd9fa NEW: redirect to expedition card if global search has unique result (#30108) 2024-06-22 16:08:26 +02:00
Yannis Hoareau
fb05e2851f NEW add pdf regenration to mass action for shipments (#29970)
* Expedition: add PDF mass regen: add choice in mass actions

* Expedition: add PDF mass regen: fix php warnings

Fixing php warning to avoid blank page when mass PDF regenerating
2024-06-19 20:36:02 +02:00
Laurent Destailleur
c936c4b4b4 Look and feel v20 2024-06-19 02:58:06 +02:00
Laurent Destailleur
55975c4575 Fix table not used 2024-06-15 19:57:11 +02:00
Frédéric FRANCE
7d300e0b4b Token csrf level 3 (#29980)
* add token csrf level 3

* add token csrf level 3
2024-06-11 01:04:33 +02:00
Mathieu Moulin
abcb1dad4b Define CommonObject relation in CommonObjectLine classes (#29956) 2024-06-10 16:08:39 +02:00
Vincent Maury
3d6e00fb07 Clean expedition list code (#29868)
* Clean expedition list code (replace $shiment by $object in list table where both were used)

* Clean expedition list code (replace $shiment by $object in list table where both were used)

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-06-08 12:17:06 +02:00
Frédéric FRANCE
741e75ee47 add phpdoc (#29832)
* add phpdoc

* fix phan

* fix phan

* fix phan

* fix phan

* fix phan

* fix phan

* fix phan

* fix phan

* fix phan

* add phpdoc

* fix phan

* fix phan
2024-06-04 14:46:54 +02:00
Vincent Maury
a44de3c527 Show docs (pdf) in expedition list (#29829)
Like in command list, it would be usefull to dowload pdf docs beside ref in expedition list
2024-06-04 12:43:32 +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
jyhere
effc7e606b FIX: X button remove filter bug when using expeditions search all (#29805) 2024-06-01 00:49:49 +02:00
Frédéric FRANCE
104343296c fix lost socid in massactions from list (#29806) 2024-06-01 00:49:24 +02:00
Yannis Hoareau
cd7651e460 NEW mass facturation from expedition (#29744)
* Add facturation mass action to expedition: button created

* Add facturation mass action to expedition: form mass action settings

* Add facturation mass action to expedition: bills creation

* Add facturation mass action to expedition: Import class

* Add facturation mass action to expedition: Dont reset massaction when creating bills

* Add facturation mass action to expedition: Using right name for linked elements

* Add facturation mass action to expedition: Add linked command to expedition

* Add facturation mass action to expedition: Changed wrong variables names

* Add facturation mass action to expedition: Commentary adjustment

* Add facturation mass action to expedition: Added langs and french translations fur understandability

* Add facturation mass action to expedition: fixing warnings

* Add facturation mass action to expedition: add command to retrieve data

* Add facturation mass action to expedition: added fields when fetching expedition lines

* Add facturation mass action to expedition: fix wrong variable name

* Add facturation mass action to expedition: Avoid adding link between objects twice

* Add facturation mass action to expedition: Clean code + function call

* Add facturation mass action to expedition: added missing brace

* Add facturation mass action to expedition: changed duplicate lang key

* Add facturation mass action to expedition: resolve phan warnings

* Add facturation mass action to expedition: fix variable probably undefined

* Add facturation mass action to expedition: fix php codesniffer

* Add facturation mass action to expedition: fix using new methods

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-05-24 18:44:02 +02:00
Laurent Destailleur
66f4562300 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-05-23 14:50:17 +02:00
Laurent Destailleur
a854e58905 FIX Missing $param in hook call for list 2024-05-23 14:41:56 +02:00
Vincent Maury
82b3fd0739 Add possibility to display public and private notes in expedition list (#29665)
* Add possibility to display public and private notes in expedition list

* Add possibility to display public and private notes in expedition list
2024-05-15 18:57:40 +02:00
Laurent Destailleur
16336a66ad Rename french module name into english 2024-05-13 10:45:20 +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
Frédéric FRANCE
d0830b3159 fix phpstan (#29602)
* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix travis

* fix phpstan

* fix phpstan

* fix phan

* 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 travis

* fix phpstan

* fix phpstan

* fix phpstan

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-05-05 00:34:19 +02:00
Eric
5c45bc53a3 new status shipment in progress + comments (#29584) 2024-05-03 18:06:30 +02:00
dolibarr95
960063a531 Fix : Company name should not be empty if socid param declared (#29545)
* Company name should not be empty if socid param declared

https://github.com/Dolibarr/dolibarr/issues/29544

* tabs instead of spaces
2024-05-01 17:34:05 +02:00
Laurent Destailleur
9e654e65dd Debug v20 2024-04-29 11:04:19 +02:00
Laurent Destailleur
cb604da904 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2024-04-28 22:16:01 +02:00
Laurent Destailleur
1af7ad923c Fix phan 2024-04-28 21:56:41 +02:00
Frédéric FRANCE
26da44e254 fix phpstan (#29431)
* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* remove params not used

* add WARNING
2024-04-27 12:45:50 +02:00
Benjamin Falière
948e204fae ADD arrayfields as parameter in doActions (#29326)
* ADD arrayfields as parameter in doActions

* FIX typo

* FIX syntax error

---------

Co-authored-by: Benjamin Falière <benjamin.faliere@altairis.fr>
2024-04-11 20:07:13 +02:00
Francis Appels
e23ccabf36 Fix PR #28989, create shipment line (#29281)
* Fix PR #28989, create shipment line

* Fix Phan

* Update changelog

* Fix stan

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-04-08 23:10:58 +02:00
Laurent Destailleur
1a007c7cbd Clean code 2024-04-08 15:13:19 +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
b5de782c6b Fix use the good HTTP code 2024-04-07 14:59:25 +02:00
Laurent Destailleur
fd9475be03 Use same doc comment eveywhere. 2024-04-07 12:26:27 +02:00
Laurent Destailleur
38fb00489d PHPDoc 2024-04-05 13:44:59 +02:00
Laurent Destailleur
60fe832560 css 2024-04-04 13:03:06 +02:00
Laurent Destailleur
14afdf6b0e Fix regression on GETPOSTINT 2024-04-03 17:50:24 +02:00
Laurent Destailleur
2947287e3f Look and feel v20 2024-04-03 16:22:16 +02:00