dolibarr/htdocs/product
Laurent Destailleur 1d8b9949d6 Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	htdocs/compta/bank/annuel.php
	htdocs/compta/bank/categ.php
	htdocs/compta/bank/releve.php
	htdocs/core/class/hookmanager.class.php
	htdocs/core/class/html.formfile.class.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/tpl/contacts.tpl.php
	htdocs/cron/list.php
	htdocs/main.inc.php
	htdocs/public/paybox/paymentko.php
	htdocs/public/paybox/paymentok.php
	htdocs/public/paypal/paymentko.php
	htdocs/public/paypal/paymentok.php
	htdocs/theme/bureau2crea/style.css.php
	htdocs/theme/eldy/style.css.php
	htdocs/user/class/user.class.php
	htdocs/viewimage.php
2013-06-24 20:02:02 +02:00
..
admin Fix: convert line delimiters 2013-06-24 17:34:22 +02:00
ajax Merge remote-tracking branch 'origin/3.4' into develop 2013-06-24 20:02:02 +02:00
canvas Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
class Fix: Can autoselect warehouse if only one warehouse 2013-06-24 19:34:56 +02:00
composition Removed debug message and wrong translation key 2013-06-08 20:01:51 +02:00
stats standardize code 2013-06-20 09:18:12 +02:00
stock standardize code 2013-06-20 09:18:12 +02:00
document.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
fiche.php Merge remote-tracking branch 'origin/3.4' into develop 2013-06-14 01:29:43 +02:00
fournisseurs.php TVA NPR : can use * in tva when set supplier price 2013-03-28 09:30:42 +04:00
index.php Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap 2013-04-25 01:13:13 +02:00
liste.php Fix: convert line delimiters 2013-06-24 17:34:22 +02:00
photos.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
popuprop.php standardize code 2013-06-20 09:18:12 +02:00
price.php New: add product price sharing for multicompany 2013-06-24 17:13:08 +02:00
reassort.php Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap 2013-04-25 01:13:13 +02:00
traduction.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00