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

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

Browse Source 
Conflicts:
	htdocs/core/lib/pdf.lib.php
This commit is contained in:
Laurent Destailleur 2018-10-04 17:50:19 +02:00
commit 3060647212
3 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/commande/class/commande.class.php
View File

@ -1677,10 +1677,11 @@ class Commande extends CommonOrder
// Retrieve all extrafields for invoice // Retrieve all extrafields for invoice
// fetch optionals attributes and labels // fetch optionals attributes and labels
require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; // require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
$extrafields=new ExtraFields($this->db); // $extrafields=new ExtraFields($this->db);
$extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true); // $extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
$this->fetch_optionals($this->id,$extralabels); // $this->fetch_optionals($this->id,$extralabels);
$this->fetch_optionals();
$this->db->free($result); $this->db->free($result);
@ -1882,6 +1883,9 @@ class Commande extends CommonOrder
$line->multicurrency_total_tva = $objp->multicurrency_total_tva; $line->multicurrency_total_tva = $objp->multicurrency_total_tva;
$line->multicurrency_total_ttc = $objp->multicurrency_total_ttc; $line->multicurrency_total_ttc = $objp->multicurrency_total_ttc;
$line->fetch_optionals();
$this->lines[$i] = $line; $this->lines[$i] = $line;
$i++; $i++;

12
htdocs/compta/facture/class/facture.class.php
View File

@ -1353,10 +1353,12 @@ class Facture extends CommonInvoice
// Retrieve all extrafield for invoice // Retrieve all extrafield for invoice
// fetch optionals attributes and labels // fetch optionals attributes and labels
require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; // require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
$extrafields=new ExtraFields($this->db); // $extrafields=new ExtraFields($this->db);
$extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true); // $extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
$this->fetch_optionals($this->id,$extralabels); // $this->fetch_optionals($this->id,$extralabels);
$this->fetch_optionals();
/* /*
* Lines * Lines
@ -1477,7 +1479,7 @@ class Facture extends CommonInvoice
$line->multicurrency_total_tva = $objp->multicurrency_total_tva; $line->multicurrency_total_tva = $objp->multicurrency_total_tva;
$line->multicurrency_total_ttc = $objp->multicurrency_total_ttc; $line->multicurrency_total_ttc = $objp->multicurrency_total_ttc;
// TODO Fetch optional like done in fetch line of facture_rec ? $line->fetch_optionals();
$this->lines[$i] = $line; $this->lines[$i] = $line;

11
htdocs/core/lib/pdf.lib.php
View File

@ -437,11 +437,12 @@ function pdf_build_address($outputlangs,$sourcecompany,$targetcompany='',$target
} else { } else {
$companytouseforaddress = $targetcompany; $companytouseforaddress = $targetcompany;
// Contact on a thirdparty that is a different thirdparty than the thirdparty of object // Contact on a thirdparty that is a different thirdparty than the thirdparty of object
if ($targetcontact->socid > 0 && $targetcontact->socid != $targetcompany->id) if ($targetcontact->socid > 0 && $targetcontact->socid != $targetcompany->id)
{ {
$targetcontact->fetch_thirdparty(); $targetcontact->fetch_thirdparty();
$companytouseforaddress = $targetcontact->thirdparty; $companytouseforaddress = $targetcontact->thirdparty;
}
$stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset(dol_format_address($companytouseforaddress)); $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset(dol_format_address($companytouseforaddress));
} }