Laurent Destailleur 3844d4e6f7 Merge remote-tracking branch 'origin/3.7' into develop ...

Conflicts:
	ChangeLog
	htdocs/core/boxes/box_activity.php
	htdocs/fourn/commande/card.php
	htdocs/user/card.php

2015-03-23 15:16:37 +01:00

..

admin

Configuration page of dinamic prices and price global variables editor

2015-03-14 16:51:38 +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

Scrutinizer Auto-Fixes

2015-03-16 23:21:17 +00:00

class

Merge branch 'price-global-variables' of

2015-03-22 12:45:04 +01:00

composition

Debug virtual product interface

2015-03-11 14:55:45 +01:00

dynamic_price

Merge branch 'price-global-variables' of

2015-03-22 12:45:04 +01:00

stats

Fix: beautify search box

2015-03-06 22:40:41 +01:00

stock

Merge remote-tracking branch 'origin/3.7' into develop

2015-03-22 12:10:39 +01:00

card.php

Debug virtual product interface

2015-03-11 14:55:45 +01:00

document.php

Merge remote-tracking branch 'origin/3.6' into 3.7

2015-01-18 17:13:42 +01:00

fournisseurs.php

Changes for applying new paths

2015-03-14 16:50:02 +01:00

index.php

Changes for applying new paths

2015-03-14 16:50:02 +01:00

list.php

Merge remote-tracking branch 'origin/3.7' into develop

2015-02-24 15:42:28 +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

Fix: navigation in page was wrong and typo errors.

2015-03-23 12:31:32 +01:00

price.php

Changes for applying new paths

2015-03-14 16:50:02 +01:00

reassort.php

Tooltip everywhere

2015-01-30 16:40:33 +01:00

traduction.php

HTML5 - <center> is deprecated - Need CSS - continue working

2014-11-24 06:43:15 +01:00