dolibarr/htdocs/expedition
Laurent Destailleur a93ba86ce0 Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/commande/card.php
	htdocs/compta/facture.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/modules/expedition/modules_expedition.php
	htdocs/core/modules/modContrat.class.php
	htdocs/expedition/class/expedition.class.php
2015-05-07 13:35:09 +02:00
..
class Merge remote-tracking branch 'origin/3.7' into develop 2015-05-07 13:35:09 +02:00
stats Removed closing php tag 2014-05-03 18:18:44 +02:00
tpl Tooltip and lib for file cache 2015-01-24 21:46:05 +01:00
card.php Fix : shipment PDF was not using generation params 2015-05-06 21:29:58 +02:00
contact.php Qual: Renamed all files & links "liste.php" into "list.php" 2014-09-18 20:33:37 +02:00
index.php Fix: missing getEntity function 2015-04-19 03:05:37 +02:00
list.php Fix: missing getEntity function 2015-04-19 03:05:37 +02:00
note.php Bad width 2015-01-23 18:41:53 +01:00
shipment.php Merge branch 'develop' into constants 2015-03-30 02:36:46 +02:00