dolibarr/htdocs/product
Laurent Destailleur dc050d39eb Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/adherents/type.php
	htdocs/core/boxes/box_task.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/js/lib_batch.js
	htdocs/core/modules/modUser.class.php
	htdocs/fichinter/card.php
	htdocs/fourn/commande/card.php
	htdocs/societe/consumption.php
	htdocs/user/info.php
	htdocs/user/note.php
	htdocs/user/param_ihm.php
	htdocs/user/perms.php
2015-06-29 00:09:28 +02:00
..
admin Disable option that i can't understand. 2015-06-19 00:18:41 +02:00
ajax Fix: Debug of feature PRODUIT_CUSTOMER_PRICES_BY_QTY. Dev seems to not 2014-12-14 20:41:11 +01:00
canvas Clean code 2015-06-12 13:21:21 +02:00
class Merge remote-tracking branch 'origin/3.7' into develop 2015-06-29 00:09:28 +02:00
composition typo 2015-06-19 06:06:46 +02:00
dynamic_price Merge branch 'price-global-variables' of 2015-03-22 12:45:04 +01:00
stats Minor look fix 2015-06-19 00:36:03 +02:00
stock Fix: print_liste_field_titre(''); 2015-06-26 06:23:29 +02:00
card.php NEW Replace category edition page on members with new select2 component. 2015-06-27 23:01:05 +02:00
document.php NEW Can upload files on leave requests. Use more standard permissions. 2015-06-27 11:45:23 +02:00
fournisseurs.php Uniformize code 2015-06-06 14:21:18 +02:00
index.php Fix: missing getEntity function 2015-04-19 03:05:37 +02:00
list.php Fix: print_liste_field_titre(''); 2015-06-26 06:23:29 +02:00
popuprop.php Add picto for commercial pages titles 2015-04-18 23:17:44 +02:00
price.php Debug price per customer 2015-06-19 12:13:05 +02:00
reassort.php Merge remote-tracking branch 'origin/3.7' into develop 2015-05-31 03:30:38 +02:00
reassortlot.php Added types constants to categories 2015-05-23 18:52:31 +02:00
traduction.php Uniformize code 2015-04-07 03:00:11 +02:00