Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-24 10:21:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

resolve conflict

Browse Source
This commit is contained in:
Christophe Battarel
2012-11-30 10:57:42 +01:00
parent 53cf2ca8f5 75fa37cde9
commit 04718b1832
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
View File

@@ -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')
{