lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX #5752 Bug VAT NPR not propagated during proposal cloning

Browse Source
This commit is contained in:
Laurent Destailleur 2016-10-01 18:33:37 +02:00
parent ea0687f613
commit 6f26a7390e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/comm/propal/class/propal.class.php
View File

@ -926,7 +926,7 @@ class Propal extends CommonObject
for ($i=0;$i<$num;$i++) for ($i=0;$i<$num;$i++)
{ {
// Reset fk_parent_line for no child products and special product // Reset fk_parent_line for line that are not child lines or special product
if (($this->lines[$i]->product_type != 9 && empty($this->lines[$i]->fk_parent_line)) || $this->lines[$i]->product_type == 9) { if (($this->lines[$i]->product_type != 9 && empty($this->lines[$i]->fk_parent_line)) || $this->lines[$i]->product_type == 9) {
$fk_parent_line = 0; $fk_parent_line = 0;
} }
@ -942,7 +942,7 @@ class Propal extends CommonObject
$this->lines[$i]->remise_percent, $this->lines[$i]->remise_percent,
'HT', 'HT',
0, 0,
0, $this->lines[$i]->info_bits,
$this->lines[$i]->product_type, $this->lines[$i]->product_type,
$this->lines[$i]->rang, $this->lines[$i]->rang,
$this->lines[$i]->special_code, $this->lines[$i]->special_code,
@ -1158,6 +1158,7 @@ class Propal extends CommonObject
$clonedObj->ref = $modPropale->getNextValue($objsoc,$clonedObj); $clonedObj->ref = $modPropale->getNextValue($objsoc,$clonedObj);
// Create clone // Create clone
$result=$clonedObj->create($user); $result=$clonedObj->create($user);
if ($result < 0) $error++; if ($result < 0) $error++;
else else