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

Merge pull request #21844 from defrance/patch-236

Browse Source 
php V8 warning on supplier order
This commit is contained in:
Laurent Destailleur 2022-08-25 17:44:44 +02:00 committed by GitHub
commit 9cdcc08a4c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1959,7 +1959,7 @@ class CommandeFournisseur extends CommonOrder
$this->line->total_localtax2 = $total_localtax2; $this->line->total_localtax2 = $total_localtax2;
$this->line->total_ttc = $total_ttc; $this->line->total_ttc = $total_ttc;
$this->line->product_type = $type; $this->line->product_type = $type;
$this->line->special_code = $special_code; $this->line->special_code = (!empty($this->special_code) ? $this->special_code : 0);
$this->line->origin = $origin; $this->line->origin = $origin;
$this->line->origin_id = $origin_id; $this->line->origin_id = $origin_id;
$this->line->fk_unit = $fk_unit; $this->line->fk_unit = $fk_unit;
@ -2858,7 +2858,7 @@ class CommandeFournisseur extends CommonOrder
$this->line->total_localtax2 = $total_localtax2; $this->line->total_localtax2 = $total_localtax2;
$this->line->total_ttc = $total_ttc; $this->line->total_ttc = $total_ttc;
$this->line->product_type = $type; $this->line->product_type = $type;
$this->line->special_code = $this->special_code; $this->line->special_code = (!empty($this->special_code) ? $this->special_code : 0);
$this->line->origin = $this->origin; $this->line->origin = $this->origin;
$this->line->fk_unit = $fk_unit; $this->line->fk_unit = $fk_unit;

5
htdocs/fourn/commande/card.php
View File

@ -669,11 +669,10 @@ if (empty($reshook)) {
if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) { if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
$outputlangs = $langs; $outputlangs = $langs;
$newlang = ''; $newlang = '';
if (!empty($conf->global->MAIN_MULTILANGS) && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
$newlang = GETPOST('lang_id', 'aZ09');
}
if (!empty($conf->global->MAIN_MULTILANGS) && empty($newlang)) { if (!empty($conf->global->MAIN_MULTILANGS) && empty($newlang)) {
$newlang = $object->thirdparty->default_lang; $newlang = $object->thirdparty->default_lang;
if (GETPOST('lang_id', 'aZ09'))
$newlang = GETPOST('lang_id', 'aZ09');
} }
if (!empty($newlang)) { if (!empty($newlang)) {
$outputlangs = new Translate("", $conf); $outputlangs = new Translate("", $conf);