diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index fce3661c0ce..a388ce8bc07 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -637,7 +637,7 @@ else if ($action == "setabsolutediscount" && $user->rights->propal->creer) else if (($action == 'addline' || $action == 'addline_predef') && $user->rights->propal->creer) { // Set if we used free entry or predefined product - if (GETPOST('addline_libre') + if (GETPOST('addline_libre') || (GETPOST('dp_desc') && ! GETPOST('addline_libre') && ! GETPOST('idprod', 'int')>0) // we push enter onto qty field ) { @@ -647,7 +647,7 @@ else if (($action == 'addline' || $action == 'addline_predef') && $user->rights- $price_ht = GETPOST('price_ht'); $tva_tx=(GETPOST('tva_tx')?GETPOST('tva_tx'):0); } - if (GETPOST('addline_predefined') + if (GETPOST('addline_predefined') || (! GETPOST('dp_desc') && ! GETPOST('addline_predefined') && GETPOST('idprod', 'int')>0) // we push enter onto qty field ) { @@ -953,7 +953,7 @@ else if ($action == 'updateligne' && $user->rights->propal->creer && GETPOST('sa } // Define special_code for special lines - $special_code=0; + $special_code=GETPOST('special_code'); if (! GETPOST('qty')) $special_code=3; // Check minimum price diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index 7dfb5a506e1..2d3d5f7557c 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -2732,10 +2732,10 @@ class PropaleLigne extends CommonObject var $marge_tx; var $marque_tx; - var $special_code; // Liste d'options non cumulabels: + var $special_code; // Tag for special lines (exlusive tags) // 1: frais de port // 2: ecotaxe - // 3: ?? + // 3: option line (when qty = 0) var $info_bits = 0; // Liste d'options cumulables: // Bit 0: 0 si TVA normal - 1 si TVA NPR