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

FIX #23899

Browse Source
This commit is contained in:
Laurent Destailleur 2023-03-12 17:30:53 +01:00
parent 5d31949263
commit 534f1868f5
1 changed files with 46 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
htdocs/fourn/class/fournisseur.facture.class.php
View File

@ -649,7 +649,7 @@ class FactureFournisseur extends CommonInvoice
$res = $this->updateline( $res = $this->updateline(
$idligne, $idligne,
$this->lines[$i]->description, $this->lines[$i]->description,
$this->lines[$i]->pu_ht, $this->lines[$i]->subprice,
$this->lines[$i]->tva_tx.($this->lines[$i]->vat_src_code ? ' ('.$this->lines[$i]->vat_src_code.')' : ''), $this->lines[$i]->tva_tx.($this->lines[$i]->vat_src_code ? ' ('.$this->lines[$i]->vat_src_code.')' : ''),
$this->lines[$i]->localtax1_tx, $this->lines[$i]->localtax1_tx,
$this->lines[$i]->localtax2_tx, $this->lines[$i]->localtax2_tx,
@ -1824,12 +1824,11 @@ class FactureFournisseur extends CommonInvoice
$cpt = count($this->lines); $cpt = count($this->lines);
for ($i = 0; $i < $cpt; $i++) { for ($i = 0; $i < $cpt; $i++) {
if ($this->lines[$i]->fk_product > 0) { if ($this->lines[$i]->fk_product > 0) {
$this->line = $this->lines[$i];
$mouvP = new MouvementStock($this->db); $mouvP = new MouvementStock($this->db);
$mouvP->origin = &$this; $mouvP->origin = &$this;
$mouvP->setOrigin($this->element, $this->id); $mouvP->setOrigin($this->element, $this->id);
// We increase stock for product // We increase stock for product
$up_ht_disc = $this->lines[$i]->pu_ht; $up_ht_disc = $this->lines[$i]->subprice;
if (!empty($this->lines[$i]->remise_percent) && empty($conf->global->STOCK_EXCLUDE_DISCOUNT_FOR_PMP)) { if (!empty($this->lines[$i]->remise_percent) && empty($conf->global->STOCK_EXCLUDE_DISCOUNT_FOR_PMP)) {
$up_ht_disc = price2num($up_ht_disc * (100 - $this->lines[$i]->remise_percent) / 100, 'MU'); $up_ht_disc = price2num($up_ht_disc * (100 - $this->lines[$i]->remise_percent) / 100, 'MU');
} }
@ -1841,7 +1840,6 @@ class FactureFournisseur extends CommonInvoice
if ($result < 0) { if ($result < 0) {
$error++; $error++;
} }
unset($this->line);
} }
} }
} }
@ -2174,61 +2172,61 @@ class FactureFournisseur extends CommonInvoice
} }
// Insert line // Insert line
$this->line = new SupplierInvoiceLine($this->db); $supplierinvoiceline = new SupplierInvoiceLine($this->db);
$this->line->context = $this->context; $supplierinvoiceline->context = $this->context;
$this->line->fk_facture_fourn = $this->id; $supplierinvoiceline->fk_facture_fourn = $this->id;
//$this->line->label=$label; // deprecated //$supplierinvoiceline->label=$label; // deprecated
$this->line->desc = $desc; $supplierinvoiceline->desc = $desc;
$this->line->ref_supplier = $ref_supplier; $supplierinvoiceline->ref_supplier = $ref_supplier;
$this->line->qty = ($this->type == self::TYPE_CREDIT_NOTE ? abs($qty) : $qty); // For credit note, quantity is always positive and unit price negative $supplierinvoiceline->qty = ($this->type == self::TYPE_CREDIT_NOTE ? abs($qty) : $qty); // For credit note, quantity is always positive and unit price negative
$this->line->subprice = ($this->type == self::TYPE_CREDIT_NOTE ? -abs($pu_ht) : $pu_ht); // For credit note, unit price always negative, always positive otherwise $supplierinvoiceline->subprice = ($this->type == self::TYPE_CREDIT_NOTE ? -abs($pu_ht) : $pu_ht); // For credit note, unit price always negative, always positive otherwise
$this->line->vat_src_code = $vat_src_code; $supplierinvoiceline->vat_src_code = $vat_src_code;
$this->line->tva_tx = $txtva; $supplierinvoiceline->tva_tx = $txtva;
$this->line->localtax1_tx = ($total_localtax1 ? $localtaxes_type[1] : 0); $supplierinvoiceline->localtax1_tx = ($total_localtax1 ? $localtaxes_type[1] : 0);
$this->line->localtax2_tx = ($total_localtax2 ? $localtaxes_type[3] : 0); $supplierinvoiceline->localtax2_tx = ($total_localtax2 ? $localtaxes_type[3] : 0);
$this->line->localtax1_type = empty($localtaxes_type[0]) ? '' : $localtaxes_type[0]; $supplierinvoiceline->localtax1_type = empty($localtaxes_type[0]) ? '' : $localtaxes_type[0];
$this->line->localtax2_type = empty($localtaxes_type[2]) ? '' : $localtaxes_type[2]; $supplierinvoiceline->localtax2_type = empty($localtaxes_type[2]) ? '' : $localtaxes_type[2];
$this->line->total_ht = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ? -abs($total_ht) : $total_ht); // For credit note and if qty is negative, total is negative $supplierinvoiceline->total_ht = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ? -abs($total_ht) : $total_ht); // For credit note and if qty is negative, total is negative
$this->line->total_tva = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ? -abs($total_tva) : $total_tva); // For credit note and if qty is negative, total is negative $supplierinvoiceline->total_tva = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ? -abs($total_tva) : $total_tva); // For credit note and if qty is negative, total is negative
$this->line->total_localtax1 = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ? -abs($total_localtax1) : $total_localtax1); // For credit note and if qty is negative, total is negative $supplierinvoiceline->total_localtax1 = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ? -abs($total_localtax1) : $total_localtax1); // For credit note and if qty is negative, total is negative
$this->line->total_localtax2 = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ? -abs($total_localtax2) : $total_localtax2); // For credit note and if qty is negative, total is negative $supplierinvoiceline->total_localtax2 = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ? -abs($total_localtax2) : $total_localtax2); // For credit note and if qty is negative, total is negative
$this->line->total_ttc = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ? -abs($total_ttc) : $total_ttc); // For credit note and if qty is negative, total is negative $supplierinvoiceline->total_ttc = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ? -abs($total_ttc) : $total_ttc); // For credit note and if qty is negative, total is negative
$this->line->fk_product = $fk_product; $supplierinvoiceline->fk_product = $fk_product;
$this->line->product_type = $type; $supplierinvoiceline->product_type = $type;
$this->line->remise_percent = $remise_percent; $supplierinvoiceline->remise_percent = $remise_percent;
$this->line->date_start = $date_start; $supplierinvoiceline->date_start = $date_start;
$this->line->date_end = $date_end; $supplierinvoiceline->date_end = $date_end;
$this->line->fk_code_ventilation = $ventil; $supplierinvoiceline->fk_code_ventilation = $ventil;
$this->line->rang = $rang; $supplierinvoiceline->rang = $rang;
$this->line->info_bits = $info_bits; $supplierinvoiceline->info_bits = $info_bits;
$this->line->fk_remise_except = $fk_remise_except; $supplierinvoiceline->fk_remise_except = $fk_remise_except;
$this->line->special_code = ((string) $special_code != '' ? $special_code : $this->special_code); $supplierinvoiceline->special_code = ((string) $special_code != '' ? $special_code : $this->special_code);
$this->line->fk_parent_line = $fk_parent_line; $supplierinvoiceline->fk_parent_line = $fk_parent_line;
$this->line->origin = $this->origin; $supplierinvoiceline->origin = $this->origin;
$this->line->origin_id = $origin_id; $supplierinvoiceline->origin_id = $origin_id;
$this->line->fk_unit = $fk_unit; $supplierinvoiceline->fk_unit = $fk_unit;
// Multicurrency // Multicurrency
$this->line->fk_multicurrency = $this->fk_multicurrency; $supplierinvoiceline->fk_multicurrency = $this->fk_multicurrency;
$this->line->multicurrency_code = $this->multicurrency_code; $supplierinvoiceline->multicurrency_code = $this->multicurrency_code;
$this->line->multicurrency_subprice = ($this->type == self::TYPE_CREDIT_NOTE ? -abs($pu_ht_devise) : $pu_ht_devise); // For credit note, unit price always negative, always positive otherwise $supplierinvoiceline->multicurrency_subprice = ($this->type == self::TYPE_CREDIT_NOTE ? -abs($pu_ht_devise) : $pu_ht_devise); // For credit note, unit price always negative, always positive otherwise
$this->line->multicurrency_total_ht = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ? -abs($multicurrency_total_ht) : $multicurrency_total_ht); // For credit note and if qty is negative, total is negative $supplierinvoiceline->multicurrency_total_ht = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ? -abs($multicurrency_total_ht) : $multicurrency_total_ht); // For credit note and if qty is negative, total is negative
$this->line->multicurrency_total_tva = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ? -abs($multicurrency_total_tva) : $multicurrency_total_tva); // For credit note and if qty is negative, total is negative $supplierinvoiceline->multicurrency_total_tva = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ? -abs($multicurrency_total_tva) : $multicurrency_total_tva); // For credit note and if qty is negative, total is negative
$this->line->multicurrency_total_ttc = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ? -abs($multicurrency_total_ttc) : $multicurrency_total_ttc); // For credit note and if qty is negative, total is negative $supplierinvoiceline->multicurrency_total_ttc = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ? -abs($multicurrency_total_ttc) : $multicurrency_total_ttc); // For credit note and if qty is negative, total is negative
if (is_array($array_options) && count($array_options) > 0) { if (is_array($array_options) && count($array_options) > 0) {
$this->line->array_options = $array_options; $supplierinvoiceline->array_options = $array_options;
} }
$result = $this->line->insert($notrigger); $result = $supplierinvoiceline->insert($notrigger);
if ($result > 0) { if ($result > 0) {
// Reorder if child line // Reorder if child line
if (!empty($fk_parent_line)) { if (!empty($fk_parent_line)) {
@ -2244,15 +2242,15 @@ class FactureFournisseur extends CommonInvoice
$result = $this->update_price(1, 'auto', 0, $this->thirdparty); // The addline method is designed to add line from user input so total calculation with update_price must be done using 'auto' mode. $result = $this->update_price(1, 'auto', 0, $this->thirdparty); // The addline method is designed to add line from user input so total calculation with update_price must be done using 'auto' mode.
if ($result > 0) { if ($result > 0) {
$this->db->commit(); $this->db->commit();
return $this->line->id; return $supplierinvoiceline->id;
} else { } else {
$this->error = $this->db->error(); $this->error = $this->db->error();
$this->db->rollback(); $this->db->rollback();
return -1; return -1;
} }
} else { } else {
$this->error = $this->line->error; $this->error = $supplierinvoiceline->error;
$this->errors = $this->line->errors; $this->errors = $supplierinvoiceline->errors;
$this->db->rollback(); $this->db->rollback();
return -2; return -2;
} }