Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 20.0
This commit is contained in:
commit
a781211d2f
4 changed files with 10 additions and 6 deletions
|
|
@ -376,7 +376,9 @@ class Boms extends DolibarrApi
|
|||
$request_data->position,
|
||||
$request_data->fk_bom_child,
|
||||
$request_data->import_key,
|
||||
$request_data->fk_unit
|
||||
$request_data->fk_unit,
|
||||
$request_data->array_options,
|
||||
$request_data->fk_default_workstation
|
||||
);
|
||||
|
||||
if ($updateRes > 0) {
|
||||
|
|
@ -425,7 +427,9 @@ class Boms extends DolibarrApi
|
|||
$request_data->efficiency,
|
||||
$request_data->position,
|
||||
$request_data->import_key,
|
||||
$request_data->fk_unit
|
||||
$request_data->fk_unit,
|
||||
$request_data->array_options,
|
||||
$request_data->fk_default_workstation
|
||||
);
|
||||
|
||||
if ($updateRes > 0) {
|
||||
|
|
|
|||
|
|
@ -4249,8 +4249,8 @@ abstract class CommonObject
|
|||
|
||||
$sourceid = (!empty($sourceid) ? $sourceid : $this->id);
|
||||
$targetid = (!empty($targetid) ? $targetid : $this->id);
|
||||
$sourcetype = (!empty($sourcetype) ? $sourcetype : $this->element);
|
||||
$targettype = (!empty($targettype) ? $targettype : $this->element);
|
||||
$sourcetype = (!empty($sourcetype) ? $sourcetype : $this->getElementType());
|
||||
$targettype = (!empty($targettype) ? $targettype : $this->getElementType());
|
||||
|
||||
/*if (empty($sourceid) && empty($targetid))
|
||||
{
|
||||
|
|
|
|||
|
|
@ -806,7 +806,7 @@ class Products extends DolibarrApi
|
|||
* @param int $availability Product availability
|
||||
* @param string $ref_fourn Supplier ref
|
||||
* @param float $tva_tx New VAT Rate (For example 8.5. Should not be a string)
|
||||
* @param string|float $charges costs affering to product
|
||||
* @param float $charges costs affering to product
|
||||
* @param float $remise_percent Discount regarding qty (percent)
|
||||
* @param float $remise Discount regarding qty (amount)
|
||||
* @param int $newnpr Set NPR or not
|
||||
|
|
|
|||
|
|
@ -321,7 +321,7 @@ class Thirdparties extends DolibarrApi
|
|||
$this->company->setNoEmail($this->company->no_email);
|
||||
}
|
||||
|
||||
if ($this->company->update($id, DolibarrApiAccess::$user, 1, '', '', 'update', 1) > 0) {
|
||||
if ($this->company->update($id, DolibarrApiAccess::$user, 1, 1, 1, 'update', 1) > 0) {
|
||||
return $this->get($id);
|
||||
} else {
|
||||
throw new RestException(500, $this->company->error);
|
||||
|
|
|
|||
Loading…
Reference in a new issue