Laurent Destailleur 0b045a2d96 Merge remote-tracking branch 'origin/3.3' into develop ...

Conflicts:
	htdocs/core/boxes/box_activity.php
	htdocs/filefunc.inc.php

2013-01-16 14:11:19 +01:00

..

ajax

show costprice instead of buyingprice if setup of margin module is costprice

2013-01-11 15:39:11 +01:00

class

Fix: change for a neutral email

2012-12-30 15:13:49 +01:00

commande

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

2013-01-08 11:10:47 +01:00

facture

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

2013-01-16 14:11:19 +01:00

paiement

Fix: strict mode hurricane

2012-09-15 10:01:35 +02:00

product

Fix: change for a neutral email

2012-12-30 15:13:49 +01:00

contact.php

Fix: change for a neutral email

2012-12-30 15:13:49 +01:00

fiche.php

Fix: [ bug #662 ] Bad aplication of Localtax2 for suppliers if country

2013-01-05 16:03:00 +01:00

index.php

Fix: change for a neutral email

2012-12-30 15:13:49 +01:00

liste.php

Fix: change for a neutral email

2012-12-30 15:13:49 +01:00

recap-fourn.php

Fix: strict mode tornado

2012-09-15 11:21:22 +02:00