Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
This commit is contained in:
parent
d35dd5a5a2
commit
cb604da904
2 changed files with 2 additions and 3 deletions
|
|
@ -203,10 +203,10 @@ class Shipments extends DolibarrApi
|
|||
$shipmentline = new ExpeditionLigne($this->db);
|
||||
|
||||
$shipmentline->entrepot_id = $line->entrepot_id;
|
||||
$shipmentline->fk_element = $this->origin_id; // example: order id. this->origin is 'commande'
|
||||
$shipmentline->fk_element = $line->origin_id; // example: order id. this->origin is 'commande'
|
||||
$shipmentline->origin_line_id = $line->origin_line_id; // example: order id
|
||||
$shipmentline->fk_elementdet = $line->origin_line_id; // example: order line id
|
||||
$shipmentline->element_type = $this->origin_type; // example 'commande' or 'order'
|
||||
$shipmentline->element_type = $line->origin_type; // example 'commande' or 'order'
|
||||
$shipmentline->qty = $line->qty;
|
||||
$shipmentline->rang = $line->rang;
|
||||
$shipmentline->array_options = $line->array_options;
|
||||
|
|
|
|||
|
|
@ -1450,7 +1450,6 @@ class User extends CommonObject
|
|||
* @return void
|
||||
*
|
||||
* @see clearrights(), delrights(), addrights(), hasRight()
|
||||
* @deprecated Use instead loadRights()
|
||||
* @phpstan-ignore-next-line
|
||||
*/
|
||||
public function getrights($moduletag = '', $forcereload = 0)
|
||||
|
|
|
|||
Loading…
Reference in a new issue