dolibarr/htdocs/expedition
Laurent Destailleur e220ce5a82 Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/comm/card.php
	htdocs/comm/propal.php
	htdocs/commande/card.php
	htdocs/compta/facture.php
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/class/html.formcompany.class.php
	htdocs/custom/.gitignore
	htdocs/expedition/card.php
	htdocs/fourn/card.php
	htdocs/product/fournisseurs.php
2015-01-18 18:44:22 +01:00
..
class Merge remote-tracking branch 'origin/3.7' into develop 2015-01-18 18:44:22 +01:00
stats Removed closing php tag 2014-05-03 18:18:44 +02:00
tpl Qual: Renamed all files & links "fiche.php" into "card.php" 2014-09-18 21:18:25 +02:00
card.php Merge remote-tracking branch 'origin/3.7' into develop 2015-01-18 18:44:22 +01:00
contact.php Qual: Renamed all files & links "liste.php" into "list.php" 2014-09-18 20:33:37 +02:00
index.php Fix: Maxi debug of module productbatch. 2014-12-05 16:04:37 +01:00
list.php Update list.php 2014-12-24 00:28:05 +01:00
note.php Qual: Renamed all files & links "liste.php" into "list.php" 2014-09-18 20:33:37 +02:00
shipment.php Fix: Maxi debug of module productbatch. 2014-12-05 16:04:37 +01:00