diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 0d2189d28b1..33d14d18f8f 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -750,7 +750,10 @@ if ($_POST['action'] == "addline" && $user->rights->propale->creer) $price_base_type, $pu_ttc, $info_bits, - $type + $type, + -1, + 0, + $_POST['fk_parent_line'] ); if ($result > 0) diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index 2809ff6373b..045002f460c 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -298,7 +298,7 @@ class Propal extends CommonObject * par l'appelant par la methode get_default_tva(societe_vendeuse,societe_acheteuse,'',produit) * et le desc doit deja avoir la bonne valeur (a l'appelant de gerer le multilangue) */ - function addline($propalid, $desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $fk_product=0, $remise_percent=0, $price_base_type='HT', $pu_ttc=0, $info_bits=0, $type=0, $rang=-1, $special_code=0) + function addline($propalid, $desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $fk_product=0, $remise_percent=0, $price_base_type='HT', $pu_ttc=0, $info_bits=0, $type=0, $rang=-1, $special_code=0, $fk_parent_line=0) { global $conf; @@ -385,6 +385,7 @@ class Propal extends CommonObject $this->line->total_ttc=$total_ttc; $this->line->product_type=$type; $this->line->special_code=$special_code; + $this->line->fk_parent_line=$fk_parent_line; // Mise en option de la ligne //if ($conf->global->PROPALE_USE_OPTION_LINE && !$qty) $ligne->special_code=3; @@ -2345,6 +2346,7 @@ class PropaleLigne if (empty($this->remise_percent)) $this->remise_percent=0; if (empty($this->info_bits)) $this->info_bits=0; if (empty($this->special_code)) $this->special_code=0; + if (empty($this->fk_parent_line)) $this->fk_parent_line=0; // Check parameters if ($this->product_type < 0) return -1; @@ -2353,11 +2355,12 @@ class PropaleLigne // Insert line into database $sql = 'INSERT INTO '.MAIN_DB_PREFIX.'propaldet'; - $sql.= ' (fk_propal, description, fk_product, product_type, fk_remise_except, qty, tva_tx, localtax1_tx, localtax2_tx,'; + $sql.= ' (fk_propal, fk_parent_line, description, fk_product, product_type, fk_remise_except, qty, tva_tx, localtax1_tx, localtax2_tx,'; $sql.= ' subprice, remise_percent, '; $sql.= ' info_bits, '; $sql.= ' total_ht, total_tva, total_localtax1, total_localtax2, total_ttc, special_code, rang, marge_tx, marque_tx)'; $sql.= " VALUES (".$this->fk_propal.","; + $sql.= " ".$this->fk_parent_line.","; $sql.= " '".$this->db->escape($this->desc)."',"; $sql.= " ".($this->fk_product?"'".$this->fk_product."'":"null").","; $sql.= " '".$this->product_type."',"; diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 974fcffa8b5..00dbdea4425 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -1325,7 +1325,7 @@ class CommonObject */ function showAddPredefinedProductForm($dateSelector,$seller,$buyer) { - global $conf,$langs; + global $conf,$langs,$object; global $html,$bcnd,$var; // Use global variables + $dateSelector + $seller and $buyer @@ -1340,9 +1340,9 @@ class CommonObject */ function showAddFreeProductForm($dateSelector,$seller,$buyer) { - global $conf,$langs; + global $conf,$langs,$object; global $html,$bcnd,$var; - + // Use global variables + $dateSelector + $seller and $buyer include(DOL_DOCUMENT_ROOT.'/core/tpl/freeproductline_create.tpl.php'); } diff --git a/htdocs/core/tpl/freeproductline_create.tpl.php b/htdocs/core/tpl/freeproductline_create.tpl.php index db94a5510de..f88b1975b13 100644 --- a/htdocs/core/tpl/freeproductline_create.tpl.php +++ b/htdocs/core/tpl/freeproductline_create.tpl.php @@ -28,12 +28,8 @@ ?> -global->PRODUIT_USE_MARKUP) $colspan = 'colspan="2"'; -?> - >trans('AddNewLine').' - '.$langs->trans("FreeZone"); ?> + trans('AddNewLine').' - '.$langs->trans("FreeZone"); ?> trans('VAT'); ?> trans('PriceUHT'); ?> trans('Qty'); ?> @@ -42,16 +38,22 @@ if ($conf->global->PRODUIT_USE_MARKUP) $colspan = 'colspan="2"';
"> - - + + + > - > + select_type_of_lines(isset($_POST["type"])?$_POST["type"]:-1,'type',1); if (($conf->product->enabled && $conf->service->enabled) || (empty($conf->product->enabled) && empty($conf->service->enabled))) echo '
'; - + + if (! empty($object->hooks)) { + foreach($object->hooks as $module) { + $module->formAddProductOption($object); + } + } + // Editor wysiwyg require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); $nbrows=ROWS_2; diff --git a/htdocs/core/tpl/predefinedproductline_create.tpl.php b/htdocs/core/tpl/predefinedproductline_create.tpl.php index 76d68f604ec..bf54d561413 100644 --- a/htdocs/core/tpl/predefinedproductline_create.tpl.php +++ b/htdocs/core/tpl/predefinedproductline_create.tpl.php @@ -28,15 +28,9 @@ ?> -global->PRODUIT_USE_MARKUP) -$colspan = 'colspan="4"'; -else -$colspan = 'colspan="3"'; -?> - > + trans("AddNewLine").' - '; if ($conf->service->enabled) @@ -56,7 +50,7 @@ $colspan = 'colspan="3"'; > - > + global->PRODUIT_MULTIPRICES) @@ -65,6 +59,12 @@ $colspan = 'colspan="3"'; $html->select_produits('','idprod','',$conf->product->limit_size); if (! $conf->global->PRODUIT_USE_SEARCH_TO_SELECT) print '
'; + + if (! empty($object->hooks)) { + foreach($object->hooks as $module) { + $module->formAddProductOption($object); + } + } // Editor wysiwyg require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");