dolibarr/htdocs/product
Laurent Destailleur 5c5ff72ecd Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	ChangeLog
	htdocs/adherents/fiche.php
	htdocs/comm/fiche.php
	htdocs/comm/mailing/fiche.php
	htdocs/comm/propal.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/compta/paiement.php
	htdocs/core/class/html.formcompany.class.php
	htdocs/core/tpl/login.tpl.php
	htdocs/expedition/fiche.php
	htdocs/fourn/commande/fiche.php
	htdocs/fourn/facture/fiche.php
	htdocs/fourn/facture/paiement.php
	htdocs/fourn/fiche.php
	htdocs/main.inc.php
	htdocs/product/fournisseurs.php
	htdocs/resource/card.php
2015-01-18 17:13:42 +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 Fixed bug which didn't show documents in auto GED when an object had '/' in its ref 2014-12-25 21:47:39 +01:00
composition Uniformize code for search 2014-11-15 11:59:02 +01:00
stats Fix: Bad order field value 2014-12-26 09:29:27 +01:00
stock Fixed: Prices visible into stock tab. 2015-01-12 18:26:11 +01:00
card.php Fixed: Size too low 2014-12-14 20:51:28 +01:00
document.php Merge remote-tracking branch 'origin/3.6' into 3.7 2015-01-18 17:13:42 +01:00
fournisseurs.php Merge remote-tracking branch 'origin/3.6' into 3.7 2015-01-18 17:13:42 +01:00
index.php Merge remote-tracking branch 'origin/3.6' into 3.7 2014-11-16 15:46:08 +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 Merge branch 'develop' of github.com:FHenry/dolibarr into FHenry-develop 2014-06-26 21:38:03 +02:00