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

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

Browse Source 
Conflicts:
	htdocs/core/boxes/box_commandes.php
	htdocs/fourn/class/fournisseur.commande.class.php
This commit is contained in:
Laurent Destailleur 2020-03-11 17:04:28 +01:00
commit 4903287204
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/core/boxes/box_commandes.php
View File

@ -72,6 +72,7 @@ class box_commandes extends ModeleBoxes
public function loadBox($max = 5) public function loadBox($max = 5)
{ {
global $user, $langs, $conf; global $user, $langs, $conf;
$langs->load('orders');
$this->max = $max; $this->max = $max;

8
htdocs/fourn/class/fournisseur.commande.class.php
View File

@ -1364,7 +1364,7 @@ class CommandeFournisseur extends CommonOrder
false, false,
$this->lines[$i]->date_start, $this->lines[$i]->date_start,
$this->lines[$i]->date_end, $this->lines[$i]->date_end,
0, $this->lines[$i]->array_options,
$this->lines[$i]->fk_unit $this->lines[$i]->fk_unit
); );
if ($result < 0) if ($result < 0)
@ -1474,9 +1474,9 @@ class CommandeFournisseur extends CommonOrder
$this->db->begin(); $this->db->begin();
// get lines so they will be clone // get extrafields so they will be clone
foreach($this->lines as $line) foreach($this->lines as $line)
$line->fetch_optionals(); $line->fetch_optionals();
// Load source object // Load source object
$objFrom = clone $this; $objFrom = clone $this;