Laurent Destailleur 8d1fdec8cf Merge remote-tracking branch 'origin/3.5' into develop ... Conflicts: htdocs/comm/propal.php htdocs/commande/fiche.php htdocs/compta/facture.php htdocs/core/lib/pdf.lib.php htdocs/core/modules/expedition/doc/pdf_merou.modules.php htdocs/core/modules/modProduct.class.php htdocs/fourn/commande/fiche.php htdocs/projet/fiche.php		2014-06-20 15:26:02 +02:00
..
class	Merge remote-tracking branch 'origin/3.5' into develop	2014-06-20 15:26:02 +02:00
stats	Removed closing php tag	2014-05-03 18:18:44 +02:00
tpl	Corrected incorrect lang trans key	2013-04-27 13:51:05 +02:00
contact.php	Qual: remove PHP closing tag (again)	2014-05-26 13:51:25 +02:00
fiche.php	Fix: Date format	2014-06-20 12:03:41 +02:00
index.php	Removed closing php tag	2014-05-03 18:18:44 +02:00
liste.php	Removed closing php tag	2014-05-03 18:18:44 +02:00
note.php	Fix: [ bug #1411 ] Unable to set an expedition note if invoices module is not enabled	2014-05-23 02:22:38 +02:00
shipment.php	Removed closing php tag	2014-05-03 18:18:44 +02:00