Laurent Destailleur 8a64ee2297 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 ...

Conflicts:
	htdocs/commande/list.php
	htdocs/compta/facture/card.php
	htdocs/compta/facture/list.php
	htdocs/expedition/class/expedition.class.php
	htdocs/expedition/list.php
	htdocs/societe/card.php

2018-05-25 13:14:58 +02:00

..

api_shipments.class.php

Fix look and feel v7

2017-12-22 14:19:12 +01:00

expedition.class.php

Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0

2018-05-25 13:14:58 +02:00

expeditionbatch.class.php

Fix the eatby/sellby date was not visible.

2017-12-02 10:43:01 +01:00

expeditionstats.class.php

Fix length of month too large

2017-12-08 16:15:41 +01:00

index.html

Removed index.php and replaced them with blank index.html as it is more appropriate

2014-07-12 23:18:57 +02:00