Laurent Destailleur 11b1a2adac Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/journal/bankjournal.php htdocs/accountancy/journal/expensereportsjournal.php htdocs/accountancy/journal/purchasesjournal.php htdocs/accountancy/journal/sellsjournal.php htdocs/comm/propal/class/api_proposals.class.php htdocs/comm/propal/class/propal.class.php htdocs/compta/bank/index.php htdocs/compta/facture.php htdocs/core/class/html.form.class.php htdocs/includes/odtphp/Segment.php htdocs/langs/en_US/admin.lang htdocs/societe/soc.php		2017-05-05 14:49:25 +02:00
..
dynamic_prices.php	Replace usage of $bc[$var] with class="oddeven"	2017-04-14 11:22:48 +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
price_rules.php	Corrected bug where product multiprices admin page would not render properly due to a PHP fatal error	2017-03-13 20:33:21 +01:00
product_extrafields.php	NEW Small PDF template for products	2017-04-13 10:26:12 +02:00
product_lot_extrafields.php	NEW Support extrafields on product lot.	2016-09-12 17:27:44 +02:00
product_tools.php	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-05-05 14:49:25 +02:00
product.php	Uniformize name of standard PDF template	2017-05-04 20:16:55 +02:00