vignesh/dolibarr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch '23.0' of git@github.com:Dolibarr/dolibarr.git into 23.0

Browse source
This commit is contained in:
Laurent Destailleur 2026-05-10 17:00:44 +02:00
commit f6df1be26e
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
htdocs/compta/facture/card-rec.php
View file

@ -760,6 +760,16 @@ if (empty($reshook)) {
$result = $object->addline($desc, $pu_ht, (float) $qty, $tva_tx, $localtax1_tx, $localtax2_tx, $idprod, $remise_percent, $price_base_type, $info_bits, 0, $pu_ttc, $type, -1, $special_code, $label, (int) $fk_unit, 0, $date_start_fill, $date_end_fill, (int) $fournprice, $buyingprice, $fk_parent_line);
if ($result > 0) {
// TODO add "insert" function into FactureLigneRec or add "invoicerecline.class.php" (same of "factureligne.class.php")
$objectline = new FactureLigneRec($db);
if ($objectline->fetch($result)) {
$objectline->array_options = $array_options;
$result = $objectline->insertExtraFields();
if ($result < 0) {
setEventMessages($langs->trans('Error').$result, null, 'errors');
}
}
// Define output language and generate document
/*if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
{

4
htdocs/mrp/class/mo.class.php
View file

@ -742,9 +742,10 @@ class Mo extends CommonObject
$moline = new MoLine($this->db);
// Line to produce
$moline->fk_mo = $this->id;
$moline->fk_mo = (int) $this->id;
$moline->qty = (float) $this->qty;
$moline->fk_product = (int) $this->fk_product;
$moline->fk_warehouse = (int) $this->fk_warehouse;
$moline->position = 1;
include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
@ -834,6 +835,7 @@ class Mo extends CommonObject
$this->errors[] = $this->error;
} else {
$moline->fk_product = $line->fk_product;
$moline->fk_warehouse = !empty($line->fk_warehouse) ? $line->fk_warehouse : (!empty($bom->fk_warehouse) ? $bom->fk_warehouse : $this->fk_warehouse);
$moline->role = $role;
$moline->position = $line->position;
$moline->qty_frozen = $line->qty_frozen;