Laurent Destailleur 5b07be0179 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 ...

Conflicts:
	htdocs/expedition/class/expedition.class.php
	htdocs/holiday/list.php

2021-09-16 13:33:49 +02:00

..

api_shipments.class.php

Fix yogosha 6347

2021-06-09 15:36:47 +02:00

expedition.class.php

Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0

2021-09-16 13:33:49 +02:00

expeditionbatch.class.php

Fix deletion of shipment when there is batch record

2021-09-15 13:29:19 +02:00

expeditionstats.class.php

Fix cast into variable into sql request.

2021-08-23 17:41:11 +02:00