Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-26 03:11:21 +01:00
Code Issues Packages Projects Releases Wiki Activity
108,518 Commits 36 Branches 191 Tags
0fd2e91ccc127f2a0791e2e9eb57504acba0d025
Commit Graph

1950 Commits

Author SHA1 Message Date
Laurent Destailleur
fa7254be9a Fix picto and perm 2022-05-03 17:05:14 +02:00
Laurent Destailleur
770a0fbe8d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-04-11 17:34:40 +02:00
Laurent Destailleur
480fda43c5 Clean code 2022-04-11 17:34:19 +02:00
Laurent Destailleur
139c5a4327 Merge pull request #19518 from 1ocate/1ocateAddShipmentclose 
NEW Mass action close shipment
 2022-04-11 16:49:34 +02:00
Laurent Destailleur
af5444dc91 FIX ref not set in message of closing shipment 2022-04-11 16:48:56 +02:00
Laurent Destailleur
4fc07d96d8 Merge pull request #20519 from joseplluis/patch-11 
BUG expedition and warehouse with children
 2022-04-02 16:22:23 +02:00
Laurent Destailleur
5b91ae062f All triggers with a name XXX_UPDATE have been renamed XXX_MODIFY for 
code consistency purpose.
 2022-04-02 10:31:58 +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
Laurent Destailleur
95dc25587c Standardize code of the fetch_lines() 2022-03-28 13:50:47 +02:00
Laurent Destailleur
4a80f35aaa Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2022-03-23 17:26:25 +01:00
Ferran Marcet
ccf8b01020 Fix: The origin of the stock movement is not being recorded 2022-03-22 13:46:55 +01: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
6bb49797f8 Merge pull request #20243 from JohnXLivingston/fix_template_name_typo 
Fix: typo in template name
 2022-03-07 14:55:02 +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
John Livingston
1ece554c92 Fix: typo in template name 
There was a typo in generated HTML comment.
 2022-03-01 17:39:38 +01:00
Laurent Destailleur
70a18bc15a FIX creation of the shipment if order contains services 2022-03-01 01:28:47 +01:00
Laurent Destailleur
0d024147bf Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-28 22:36:31 +01:00
Francis Appels
c242a0561b Fix shipping list, e.shipping_method_id should be e.fk_shipping_method. 
Disabled searchall for shipping method, does not work.
 2022-02-25 16:11:16 +01:00
Laurent Destailleur
e96061dd18 Fix phpunit SecurityTest 2022-02-22 23:46:57 +01:00
Frédéric FRANCE
c8640f329e add missing global 2022-02-15 18:31:05 +01:00
Frédéric FRANCE
0ba912b1e5 add missing global 2022-02-15 18:14:44 +01:00
Frédéric FRANCE
c474ee216f Update expedition.class.php 2022-02-15 11:15:34 +01:00
Laurent Destailleur
6b5c0769b8 FIX #19786 2022-01-24 14:09:53 +01:00
Laurent Destailleur
91b2d59458 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-01-14 10:37:41 +01:00
Laurent Destailleur
53e65095a7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/commande/card.php
	htdocs/expedition/card.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/commande/list.php
	htdocs/fourn/facture/card.php
 2022-01-14 10:36:46 +01:00
Laurent Destailleur
9dde80dd52 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/expedition/card.php
	htdocs/fourn/commande/list.php
 2022-01-14 10:30:39 +01:00
Laurent Destailleur
13510b9929 Clean sortfield, sortorder 2022-01-13 11:17:25 +01:00
Laurent Destailleur
f51720879b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-01-13 11:05:57 +01:00
Laurent Destailleur
dc3670bc91 Clean search_status 2022-01-13 11:00:52 +01:00
Marc de Lima Lucio
b110ca6ead FIX: order to shipment: FIX hidden conf SHIPMENT_GETS_ALL_ORDER_PRODUCTS (still not working when not preselecting a warehouse) 2022-01-12 16:40:43 +01:00
Laurent Destailleur
79fbe7488e Merge pull request #19721 from grandoc/new_branch_01_01_2022 
Fix : Fatal error: Uncaught Error: Call to a member function deleteFr…
 2022-01-06 16:04:18 +01:00
iouston
f91c376a7c minor change on getNextNumRef doc block 2022-01-04 16:44:13 +01:00
Laurent Destailleur
ef56631c80 FIX #yogosha8186 2022-01-03 18:15:19 +01:00
Philippe GRAND
17d1fa190f Fix : Fatal error: Uncaught Error: Call to a member function deleteFromShipment() on null in /home/httpd/vhosts/doliweb.com/httpdocs/expedition/class/expedition.class.php on line 1463 2022-01-01 15:27:20 +01:00
Laurent Destailleur
0387b9922e FIX error message on sqlfilter in API 2021-12-20 20:49:32 +01:00
Laurent Destailleur
d80f83caf4 Clean code 2021-12-09 17:19:31 +01:00
Laurent Destailleur
e983ba58f9 Merge pull request #19534 from Hystepik/develop#3 
Fix : php8.0  warning
 2021-12-08 18:51:51 +01:00
Laurent Destailleur
90cff6aed9 Update list.php 2021-12-08 18:50:42 +01:00
Laurent Destailleur
51e7484d55 Fix var not defined 2021-12-08 18:49:57 +01:00
Laurent Destailleur
ea45fdce5c Merge pull request #19535 from Hystepik/develop#4 
Fix : php 8.0 warnings
 2021-12-08 18:44:16 +01:00
Laurent Destailleur
72dc560ce8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-12-08 18:27:28 +01:00
Laurent Destailleur
69cd7ae2ab Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/don/card.php
	htdocs/public/test/badges.php
	htdocs/public/test/test_exec.php
 2021-12-08 18:27:03 +01:00
Laurent Destailleur
990882e264 Merge branch 'develop' into Debug_15 2021-12-08 15:53:33 +01:00
Laurent Destailleur
6886cca1fa CSS 2021-12-07 02:35:46 +01:00
Francis Appels
5803060caf Fix shipment delete 2021-12-06 14:43:11 +01:00
lmarcouiller
ed7bfb333b fix php8.0 errors 2021-12-01 16:24:57 +01:00
lmarcouiller
4c92af9aca fix php8.0 warnings 2021-12-01 15:24:25 +01:00