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

FIX creation of the shipment if order contains services

Browse Source
This commit is contained in:
Laurent Destailleur 2022-03-01 01:28:47 +01:00
parent 0aa7e7df88
commit 70a18bc15a
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
htdocs/expedition/class/expedition.class.php
View File

@ -370,13 +370,15 @@ class Expedition extends CommonObject
// Insert of lines // Insert of lines
$num = count($this->lines); $num = count($this->lines);
for ($i = 0; $i < $num; $i++) { for ($i = 0; $i < $num; $i++) {
if (!isset($this->lines[$i]->detail_batch)) { // no batch management if (empty($this->lines[$i]->product_type) || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
if ($this->create_line($this->lines[$i]->entrepot_id, $this->lines[$i]->origin_line_id, $this->lines[$i]->qty, $this->lines[$i]->rang, $this->lines[$i]->array_options) <= 0) { if (!isset($this->lines[$i]->detail_batch)) { // no batch management
$error++; if ($this->create_line($this->lines[$i]->entrepot_id, $this->lines[$i]->origin_line_id, $this->lines[$i]->qty, $this->lines[$i]->rang, $this->lines[$i]->array_options) <= 0) {
} $error++;
} else { // with batch management }
if ($this->create_line_batch($this->lines[$i], $this->lines[$i]->array_options) <= 0) { } else { // with batch management
$error++; if ($this->create_line_batch($this->lines[$i], $this->lines[$i]->array_options) <= 0) {
$error++;
}
} }
} }
} }
@ -916,6 +918,7 @@ class Expedition extends CommonObject
// Copy the rang of the order line to the expedition line // Copy the rang of the order line to the expedition line
$line->rang = $orderline->rang; $line->rang = $orderline->rang;
$line->product_type = $orderline->product_type;
if (!empty($conf->stock->enabled) && !empty($orderline->fk_product)) { if (!empty($conf->stock->enabled) && !empty($orderline->fk_product)) {
$fk_product = $orderline->fk_product; $fk_product = $orderline->fk_product;
@ -968,6 +971,8 @@ class Expedition extends CommonObject
} }
$this->lines[$num] = $line; $this->lines[$num] = $line;
return 1;
} }
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@ -2602,6 +2607,12 @@ class ExpeditionLigne extends CommonObjectLine
*/ */
public $product_desc; public $product_desc;
/**
* Type of the product. 0 for product, 1 for service
* @var int
*/
public $product_type = 0;
/** /**
* @var int rang of line * @var int rang of line
*/ */