Laurent Destailleur b267402df6 Merge remote-tracking branch 'origin/4.0' into develop ... Conflicts: htdocs/compta/prelevement/class/bonprelevement.class.php htdocs/filefunc.inc.php htdocs/langs/en_US/main.lang htdocs/societe/rib.php		2016-08-01 15:15:32 +02:00
..
doc	Merge remote-tracking branch 'origin/4.0' into develop	2016-08-01 15:15:32 +02:00
index.html
mod_supplier_proposal_marbre.php
mod_supplier_proposal_saphir.php	Code was corrupted with very bad commits. I restore files manually.	2016-03-25 15:53:44 +01:00
modules_supplier_proposal.php