dolibarr/htdocs/expedition
Laurent Destailleur 3a58613e45 Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
	htdocs/accountancy/bookkeeping/listbyyear.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/compta/facture/list.php
	htdocs/filefunc.inc.php
	htdocs/fourn/facture/list.php
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
	htdocs/projet/activity/index.php
2016-03-02 23:40:11 +01:00
..
class NEW Add total weight and volume on PDF 2016-02-25 14:18:32 +01:00
stats Fix select2 component go over parent container so we introduce option to 2016-01-08 23:17:45 +01:00
tpl Fix bad place of table 2016-02-17 23:45:25 +01:00
card.php FIX Some troubles into weight and volume calculation when unit differs. 2016-02-25 13:46:38 +01:00
contact.php FIX #3534 2015-09-16 22:04:03 +02:00
index.php Fix search on shipment 2016-01-08 23:59:02 +01:00
list.php Merge remote-tracking branch 'origin/3.9' into develop 2016-03-02 23:40:11 +01:00
note.php Bad width 2015-01-23 18:41:53 +01:00
shipment.php NEW Add an explanation message on shipment page to explain you can't 2016-02-25 18:18:33 +01:00