Marcos García de La Fuente 7e1cf124b8 Merge branch 'develop' into syslog ... Conflicts: htdocs/commande/class/commande.class.php htdocs/compta/facture/class/facture.class.php htdocs/core/class/commonobject.class.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/product/class/product.class.php htdocs/product/stock/lib/replenishment.lib.php htdocs/societe/soc.php		2014-07-02 21:20:02 +02:00
..
doc	Contracts module configuration: missing translation string	2014-05-19 14:37:30 +02:00
mod_contract_magre.php	Removed closing php tag	2014-05-03 18:18:44 +02:00
mod_contract_serpis.php	More substitutions	2014-06-12 11:31:53 +02:00
modules_contract.php	made change on all the modules_element definition	2014-06-21 00:35:11 +02:00