Skip to content
Snippets Groups Projects
Commit 04718b18 authored by Christophe Battarel's avatar Christophe Battarel
Browse files

resolve conflict

parents 53cf2ca8 75fa37cd
No related branches found
No related tags found
No related merge requests found
......@@ -151,8 +151,6 @@ class pdf_einstein extends ModelePDFCommandes
$outputlangs->load("products");
$outputlangs->load("orders");
$default_font_size = pdf_getPDFFontSize($outputlangs);
if ($conf->commande->dir_output)
{
$object->fetch_thirdparty();
......@@ -187,7 +185,8 @@ class pdf_einstein extends ModelePDFCommandes
// Create pdf instance
$pdf=pdf_getInstance($this->format);
$heightforinfotot = 50; // Height reserved to output the info and total part
$default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
$heightforinfotot = 50; // Height reserved to output the info and total part
$heightforfreetext= (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT)?$conf->global->MAIN_PDF_FREETEXT_HEIGHT:5); // Height reserved to output the free text on last page
$heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
$pdf->SetAutoPageBreak(1,0);
......@@ -382,7 +381,7 @@ class pdf_einstein extends ModelePDFCommandes
if (empty($localtax2_type))
$localtax2_type=getTypeOfLocalTaxFromRate($vatrate,2);
//end TODO
// retrieve global local tax
if ($localtax1_type == '7')
{
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment