dolibarr/htdocs/core/modules/propale
Marcos García de La Fuente 7075ac74c4 Merge branch 'develop' into units
Conflicts:
	htdocs/comm/propal.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/card.php
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/card.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/class/commonobjectline.class.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
	htdocs/product/class/product.class.php
2015-04-03 15:45:54 +02:00
..
doc Merge branch 'develop' into units 2015-04-03 15:45:54 +02:00
index.html Removed index.php and replaced them with blank index.html as it is more appropriate 2014-07-12 23:18:57 +02:00
mod_propale_marbre.php Doxygen 2014-08-31 23:18:09 +02:00
mod_propale_saphir.php Fix: Masks works with thirdparty type 2015-03-04 18:18:55 +01:00
modules_propale.php Fix: phpcheckstyle from phpcs 1.5.5 (closing tags and & char on 2014-09-27 17:13:15 +02:00