Laurent Destailleur 8a82c8c5d5 Merge remote-tracking branch 'origin/3.3' into 3.4 ...

Conflicts:
	htdocs/contact/class/contact.class.php
	htdocs/margin/agentMargins.php
	htdocs/margin/tabs/productMargins.php

2013-05-07 13:08:30 +02:00

..

admin

Improved es_ES translations + replaced lang key in margins module admin page

2013-04-27 12:56:57 +02:00

lib

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

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

tabs

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

2013-05-07 13:08:30 +02:00

agentMargins.php

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

2013-05-07 13:08:30 +02:00

customerMargins.php

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

2013-05-07 13:08:30 +02:00

index.php

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

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

productMargins.php

Fix margin calculation

2013-05-03 15:26:20 +02:00