fix confilct

This commit is contained in:
Florian HENRY 2016-04-26 14:21:40 +02:00
parent 8d91523619
commit b82a216879

View File

@ -3236,7 +3236,7 @@ abstract class CommonObject
*/ */
function printObjectLines($action, $seller, $buyer, $selected=0, $dateSelector=0) function printObjectLines($action, $seller, $buyer, $selected=0, $dateSelector=0)
{ {
global $conf, $hookmanager, $inputalsopricewithtax, $usemargins, $disableedit, $disablemove, $langs, $user; global $conf, $hookmanager, $inputalsopricewithtax, $usemargins, $langs, $user;
// Define usemargins // Define usemargins
$usemargins=0; $usemargins=0;