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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2020-03-12 17:59:03 +01:00
commit 6d9967a5d3
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,6 +77,7 @@ class box_shipments extends ModeleBoxes
$this->max = $max; $this->max = $max;
include_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php'; include_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
$shipmentstatic = new Expedition($this->db); $shipmentstatic = new Expedition($this->db);

2
htdocs/core/class/commonobject.class.php
View File

@ -2916,7 +2916,7 @@ abstract class CommonObject
$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_ORDER"; $MODULE = "MODULE_DISALLOW_UPDATE_PRICE_ORDER";
elseif ($this->element == 'facture' || $this->element == 'invoice') elseif ($this->element == 'facture' || $this->element == 'invoice')
$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_INVOICE"; $MODULE = "MODULE_DISALLOW_UPDATE_PRICE_INVOICE";
elseif ($this->element == 'facture_fourn' || $this->element == 'supplier_invoice') elseif ($this->element == 'facture_fourn' || $this->element == 'supplier_invoice' || $this->element == 'invoice_supplier')
$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_INVOICE"; $MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_INVOICE";
elseif ($this->element == 'order_supplier' || $this->element == 'supplier_order') elseif ($this->element == 'order_supplier' || $this->element == 'supplier_order')
$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_ORDER"; $MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_ORDER";

5
htdocs/fourn/class/fournisseur.facture.class.php
View File

@ -859,7 +859,10 @@ class FactureFournisseur extends CommonInvoice
$line->multicurrency_total_tva = $obj->multicurrency_total_tva; $line->multicurrency_total_tva = $obj->multicurrency_total_tva;
$line->multicurrency_total_ttc = $obj->multicurrency_total_ttc; $line->multicurrency_total_ttc = $obj->multicurrency_total_ttc;
$this->lines[$i] = $line; // Extra fields
$line->fetch_optionals();
$this->lines[$i] = $line;
$i++; $i++;
} }