Laurent Destailleur e220ce5a82 Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/comm/card.php htdocs/comm/propal.php htdocs/commande/card.php htdocs/compta/facture.php htdocs/compta/prelevement/class/bonprelevement.class.php htdocs/core/class/html.formcompany.class.php htdocs/custom/.gitignore htdocs/expedition/card.php htdocs/fourn/card.php htdocs/product/fournisseurs.php		2015-01-18 18:44:22 +01:00
..
admin	Fix: Debug of feature PRODUIT_CUSTOMER_PRICES_BY_QTY. Dev seems to not	2014-12-14 20:41:11 +01:00
ajax	Fix: Debug of feature PRODUIT_CUSTOMER_PRICES_BY_QTY. Dev seems to not	2014-12-14 20:41:11 +01:00
canvas	Merge remote-tracking branch 'origin/3.6' into develop	2014-09-28 02:14:32 +02:00
class	Merge pull request #2224 from KreizIT/batch_transfert	2015-01-09 22:46:40 +01:00
composition	Replace <center> tags	2014-11-25 20:13:43 +01:00
stats	Fix: Bad order field value	2014-12-26 09:43:55 +01:00
stock	Fixed: pmp update after makign a stock move.	2015-01-12 20:55:15 +01:00
card.php	Merge remote-tracking branch 'origin/3.7' into develop	2014-12-15 10:33:14 +01:00
document.php	Merge remote-tracking branch 'origin/3.6' into 3.7	2015-01-18 17:13:42 +01:00
expression.php	Prepare 3.8 dev	2014-12-03 17:06:44 +01:00
fournisseurs.php	Merge remote-tracking branch 'origin/3.7' into develop	2015-01-18 18:44:22 +01:00
index.php	WIP PSR2	2015-01-08 18:36:03 +01:00
list.php	Fixed: The visualization of status with mutualized picto was lost, so i	2014-11-24 01:16:26 +01:00
photos.php	Better error management and better error message for reporting upload or	2014-10-18 14:56:06 +02:00
popuprop.php	Merge remote-tracking branch 'origin/3.6' into 3.7	2014-12-26 04:44:15 +01:00
price.php	Fixed: Prices visible into stock tab.	2015-01-12 18:26:11 +01:00
reassort.php	Fix: Bugs reported by scrutinizer	2014-11-15 16:20:03 +01:00
traduction.php	HTML5 - <center> is deprecated - Need CSS - continue working	2014-11-24 06:43:15 +01:00