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

Fix: #23415 correct numbering on 'ref'.

Browse Source
This commit is contained in:
Christian Humpel 2023-01-04 16:33:39 +01:00
parent 6df4795ded
commit 78b12c8298
1 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
htdocs/bom/class/api_boms.class.php
View File

@ -205,6 +205,11 @@ class Boms extends DolibarrApi
foreach ($request_data as $field => $value) { foreach ($request_data as $field => $value) {
$this->bom->$field = $value; $this->bom->$field = $value;
} }
// Check Ref Numbering
// We check that object has a temporary ref
$this->CheckRefNumbering();
if (!$this->bom->create(DolibarrApiAccess::$user)) { if (!$this->bom->create(DolibarrApiAccess::$user)) {
throw new RestException(500, "Error creating BOM", array_merge(array($this->bom->error), $this->bom->errors)); throw new RestException(500, "Error creating BOM", array_merge(array($this->bom->error), $this->bom->errors));
} }
@ -241,6 +246,10 @@ class Boms extends DolibarrApi
$this->bom->$field = $value; $this->bom->$field = $value;
} }
// Check Ref Numbering
// We check that object has a temporary ref
$this->CheckRefNumbering();
if ($this->bom->update(DolibarrApiAccess::$user) > 0) { if ($this->bom->update(DolibarrApiAccess::$user) > 0) {
return $this->get($id); return $this->get($id);
} else { } else {
@ -526,7 +535,7 @@ class Boms extends DolibarrApi
{ {
$myobject = array(); $myobject = array();
foreach ($this->bom->fields as $field => $propfield) { foreach ($this->bom->fields as $field => $propfield) {
if (in_array($field, array('rowid', 'entity', 'date_creation', 'tms', 'fk_user_creat')) || $propfield['notnull'] != 1) { if (in_array($field, array('rowid', 'entity', 'ref', 'date_creation', 'tms', 'fk_user_creat')) || $propfield['notnull'] != 1) {
continue; // Not a mandatory field continue; // Not a mandatory field
} }
if (!isset($data[$field])) { if (!isset($data[$field])) {
@ -536,4 +545,19 @@ class Boms extends DolibarrApi
} }
return $myobject; return $myobject;
} }
/**
* Validate the ref field and get the next Number if it's necessary.
*
* @return void
*/
private function CheckRefNumbering(): void
{
$ref = substr($this->bom->ref, 1, 4);
if ($this->bom->status > 0 && (empty($this->bom->ref) || $ref == 'PROV')) {
$this->bom->fetch_product();
$numref = $this->bom->getNextNumRef($this->bom->product);
$this->bom->ref = $numref;
}
}
} }