dolibarr/htdocs/product
Laurent Destailleur 2bb1945a2f Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	htdocs/compta/prelevement/class/rejetprelevement.class.php
	htdocs/compta/sociales/class/paymentsocialcontribution.class.php
	htdocs/contact/exportimport.php
	htdocs/contact/ldap.php
	htdocs/contact/perso.php
	htdocs/contact/vcard.php
	htdocs/core/class/commonobject.class.php
	htdocs/product/reassort.php
	htdocs/projet/liste.php
	htdocs/societe/consumption.php
	htdocs/societe/info.php
2015-07-19 12:04:30 +02: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 Fix: wrong user right 2015-06-17 16:33:18 +02: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 FIX #2856 : Wrong table design 2015-05-21 17:40:36 +02:00
card.php Fix: Not reading external barcode numeration module 2015-06-11 10:43:12 +02: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 FIX #3009: Better filtering to prevent SQL injection 2015-06-11 10:38:29 +02:00
photos.php Better error management and better error message for reporting upload or 2014-10-18 14:56:06 +02:00
popuprop.php Fix: navigation in page was wrong and typo errors. 2015-03-23 12:31:32 +01:00
price.php Merge remote-tracking branch 'origin/3.6' into 3.7 2015-06-14 17:11:36 +02:00
reassort.php Merge remote-tracking branch 'origin/3.6' into 3.7 2015-07-19 12:04:30 +02:00
traduction.php Merge branch 'develop' of github.com:FHenry/dolibarr into FHenry-develop 2014-06-26 21:38:03 +02:00