Merge pull request #247 from cbattarel/marges

htdocs/admin/marges.php

htdocs/comm/propal.php

htdocs/comm/propal/class/propal.class.php

htdocs/commande/class/commande.class.php

htdocs/commande/fiche.php

htdocs/compta/facture.php

htdocs/compta/facture/class/facture.class.php

htdocs/core/class/commonobject.class.php

htdocs/core/class/html.form.class.php

htdocs/core/lib/ajax.lib.php

htdocs/core/modules/modMarges.class.php

htdocs/core/tpl/freeproductline_create.tpl.php

htdocs/core/tpl/freeproductline_edit.tpl.php

htdocs/core/tpl/freeproductline_view.tpl.php

htdocs/core/tpl/predefinedproductline_create.tpl.php

htdocs/core/tpl/predefinedproductline_edit.tpl.php

htdocs/core/tpl/predefinedproductline_view.tpl.php

htdocs/fourn/class/fournisseur.product.class.php

htdocs/fourn/product/getSupplierPrices.php

htdocs/install/mysql/migration/3.2.0-3.3.0.sql