|
@@ -4131,7 +4131,7 @@ class OrderLine extends CommonOrderLine
|
|
|
$sql .= ' cd.fk_unit,';
|
|
|
$sql .= ' cd.fk_multicurrency, cd.multicurrency_code, cd.multicurrency_subprice, cd.multicurrency_total_ht, cd.multicurrency_total_tva, cd.multicurrency_total_ttc,';
|
|
|
$sql .= ' p.ref as product_ref, p.label as product_label, p.description as product_desc, p.tobatch as product_tobatch,';
|
|
|
- $sql .= ' cd.date_start, cd.date_end';
|
|
|
+ $sql .= ' cd.date_start, cd.date_end, cd.vat_src_code';
|
|
|
$sql .= ' FROM '.MAIN_DB_PREFIX.'commandedet as cd';
|
|
|
$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON cd.fk_product = p.rowid';
|
|
|
$sql .= ' WHERE cd.rowid = '.((int) $rowid);
|
|
@@ -4352,7 +4352,8 @@ class OrderLine extends CommonOrderLine
|
|
|
|
|
|
// if buy price not defined, define buyprice as configured in margin admin
|
|
|
if ($this->pa_ht == 0 && $pa_ht_isemptystring) {
|
|
|
- if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0) {
|
|
|
+ $result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product);
|
|
|
+ if ($result < 0) {
|
|
|
return $result;
|
|
|
} else {
|
|
|
$this->pa_ht = $result;
|
|
@@ -4529,7 +4530,8 @@ class OrderLine extends CommonOrderLine
|
|
|
|
|
|
// if buy price not defined, define buyprice as configured in margin admin
|
|
|
if ($this->pa_ht == 0 && $pa_ht_isemptystring) {
|
|
|
- if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0) {
|
|
|
+ $result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product);
|
|
|
+ if ($result < 0) {
|
|
|
return $result;
|
|
|
} else {
|
|
|
$this->pa_ht = $result;
|