Laurent Destailleur 71b61fc1f5 Merge remote-tracking branch 'origin/3.4' into develop ...

Conflicts:
	htdocs/core/class/html.formfile.class.php
	htdocs/langs/fr_FR/mails.lang
	htdocs/user/logout.php

2013-06-18 09:51:37 +02:00

..

admin

CR fix

2013-06-14 12:48:27 +02:00

ajax

Fix bug #933: Ajax error

2013-06-08 22:29:18 +02:00

canvas

Prepare move to other licence. For the moment all answers for licence

2013-01-16 15:36:08 +01:00

class

Qual: Removed useless methods

2013-06-16 21:31:21 +02:00

composition

Removed debug message and wrong translation key

2013-06-08 20:01:51 +02:00

stats

Add hook into referent product screen

2013-06-11 11:46:38 +02:00

stock

Qual: We must not concat currency symbol after a price, but use the

2013-06-17 11:58:55 +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: Trans

2013-06-12 16:28:36 +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

Prepare move to other licence. For the moment all answers for licence

2013-01-16 15:36:08 +01:00

price.php

Qual: id of an instance should not be provided into method of instance

2013-06-14 00:21:17 +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