Laurent Destailleur 2e1a63a1f3 Merge remote-tracking branch 'origin/3.9' into develop ... Conflicts: htdocs/langs/de_DE/companies.lang htdocs/langs/fr_FR/compta.lang htdocs/societe/class/societe.class.php htdocs/societe/commerciaux.php htdocs/societe/consumption.php		2016-03-10 15:09:30 +01:00
..
doc	Merge remote-tracking branch 'origin/3.9' into develop	2016-03-10 15:09:30 +01:00
index.html
mod_supplier_proposal_marbre.php	Debug module supplier proposal	2016-03-04 16:08:51 +01:00
mod_supplier_proposal_saphir.php
modules_supplier_proposal.php