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

..

productMargins.php

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

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

thirdpartyMargins.php

Fix margin calculation

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