| Afficher la quantité sur les lignes de sous-total (uniquement dans le cas d'un produit virtuel ajouté) |
|
@@ -193,16 +190,20 @@ function showParameters() {
-
+
- | id ) {
-
- if ($conf->global->SUBTOTAL_USE_NEW_FORMAT)
- {
- $qty_displayed = ($line->qty >=1 && $line->qty <= 9) ? $line->qty : 100 - $line->qty;
- print img_picto('', 'subsubtotal@subtotal').''.$qty_displayed.' ';
- }
- else
- {
- if($line->qty<=1) print img_picto('', 'subtotal@subtotal');
- else if($line->qty==2) print img_picto('', 'subsubtotal@subtotal').' ';
- }
+ ?>;">
+ | id) {
+ if ($conf->global->SUBTOTAL_USE_NEW_FORMAT) {
+ $qty_displayed = ($line->qty >=1 && $line->qty <= 9) ? $line->qty : 100 - $line->qty;
+ print img_picto('', 'subsubtotal@subtotal').''.$qty_displayed.' ';
+ } else {
+ if ($line->qty<=1) {
+ print img_picto('', 'subtotal@subtotal');
+ } elseif ($line->qty==2) {
+ print img_picto('', 'subsubtotal@subtotal').' ';
+ }
+ }
- if($line->label=='') {
- $line->label = $line->description;
- $line->description='';
- }
+ if ($line->label=='') {
+ $line->label = $line->description;
+ $line->description='';
+ }
- ?>
+ ?>
|
+ ?>
qty>90) {
- /* Total */
+ if ($line->qty>90) {
+ /* Total */
$total_line = $this->getTotalLineFromObject($object, $line, $conf->global->SUBTOTAL_MANAGE_SUBSUBTOTAL);
- ?>
+ ?>
|
+
+ } else {
+ ?>
|
+
+ }
+ ?>
id ) {
- ?>
+ if ($action=='editlinetitle' && $_REQUEST['lineid']==$line->id) {
+ ?>
statut == 0 && $user->rights->{$object->element}->creer) {
-
- ?>
+
+ } else {
+ if ($object->statut == 0 && $user->rights->{$object->element}->creer) {
+ ?>
+ ?>
|
id ) {
- ?>
+ if ($action=='editlinetitle' && $_REQUEST['lineid']===$line->id) {
+ ?>
statut == 0 && $user->rights->{$object->element}->creer) {
-
- ?>
+
+ } else {
+ if ($object->statut == 0 && $user->rights->{$object->element}->creer) {
+ ?>
- qty<10) {
-
- ?>
+ if ($line->qty<10) {
+ ?>
trans('deleteWithAllLines'), 'delete_all@subtotal') ?>
-
+ ?>
|
- 1 && empty($conf->browser->phone)) { ?>
+ 1 && empty($conf->browser->phone)) {
+ ?>
|
-
- browser->phone) && ($object->statut == 0 && $user->rights->{$object->element}->creer))?' class="tdlineupdown"':''); ?>> |
-
+
+ browser->phone) && ($object->statut == 0 && $user->rights->{$object->element}->creer))?' class="tdlineupdown"':'');
+ ?>> |
+
element=='facture') $res = $object->addline($object->id, $label, 0,$qty,0,0,0,0,0,'','',0,0,'','HT',0,9,-1, TSubtotal::$module_number);
+ if ($object->element=='facture') {
+ $res = $object->addline($object->id, $label, 0, $qty, 0, 0, 0, 0, 0, '', '', 0, 0, '', 'HT', 0, 9, -1, TSubtotal::$module_number);
+ }
/**
* @var $object Propal
*/
- else if($object->element=='propal') $res = $object->addline($object->id,$label, 0,$qty,0,0,0,0,0,'HT',0,0,9,-1, TSubtotal::$module_number);
+ elseif ($object->element=='propal') {
+ $res = $object->addline($object->id, $label, 0, $qty, 0, 0, 0, 0, 0, 'HT', 0, 0, 9, -1, TSubtotal::$module_number);
+ }
/**
* @var $object Commande
*/
- else if($object->element=='commande') $res = $object->addline($object->id,$label, 0,$qty,0,0,0,0,0,0,0,'HT',0,'','',9,-1, TSubtotal::$module_number);
-
- }
- else {
- /**
+ elseif ($object->element=='commande') {
+ $res = $object->addline($object->id, $label, 0, $qty, 0, 0, 0, 0, 0, 0, 0, 'HT', 0, '', '', 9, -1, TSubtotal::$module_number);
+ }
+ } else {
+ /**
* @var $object Facture
*/
- if($object->element=='facture') $res = $object->addline($label, 0,$qty,0,0,0,0,0,'','',0,0,'','HT',0,9,-1, TSubtotal::$module_number);
+ if ($object->element=='facture') {
+ $res = $object->addline($label, 0, $qty, 0, 0, 0, 0, 0, '', '', 0, 0, '', 'HT', 0, 9, -1, TSubtotal::$module_number);
+ }
/**
* @var $object Propal
*/
- else if($object->element=='propal') $res = $object->addline($label, 0,$qty,0,0,0,0,0,'HT',0,0,9,-1, TSubtotal::$module_number);
+ elseif ($object->element=='propal') {
+ $res = $object->addline($label, 0, $qty, 0, 0, 0, 0, 0, 'HT', 0, 0, 9, -1, TSubtotal::$module_number);
+ }
/**
* @var $object Commande
*/
- else if($object->element=='commande') $res = $object->addline($label, 0,$qty,0,0,0,0,0,0,0,'HT',0,'','',9,-1, TSubtotal::$module_number);
- }
-
- }
-
+ elseif ($object->element=='commande') {
+ $res = $object->addline($label, 0, $qty, 0, 0, 0, 0, 0, 0, 0, 'HT', 0, '', '', 9, -1, TSubtotal::$module_number);
+ }
+ }
+ }
}
diff --git a/config.php b/config.php
index b4197128..41b2fd25 100644
--- a/config.php
+++ b/config.php
@@ -1,8 +1,12 @@
load("main");
- $langs->load("bills");
+ $langs->load("main");
+ $langs->load("bills");
- $this->db = $db;
- $this->name = "einstein_subtotal";
- $this->description = 'Modèle de commande incluant des spécificités du module sous-total.';
+ $this->db = $db;
+ $this->name = "einstein_subtotal";
+ $this->description = 'Modèle de commande incluant des spécificités du module sous-total.';
// Dimension page pour format A4
$this->type = 'pdf';
- $formatarray=pdf_getFormat();
- $this->page_largeur = $formatarray['width'];
- $this->page_hauteur = $formatarray['height'];
- $this->format = array($this->page_largeur,$this->page_hauteur);
- $this->marge_gauche=isset($conf->global->MAIN_PDF_MARGIN_LEFT)?$conf->global->MAIN_PDF_MARGIN_LEFT:10;
- $this->marge_droite=isset($conf->global->MAIN_PDF_MARGIN_RIGHT)?$conf->global->MAIN_PDF_MARGIN_RIGHT:10;
- $this->marge_haute =isset($conf->global->MAIN_PDF_MARGIN_TOP)?$conf->global->MAIN_PDF_MARGIN_TOP:10;
- $this->marge_basse =isset($conf->global->MAIN_PDF_MARGIN_BOTTOM)?$conf->global->MAIN_PDF_MARGIN_BOTTOM:10;
-
- $this->option_logo = 1; // Affiche logo
+ $formatarray=pdf_getFormat();
+ $this->page_largeur = $formatarray['width'];
+ $this->page_hauteur = $formatarray['height'];
+ $this->format = array($this->page_largeur,$this->page_hauteur);
+ $this->marge_gauche=isset($conf->global->MAIN_PDF_MARGIN_LEFT)?$conf->global->MAIN_PDF_MARGIN_LEFT:10;
+ $this->marge_droite=isset($conf->global->MAIN_PDF_MARGIN_RIGHT)?$conf->global->MAIN_PDF_MARGIN_RIGHT:10;
+ $this->marge_haute =isset($conf->global->MAIN_PDF_MARGIN_TOP)?$conf->global->MAIN_PDF_MARGIN_TOP:10;
+ $this->marge_basse =isset($conf->global->MAIN_PDF_MARGIN_BOTTOM)?$conf->global->MAIN_PDF_MARGIN_BOTTOM:10;
+
+ $this->option_logo = 1; // Affiche logo
$this->option_tva = 1; // Gere option tva FACTURE_TVAOPTION
$this->option_modereg = 1; // Affiche mode reglement
$this->option_condreg = 1; // Affiche conditions reglement
@@ -99,32 +99,37 @@ function __construct($db)
// Get source company
$this->emetteur=$mysoc;
- if (empty($this->emetteur->country_code)) $this->emetteur->country_code=substr($langs->defaultlang,-2); // By default, if was not defined
+ if (empty($this->emetteur->country_code)) {
+ $this->emetteur->country_code=substr($langs->defaultlang, -2);
+ } // By default, if was not defined
// Define position of columns
$this->posxdesc=$this->marge_gauche+1;
- $this->posxtva=112;
- $this->posxup=126;
- $this->posxqty=145;
- $this->posxdiscount=162;
- $this->postotalht=174;
- if (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) $this->posxtva=$this->posxup;
- $this->posxpicture=$this->posxtva - (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH)?20:$conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH); // width of images
- if ($this->page_largeur < 210) // To work with US executive format
- {
+ $this->posxtva=112;
+ $this->posxup=126;
+ $this->posxqty=145;
+ $this->posxdiscount=162;
+ $this->postotalht=174;
+ if (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) {
+ $this->posxtva=$this->posxup;
+ }
+ $this->posxpicture=$this->posxtva - (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH)?20:$conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH); // width of images
+ if ($this->page_largeur < 210) {
+ // To work with US executive format
+
$this->posxpicture-=20;
- $this->posxtva-=20;
- $this->posxup-=20;
- $this->posxqty-=20;
- $this->posxdiscount-=20;
- $this->postotalht-=20;
+ $this->posxtva-=20;
+ $this->posxup-=20;
+ $this->posxqty-=20;
+ $this->posxdiscount-=20;
+ $this->postotalht-=20;
}
- $this->tva=array();
- $this->localtax1=array();
- $this->localtax2=array();
- $this->atleastoneratenotnull=0;
- $this->atleastonediscount=0;
+ $this->tva=array();
+ $this->localtax1=array();
+ $this->localtax2=array();
+ $this->atleastoneratenotnull=0;
+ $this->atleastonediscount=0;
}
/**
@@ -138,194 +143,185 @@ function __construct($db)
* @param int $hideref Do not show ref
* @return int 1=OK, 0=KO
*/
- function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hidedesc=0,$hideref=0)
+ public function write_file($object, $outputlangs, $srctemplatepath='', $hidedetails=0, $hidedesc=0, $hideref=0)
{
- global $user,$langs,$conf,$mysoc,$db,$hookmanager;
+ global $user,$langs,$conf,$mysoc,$db,$hookmanager;
- if (! is_object($outputlangs)) $outputlangs=$langs;
+ if (! is_object($outputlangs)) {
+ $outputlangs=$langs;
+ }
// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
- if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
+ if (! empty($conf->global->MAIN_USE_FPDF)) {
+ $outputlangs->charset_output='ISO-8859-1';
+ }
- $outputlangs->load("main");
- $outputlangs->load("dict");
- $outputlangs->load("companies");
- $outputlangs->load("bills");
- $outputlangs->load("products");
- $outputlangs->load("orders");
- $outputlangs->load("deliveries");
+ $outputlangs->load("main");
+ $outputlangs->load("dict");
+ $outputlangs->load("companies");
+ $outputlangs->load("bills");
+ $outputlangs->load("products");
+ $outputlangs->load("orders");
+ $outputlangs->load("deliveries");
- $nblignes = count($object->lines);
+ $nblignes = count($object->lines);
- if ($conf->commande->dir_output)
- {
- $object->fetch_thirdparty();
+ if ($conf->commande->dir_output) {
+ $object->fetch_thirdparty();
- $deja_regle = "";
+ $deja_regle = "";
// Definition of $dir and $file
- if ($object->specimen)
- {
- $dir = $conf->commande->dir_output;
- $file = $dir . "/SPECIMEN.pdf";
- }
- else
- {
- $objectref = dol_sanitizeFileName($object->ref);
- $dir = $conf->commande->dir_output . "/" . $objectref;
- $file = $dir . "/" . $objectref . ".pdf";
+ if ($object->specimen) {
+ $dir = $conf->commande->dir_output;
+ $file = $dir . "/SPECIMEN.pdf";
+ } else {
+ $objectref = dol_sanitizeFileName($object->ref);
+ $dir = $conf->commande->dir_output . "/" . $objectref;
+ $file = $dir . "/" . $objectref . ".pdf";
}
- if (! file_exists($dir))
- {
- if (dol_mkdir($dir) < 0)
- {
- $this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
- return 0;
- }
- }
+ if (! file_exists($dir)) {
+ if (dol_mkdir($dir) < 0) {
+ $this->error=$langs->transnoentities("ErrorCanNotCreateDir", $dir);
+ return 0;
+ }
+ }
- if (file_exists($dir))
- {
- // Add pdfgeneration hook
- if (! is_object($hookmanager))
- {
- include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
- $hookmanager=new HookManager($this->db);
+ if (file_exists($dir)) {
+ // Add pdfgeneration hook
+ if (! is_object($hookmanager)) {
+ include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+ $hookmanager=new HookManager($this->db);
}
- $hookmanager->initHooks(array('pdfgeneration'));
- $parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
- global $action;
- $reshook=$hookmanager->executeHooks('beforePDFCreation',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks
+ $hookmanager->initHooks(array('pdfgeneration'));
+ $parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+ global $action;
+ $reshook=$hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
// Create pdf instance
$pdf=pdf_getInstance($this->format);
- $default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
+ $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);
+ $pdf->SetAutoPageBreak(1, 0);
- if (class_exists('TCPDF'))
- {
- $pdf->setPrintHeader(false);
- $pdf->setPrintFooter(false);
- }
- $pdf->SetFont(pdf_getPDFFont($outputlangs));
+ if (class_exists('TCPDF')) {
+ $pdf->setPrintHeader(false);
+ $pdf->setPrintFooter(false);
+ }
+ $pdf->SetFont(pdf_getPDFFont($outputlangs));
// Set path to the background PDF File
- if (empty($conf->global->MAIN_DISABLE_FPDI) && ! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
- {
+ if (empty($conf->global->MAIN_DISABLE_FPDI) && ! empty($conf->global->MAIN_ADD_PDF_BACKGROUND)) {
$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
$tplidx = $pdf->importPage(1);
}
- $pdf->Open();
- $pagenb=0;
- $pdf->SetDrawColor(128,128,128);
-
- $pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
- $pdf->SetSubject($outputlangs->transnoentities("Order"));
- $pdf->SetCreator("Dolibarr ".DOL_VERSION);
- $pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
- $pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Order"));
- if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+ $pdf->Open();
+ $pagenb=0;
+ $pdf->SetDrawColor(128, 128, 128);
+
+ $pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
+ $pdf->SetSubject($outputlangs->transnoentities("Order"));
+ $pdf->SetCreator("Dolibarr ".DOL_VERSION);
+ $pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
+ $pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Order"));
+ if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) {
+ $pdf->SetCompression(false);
+ }
- $pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
+ $pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
// Positionne $this->atleastonediscount si on a au moins une remise
- for ($i = 0 ; $i < $nblignes ; $i++)
- {
- if ($object->lines[$i]->remise_percent)
- {
- $this->atleastonediscount++;
- }
+ for ($i = 0 ; $i < $nblignes ; $i++) {
+ if ($object->lines[$i]->remise_percent) {
+ $this->atleastonediscount++;
+ }
}
- if (empty($this->atleastonediscount))
- {
- $this->posxpicture+=($this->postotalht - $this->posxdiscount);
- $this->posxtva+=($this->postotalht - $this->posxdiscount);
- $this->posxup+=($this->postotalht - $this->posxdiscount);
- $this->posxqty+=($this->postotalht - $this->posxdiscount);
- $this->posxdiscount+=($this->postotalht - $this->posxdiscount);
+ if (empty($this->atleastonediscount)) {
+ $this->posxpicture+=($this->postotalht - $this->posxdiscount);
+ $this->posxtva+=($this->postotalht - $this->posxdiscount);
+ $this->posxup+=($this->postotalht - $this->posxdiscount);
+ $this->posxqty+=($this->postotalht - $this->posxdiscount);
+ $this->posxdiscount+=($this->postotalht - $this->posxdiscount);
//$this->postotalht;
- }
+ }
// New page
$pdf->AddPage();
- if (! empty($tplidx)) $pdf->useTemplate($tplidx);
- $pagenb++;
- $this->_pagehead($pdf, $object, 1, $outputlangs);
- $pdf->SetFont('','', $default_font_size - 1);
- $pdf->MultiCell(0, 3, ''); // Set interline to 3
- $pdf->SetTextColor(0,0,0);
+ if (! empty($tplidx)) {
+ $pdf->useTemplate($tplidx);
+ }
+ $pagenb++;
+ $this->_pagehead($pdf, $object, 1, $outputlangs);
+ $pdf->SetFont('', '', $default_font_size - 1);
+ $pdf->MultiCell(0, 3, ''); // Set interline to 3
+ $pdf->SetTextColor(0, 0, 0);
- $tab_top = 90;
- $tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)?42:10);
- $tab_height = 130;
- $tab_height_newpage = 150;
+ $tab_top = 90;
+ $tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)?42:10);
+ $tab_height = 130;
+ $tab_height_newpage = 150;
// Affiche notes
$notetoshow=empty($object->note_public)?'':$object->note_public;
- if (! empty($conf->global->MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE))
- {
- // Get first sale rep
- if (is_object($object->thirdparty))
- {
- $salereparray=$object->thirdparty->getSalesRepresentatives($user);
- $salerepobj=new User($this->db);
- $salerepobj->fetch($salereparray[0]['id']);
- if (! empty($salerepobj->signature)) $notetoshow=dol_concatdesc($notetoshow, $salerepobj->signature);
+ if (! empty($conf->global->MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE)) {
+ // Get first sale rep
+ if (is_object($object->thirdparty)) {
+ $salereparray=$object->thirdparty->getSalesRepresentatives($user);
+ $salerepobj=new User($this->db);
+ $salerepobj->fetch($salereparray[0]['id']);
+ if (! empty($salerepobj->signature)) {
+ $notetoshow=dol_concatdesc($notetoshow, $salerepobj->signature);
+ }
}
- }
- if ($notetoshow)
- {
- $tab_top = 88;
+ }
+ if ($notetoshow) {
+ $tab_top = 88;
- $pdf->SetFont('','', $default_font_size - 1);
- $pdf->writeHTMLCell(190, 3, $this->posxdesc-1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
- $nexY = $pdf->GetY();
- $height_note=$nexY-$tab_top;
+ $pdf->SetFont('', '', $default_font_size - 1);
+ $pdf->writeHTMLCell(190, 3, $this->posxdesc-1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
+ $nexY = $pdf->GetY();
+ $height_note=$nexY-$tab_top;
// Rect prend une longueur en 3eme param
- $pdf->SetDrawColor(192,192,192);
- $pdf->Rect($this->marge_gauche, $tab_top-1, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_note+1);
+ $pdf->SetDrawColor(192, 192, 192);
+ $pdf->Rect($this->marge_gauche, $tab_top-1, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_note+1);
- $tab_height = $tab_height - $height_note;
- $tab_top = $nexY+6;
- }
- else
- {
- $height_note=0;
- }
+ $tab_height = $tab_height - $height_note;
+ $tab_top = $nexY+6;
+ } else {
+ $height_note=0;
+ }
- $iniY = $tab_top + 7;
- $curY = $tab_top + 7;
- $nexY = $tab_top + 7;
+ $iniY = $tab_top + 7;
+ $curY = $tab_top + 7;
+ $nexY = $tab_top + 7;
- $inPackage = false;
- $TPackageInfos = array();
- $TChilds = array();
- $package_qty = 0;
- $TStack = array();
+ $inPackage = false;
+ $TPackageInfos = array();
+ $TChilds = array();
+ $package_qty = 0;
+ $TStack = array();
// Loop on each lines
- for ($i = 0 ; $i < $nblignes ; $i++)
- {
- $package_qty = $TStack[count($TStack) - 1]['package_qty'];
- $inPackage = count($TStack) > 0;
+ for ($i = 0 ; $i < $nblignes ; $i++) {
+ $package_qty = $TStack[count($TStack) - 1]['package_qty'];
+ $inPackage = count($TStack) > 0;
// Ligne de titre
if ($object->lines[$i]->product_type == 9 && $object->lines[$i]->qty < 97 && $object->lines[$i]->fk_product > 0) {
- $inPackage = true;
+ $inPackage = true;
- if ($conf->global->SUBTOTAL_SHOW_QTY_ON_TITLES) {
- if (!empty($object->lines[$i]->fk_product)) {
- $product = new Product($db);
- $product->fetch($object->lines[$i]->fk_product);
+ if ($conf->global->SUBTOTAL_SHOW_QTY_ON_TITLES) {
+ if (!empty($object->lines[$i]->fk_product)) {
+ $product = new Product($db);
+ $product->fetch($object->lines[$i]->fk_product);
- $TChilds = $product->getChildsArbo($product->id);
+ $TChilds = $product->getChildsArbo($product->id);
- $TStack[count($TStack)] = array(
+ $TStack[count($TStack)] = array(
'childs' => $TChilds,
'package' => array(),
'package_qty' => 0
@@ -334,126 +330,131 @@ function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hid
// Si on se trouvait déjà dans un package, on rajoute ce produit à la liste des produits
// du précédent package
if (count($TStack) > 1) {
- $TStack[count($TStack) - 2]['package'][$object->lines[$i]->fk_product] += $object->lines[$i]->qty;
+ $TStack[count($TStack) - 2]['package'][$object->lines[$i]->fk_product] += $object->lines[$i]->qty;
}
- }
- }
+ }
+ }
}
- if ($conf->global->SUBTOTAL_SHOW_QTY_ON_TITLES) {
- if ($inPackage && $object->lines[$i]->product_type != 9 && $object->lines[$i]->fk_product > 0) {
- $TStack[count($TStack) - 1]['package'][$object->lines[$i]->fk_product] += $object->lines[$i]->qty;
- }
- }
+ if ($conf->global->SUBTOTAL_SHOW_QTY_ON_TITLES) {
+ if ($inPackage && $object->lines[$i]->product_type != 9 && $object->lines[$i]->fk_product > 0) {
+ $TStack[count($TStack) - 1]['package'][$object->lines[$i]->fk_product] += $object->lines[$i]->qty;
+ }
+ }
// Ligne de sous-total
if ($inPackage && $object->lines[$i]->product_type == 9 && $object->lines[$i]->qty >= 97) {
- if (count($TStack) <= 1) {
- $inPackage = false;
- }
+ if (count($TStack) <= 1) {
+ $inPackage = false;
+ }
- if ($conf->global->SUBTOTAL_SHOW_QTY_ON_TITLES) {
- // Comparaison pour déterminer la quantité de package
+ if ($conf->global->SUBTOTAL_SHOW_QTY_ON_TITLES) {
+ // Comparaison pour déterminer la quantité de package
$TProducts = array_keys($TStack[count($TStack) - 1]['package']);
- $TProductsChilds = array_keys($TStack[count($TStack) - 1]['childs']);
+ $TProductsChilds = array_keys($TStack[count($TStack) - 1]['childs']);
- if ($TProductsChilds == $TProducts) {
- // Il s'agit d'un package
+ if ($TProductsChilds == $TProducts) {
+ // Il s'agit d'un package
// On récupére la quantité
$first_child_id = $TProducts[0];
- $document_qty = $TStack[count($TStack) - 1]['package'][$first_child_id];
- $base_qty = $TStack[count($TStack) - 1]['childs'][$first_child_id][1];
+ $document_qty = $TStack[count($TStack) - 1]['package'][$first_child_id];
+ $base_qty = $TStack[count($TStack) - 1]['childs'][$first_child_id][1];
- $TStack[count($TStack) - 1]['package_qty'] = $document_qty / $base_qty;
- $package_qty = $TStack[count($TStack) - 1]['package_qty'];
- }
+ $TStack[count($TStack) - 1]['package_qty'] = $document_qty / $base_qty;
+ $package_qty = $TStack[count($TStack) - 1]['package_qty'];
+ }
- array_pop($TStack);
- }
+ array_pop($TStack);
+ }
}
- $curY = $nexY;
- $pdf->SetFont('','', $default_font_size - 1); // Into loop to work with multipage
- $pdf->SetTextColor(0,0,0);
+ $curY = $nexY;
+ $pdf->SetFont('', '', $default_font_size - 1); // Into loop to work with multipage
+ $pdf->SetTextColor(0, 0, 0);
- $pdf->setTopMargin($tab_top_newpage);
- $pdf->setPageOrientation('', 1, $heightforfooter+$heightforfreetext+$heightforinfotot); // The only function to edit the bottom margin of current page to set it.
+ $pdf->setTopMargin($tab_top_newpage);
+ $pdf->setPageOrientation('', 1, $heightforfooter+$heightforfreetext+$heightforinfotot); // The only function to edit the bottom margin of current page to set it.
$pageposbefore=$pdf->getPage();
// Description of product line
$curX = $this->posxdesc-1;
- $showpricebeforepagebreak=1;
+ $showpricebeforepagebreak=1;
+
+ $pdf->startTransaction();
+ pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->posxtva-$curX, 3, $curX, $curY, $hideref, $hidedesc);
+ $pageposafter=$pdf->getPage();
+ if ($pageposafter > $pageposbefore) {
+ // There is a pagebreak
- $pdf->startTransaction();
- pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxtva-$curX,3,$curX,$curY,$hideref,$hidedesc);
- $pageposafter=$pdf->getPage();
- if ($pageposafter > $pageposbefore) // There is a pagebreak
- {
$pdf->rollbackTransaction(true);
- $pageposafter=$pageposbefore;
+ $pageposafter=$pageposbefore;
//print $pageposafter.'-'.$pageposbefore;exit;
$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
- pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxtva-$curX,4,$curX,$curY,$hideref,$hidedesc);
- $pageposafter=$pdf->getPage();
- $posyafter=$pdf->GetY();
- if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))) // There is no space left for total+free text
- {
- if ($i == ($nblignes-1)) // No more lines, and no space left to show total, so we create a new page
- {
- $pdf->AddPage('','',true);
- if (! empty($tplidx)) $pdf->useTemplate($tplidx);
- if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
- $pdf->setPage($pageposafter+1);
+ pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->posxtva-$curX, 4, $curX, $curY, $hideref, $hidedesc);
+ $pageposafter=$pdf->getPage();
+ $posyafter=$pdf->GetY();
+ if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))) {
+ // There is no space left for total+free text
+
+ if ($i == ($nblignes-1)) {
+ // No more lines, and no space left to show total, so we create a new page
+
+ $pdf->AddPage('', '', true);
+ if (! empty($tplidx)) {
+ $pdf->useTemplate($tplidx);
+ }
+ if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+ $this->_pagehead($pdf, $object, 0, $outputlangs);
+ }
+ $pdf->setPage($pageposafter+1);
}
- }
- else
- {
- // We found a page break
+ } else {
+ // We found a page break
$showpricebeforepagebreak=0;
- }
- }
- else // No pagebreak
- {
+ }
+ } else {
+ // No pagebreak
+
$pdf->commitTransaction();
- }
+ }
- $nexY = $pdf->GetY();
- $pageposafter=$pdf->getPage();
- $pdf->setPage($pageposbefore);
- $pdf->setTopMargin($this->marge_haute);
- $pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+ $nexY = $pdf->GetY();
+ $pageposafter=$pdf->getPage();
+ $pdf->setPage($pageposbefore);
+ $pdf->setTopMargin($this->marge_haute);
+ $pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
// We suppose that a too long description is moved completely on next page
if ($pageposafter > $pageposbefore && empty($showpricebeforepagebreak)) {
- $pdf->setPage($pageposafter); $curY = $tab_top_newpage;
+ $pdf->setPage($pageposafter);
+ $curY = $tab_top_newpage;
}
- $pdf->SetFont('','', $default_font_size - 1); // On repositionne la police par defaut
+ $pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par defaut
// VAT Rate
- if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
- {
- // Si on ne doit masquer que les sous-produits
+ if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) {
+ // Si on ne doit masquer que les sous-produits
if ($hidedetails && !$inPackage && $conf->global->SUBTOTAL_ONLY_HIDE_SUBPRODUCTS_PRICES) {
- $vat_rate = pdf_getlinevatrate($object, $i, $outputlangs, 0);
+ $vat_rate = pdf_getlinevatrate($object, $i, $outputlangs, 0);
} else {
- $vat_rate = pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails);
+ $vat_rate = pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails);
}
- $pdf->SetXY($this->posxtva, $curY);
- $pdf->MultiCell($this->posxup-$this->posxtva-0.8, 3, $vat_rate, 0, 'R');
+ $pdf->SetXY($this->posxtva, $curY);
+ $pdf->MultiCell($this->posxup-$this->posxtva-0.8, 3, $vat_rate, 0, 'R');
}
// Unit price before discount
if ($hidedetails && !$inPackage && $conf->global->SUBTOTAL_ONLY_HIDE_SUBPRODUCTS_PRICES) {
- $up_excl_tax = pdf_getlineupexcltax($object, $i, $outputlangs, 0);
+ $up_excl_tax = pdf_getlineupexcltax($object, $i, $outputlangs, 0);
} else {
- $up_excl_tax = pdf_getlineupexcltax($object, $i, $outputlangs, $hidedetails);
+ $up_excl_tax = pdf_getlineupexcltax($object, $i, $outputlangs, $hidedetails);
}
- $pdf->SetXY($this->posxup, $curY);
- $pdf->MultiCell($this->posxqty-$this->posxup-0.8, 3, $up_excl_tax, 0, 'R', 0);
+ $pdf->SetXY($this->posxup, $curY);
+ $pdf->MultiCell($this->posxqty-$this->posxup-0.8, 3, $up_excl_tax, 0, 'R', 0);
// Booléen pour déterminer s'il s'agit d'une ligne de titre ou non
$isTitle = false;
@@ -461,182 +462,186 @@ function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hid
// Quantity
// Récupération de la quantité à afficher
if ($conf->global->SUBTOTAL_IF_HIDE_PRICES_SHOW_QTY) {
- if ($conf->global->SUBTOTAL_SHOW_QTY_ON_TITLES && $package_qty > 0) {
- $qty = $package_qty;
- } else {
- $qty = pdf_getlineqty($object, $i, $outputlangs, 0);
- }
+ if ($conf->global->SUBTOTAL_SHOW_QTY_ON_TITLES && $package_qty > 0) {
+ $qty = $package_qty;
+ } else {
+ $qty = pdf_getlineqty($object, $i, $outputlangs, 0);
+ }
} else {
- if ($conf->global->SUBTOTAL_SHOW_QTY_ON_TITLES && $package_qty > 0) {
- $qty = $package_qty;
- } else {
- $qty = pdf_getlineqty($object, $i, $outputlangs, $hidedetails);
- }
+ if ($conf->global->SUBTOTAL_SHOW_QTY_ON_TITLES && $package_qty > 0) {
+ $qty = $package_qty;
+ } else {
+ $qty = pdf_getlineqty($object, $i, $outputlangs, $hidedetails);
+ }
}
- $pdf->SetXY($this->posxqty, $curY);
- $pdf->MultiCell($this->posxdiscount-$this->posxqty-0.8, 3, $qty, 0, 'R'); // Enough for 6 chars
+ $pdf->SetXY($this->posxqty, $curY);
+ $pdf->MultiCell($this->posxdiscount-$this->posxqty-0.8, 3, $qty, 0, 'R'); // Enough for 6 chars
// Discount on line
- if ($object->lines[$i]->remise_percent)
- {
- $pdf->SetXY($this->posxdiscount-2, $curY);
- $remise_percent = pdf_getlineremisepercent($object, $i, $outputlangs, $hidedetails);
- $pdf->MultiCell($this->postotalht-$this->posxdiscount+2, 3, $remise_percent, 0, 'R');
+ if ($object->lines[$i]->remise_percent) {
+ $pdf->SetXY($this->posxdiscount-2, $curY);
+ $remise_percent = pdf_getlineremisepercent($object, $i, $outputlangs, $hidedetails);
+ $pdf->MultiCell($this->postotalht-$this->posxdiscount+2, 3, $remise_percent, 0, 'R');
}
// Total HT line
if ($hidedetails && !$inPackage && $conf->global->SUBTOTAL_ONLY_HIDE_SUBPRODUCTS_PRICES) {
- $total_excl_tax = pdf_getlinetotalexcltax($object, $i, $outputlangs, 0);
+ $total_excl_tax = pdf_getlinetotalexcltax($object, $i, $outputlangs, 0);
} else {
- $total_excl_tax = pdf_getlinetotalexcltax($object, $i, $outputlangs, $hidedetails);
+ $total_excl_tax = pdf_getlinetotalexcltax($object, $i, $outputlangs, $hidedetails);
}
- $pdf->SetXY($this->postotalht, $curY);
- $pdf->MultiCell($this->page_largeur-$this->marge_droite-$this->postotalht, 3, $total_excl_tax, 0, 'R', 0);
+ $pdf->SetXY($this->postotalht, $curY);
+ $pdf->MultiCell($this->page_largeur-$this->marge_droite-$this->postotalht, 3, $total_excl_tax, 0, 'R', 0);
// Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva
$tvaligne=$object->lines[$i]->total_tva;
- $localtax1ligne=$object->lines[$i]->total_localtax1;
- $localtax2ligne=$object->lines[$i]->total_localtax2;
- $localtax1_rate=$object->lines[$i]->localtax1_tx;
- $localtax2_rate=$object->lines[$i]->localtax2_tx;
- $localtax1_type=$object->lines[$i]->localtax1_type;
- $localtax2_type=$object->lines[$i]->localtax2_type;
-
- if ($object->remise_percent) $tvaligne-=($tvaligne*$object->remise_percent)/100;
- if ($object->remise_percent) $localtax1ligne-=($localtax1ligne*$object->remise_percent)/100;
- if ($object->remise_percent) $localtax2ligne-=($localtax2ligne*$object->remise_percent)/100;
-
- $vatrate=(string) $object->lines[$i]->tva_tx;
+ $localtax1ligne=$object->lines[$i]->total_localtax1;
+ $localtax2ligne=$object->lines[$i]->total_localtax2;
+ $localtax1_rate=$object->lines[$i]->localtax1_tx;
+ $localtax2_rate=$object->lines[$i]->localtax2_tx;
+ $localtax1_type=$object->lines[$i]->localtax1_type;
+ $localtax2_type=$object->lines[$i]->localtax2_type;
+
+ if ($object->remise_percent) {
+ $tvaligne-=($tvaligne*$object->remise_percent)/100;
+ }
+ if ($object->remise_percent) {
+ $localtax1ligne-=($localtax1ligne*$object->remise_percent)/100;
+ }
+ if ($object->remise_percent) {
+ $localtax2ligne-=($localtax2ligne*$object->remise_percent)/100;
+ }
+
+ $vatrate=(string) $object->lines[$i]->tva_tx;
// Retrieve type from database for backward compatibility with old records
if ((! isset($localtax1_type) || $localtax1_type=='' || ! isset($localtax2_type) || $localtax2_type=='') // if tax type not defined
- && (! empty($localtax1_rate) || ! empty($localtax2_rate))) // and there is local tax
- {
- $localtaxtmp_array=getLocalTaxesFromRate($vatrate,0,$object->thirdparty,$mysoc);
- $localtax1_type = $localtaxtmp_array[0];
- $localtax2_type = $localtaxtmp_array[2];
+ && (! empty($localtax1_rate) || ! empty($localtax2_rate))) {
+ // and there is local tax
+
+ $localtaxtmp_array=getLocalTaxesFromRate($vatrate, 0, $object->thirdparty, $mysoc);
+ $localtax1_type = $localtaxtmp_array[0];
+ $localtax2_type = $localtaxtmp_array[2];
}
// retrieve global local tax
- if ($localtax1_type && $localtax1ligne != 0)
- $this->localtax1[$localtax1_type][$localtax1_rate]+=$localtax1ligne;
- if ($localtax2_type && $localtax2ligne != 0)
- $this->localtax2[$localtax2_type][$localtax2_rate]+=$localtax2ligne;
-
- if (($object->lines[$i]->info_bits & 0x01) == 0x01) $vatrate.='*';
- if (! isset($this->tva[$vatrate])) $this->tva[$vatrate]='';
- $this->tva[$vatrate] += $tvaligne;
+ if ($localtax1_type && $localtax1ligne != 0) {
+ $this->localtax1[$localtax1_type][$localtax1_rate]+=$localtax1ligne;
+ }
+ if ($localtax2_type && $localtax2ligne != 0) {
+ $this->localtax2[$localtax2_type][$localtax2_rate]+=$localtax2ligne;
+ }
+
+ if (($object->lines[$i]->info_bits & 0x01) == 0x01) {
+ $vatrate.='*';
+ }
+ if (! isset($this->tva[$vatrate])) {
+ $this->tva[$vatrate]='';
+ }
+ $this->tva[$vatrate] += $tvaligne;
// Add line
- if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
- {
- $pdf->setPage($pageposafter);
- $pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(210,210,210)));
+ if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1)) {
+ $pdf->setPage($pageposafter);
+ $pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(210,210,210)));
//$pdf->SetDrawColor(190,190,200);
$pdf->line($this->marge_gauche, $nexY+1, $this->page_largeur - $this->marge_droite, $nexY+1);
- $pdf->SetLineStyle(array('dash'=>0));
+ $pdf->SetLineStyle(array('dash'=>0));
}
- $nexY+=2; // Passe espace entre les lignes
+ $nexY+=2; // Passe espace entre les lignes
// Detect if some page were added automatically and output _tableau for past pages
- while ($pagenb < $pageposafter)
- {
- $pdf->setPage($pagenb);
- if ($pagenb == 1)
- {
- $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
- }
- else
- {
- $this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
+ while ($pagenb < $pageposafter) {
+ $pdf->setPage($pagenb);
+ if ($pagenb == 1) {
+ $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
+ } else {
+ $this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
+ }
+ $this->_pagefoot($pdf, $object, $outputlangs, 1);
+ $pagenb++;
+ $pdf->setPage($pagenb);
+ $pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+ if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+ $this->_pagehead($pdf, $object, 0, $outputlangs);
}
- $this->_pagefoot($pdf,$object,$outputlangs,1);
- $pagenb++;
- $pdf->setPage($pagenb);
- $pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
- if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
}
- if (isset($object->lines[$i+1]->pagebreak) && $object->lines[$i+1]->pagebreak)
- {
- if ($pagenb == 1)
- {
- $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
- }
- else
- {
- $this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
- }
- $this->_pagefoot($pdf,$object,$outputlangs,1);
+ if (isset($object->lines[$i+1]->pagebreak) && $object->lines[$i+1]->pagebreak) {
+ if ($pagenb == 1) {
+ $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
+ } else {
+ $this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
+ }
+ $this->_pagefoot($pdf, $object, $outputlangs, 1);
// New page
$pdf->AddPage();
- if (! empty($tplidx)) $pdf->useTemplate($tplidx);
- $pagenb++;
- if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
- }
+ if (! empty($tplidx)) {
+ $pdf->useTemplate($tplidx);
+ }
+ $pagenb++;
+ if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+ $this->_pagehead($pdf, $object, 0, $outputlangs);
+ }
+ }
}
// Show square
- if ($pagenb == 1)
- {
- $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
- $bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
- }
- else
- {
- $this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
- $bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
+ if ($pagenb == 1) {
+ $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
+ $bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
+ } else {
+ $this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
+ $bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
}
// Affiche zone infos
$posy=$this->_tableau_info($pdf, $object, $bottomlasttab, $outputlangs);
- if (!$conf->global->SUBTOTAL_HIDE_DOCUMENT_TOTAL) {
- // Affiche zone totaux
+ if (!$conf->global->SUBTOTAL_HIDE_DOCUMENT_TOTAL) {
+ // Affiche zone totaux
$posy=$this->_tableau_tot($pdf, $object, $deja_regle, $bottomlasttab, $outputlangs);
- }
+ }
// Affiche zone versements
- if ($deja_regle)
- {
- $posy=$this->_tableau_versements($pdf, $object, $posy, $outputlangs);
+ if ($deja_regle) {
+ $posy=$this->_tableau_versements($pdf, $object, $posy, $outputlangs);
}
// Pied de page
- $this->_pagefoot($pdf,$object,$outputlangs);
- if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
+ $this->_pagefoot($pdf, $object, $outputlangs);
+ if (method_exists($pdf, 'AliasNbPages')) {
+ $pdf->AliasNbPages();
+ }
- $pdf->Close();
+ $pdf->Close();
- $pdf->Output($file,'F');
+ $pdf->Output($file, 'F');
// Add pdfgeneration hook
$hookmanager->initHooks(array('pdfgeneration'));
- $parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
- global $action;
- $reshook=$hookmanager->executeHooks('afterPDFCreation',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks
+ $parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+ global $action;
+ $reshook=$hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
- if (! empty($conf->global->MAIN_UMASK))
- @chmod($file, octdec($conf->global->MAIN_UMASK));
+ if (! empty($conf->global->MAIN_UMASK)) {
+ @chmod($file, octdec($conf->global->MAIN_UMASK));
+ }
- return 1; // Pas d'erreur
- }
- else
- {
- $this->error=$langs->trans("ErrorCanNotCreateDir",$dir);
- return 0;
- }
- }
- else
- {
- $this->error=$langs->trans("ErrorConstantNotDefined","COMMANDE_OUTPUTDIR");
- return 0;
- }
- $this->error=$langs->trans("ErrorUnknown");
- return 0; // Erreur par defaut
+ return 1; // Pas d'erreur
+ } else {
+ $this->error=$langs->trans("ErrorCanNotCreateDir", $dir);
+ return 0;
+ }
+ } else {
+ $this->error=$langs->trans("ErrorConstantNotDefined", "COMMANDE_OUTPUTDIR");
+ return 0;
+ }
+ $this->error=$langs->trans("ErrorUnknown");
+ return 0; // Erreur par defaut
}
/**
@@ -648,9 +653,8 @@ function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hid
* @param Translate $outputlangs Object langs for output
* @return int <0 if KO, >0 if OK
*/
- function _tableau_versements(&$pdf, $object, $posy, $outputlangs)
+ public function _tableau_versements(&$pdf, $object, $posy, $outputlangs)
{
-
}
@@ -663,40 +667,38 @@ function _tableau_versements(&$pdf, $object, $posy, $outputlangs)
* @param Translate $outputlangs Langs object
* @return void
*/
- function _tableau_info(&$pdf, $object, $posy, $outputlangs)
+ public function _tableau_info(&$pdf, $object, $posy, $outputlangs)
{
- global $conf;
- $default_font_size = pdf_getPDFFontSize($outputlangs);
+ global $conf;
+ $default_font_size = pdf_getPDFFontSize($outputlangs);
- $pdf->SetFont('','', $default_font_size - 1);
+ $pdf->SetFont('', '', $default_font_size - 1);
// If France, show VAT mention if not applicable
- if ($this->emetteur->country_code == 'FR' && $this->franchise == 1)
- {
- $pdf->SetFont('','B', $default_font_size - 2);
- $pdf->SetXY($this->marge_gauche, $posy);
- $pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedForInvoice"), 0, 'L', 0);
+ if ($this->emetteur->country_code == 'FR' && $this->franchise == 1) {
+ $pdf->SetFont('', 'B', $default_font_size - 2);
+ $pdf->SetXY($this->marge_gauche, $posy);
+ $pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedForInvoice"), 0, 'L', 0);
- $posy=$pdf->GetY()+4;
+ $posy=$pdf->GetY()+4;
}
- $posxval=52;
+ $posxval=52;
// Show payments conditions
- if ($object->cond_reglement_code || $object->cond_reglement)
- {
- $pdf->SetFont('','B', $default_font_size - 2);
- $pdf->SetXY($this->marge_gauche, $posy);
- $titre = $outputlangs->transnoentities("PaymentConditions").':';
- $pdf->MultiCell(80, 4, $titre, 0, 'L');
-
- $pdf->SetFont('','', $default_font_size - 2);
- $pdf->SetXY($posxval, $posy);
- $lib_condition_paiement=$outputlangs->transnoentities("PaymentCondition".$object->cond_reglement_code)!=('PaymentCondition'.$object->cond_reglement_code)?$outputlangs->transnoentities("PaymentCondition".$object->cond_reglement_code):$outputlangs->convToOutputCharset($object->cond_reglement_doc);
- $lib_condition_paiement=str_replace('\n',"\n",$lib_condition_paiement);
- $pdf->MultiCell(80, 4, $lib_condition_paiement,0,'L');
-
- $posy=$pdf->GetY()+3;
+ if ($object->cond_reglement_code || $object->cond_reglement) {
+ $pdf->SetFont('', 'B', $default_font_size - 2);
+ $pdf->SetXY($this->marge_gauche, $posy);
+ $titre = $outputlangs->transnoentities("PaymentConditions").':';
+ $pdf->MultiCell(80, 4, $titre, 0, 'L');
+
+ $pdf->SetFont('', '', $default_font_size - 2);
+ $pdf->SetXY($posxval, $posy);
+ $lib_condition_paiement=$outputlangs->transnoentities("PaymentCondition".$object->cond_reglement_code)!=('PaymentCondition'.$object->cond_reglement_code)?$outputlangs->transnoentities("PaymentCondition".$object->cond_reglement_code):$outputlangs->convToOutputCharset($object->cond_reglement_doc);
+ $lib_condition_paiement=str_replace('\n', "\n", $lib_condition_paiement);
+ $pdf->MultiCell(80, 4, $lib_condition_paiement, 0, 'L');
+
+ $posy=$pdf->GetY()+3;
}
// Check a payment mode is defined
@@ -727,115 +729,105 @@ function _tableau_info(&$pdf, $object, $posy, $outputlangs)
}*/
// Show planed date of delivery
- if (! empty($object->date_livraison))
- {
+ if (! empty($object->date_livraison)) {
$outputlangs->load("sendings");
- $pdf->SetFont('','B', $default_font_size - 2);
- $pdf->SetXY($this->marge_gauche, $posy);
- $titre = $outputlangs->transnoentities("DateDeliveryPlanned").':';
- $pdf->MultiCell(80, 4, $titre, 0, 'L');
- $pdf->SetFont('','', $default_font_size - 2);
- $pdf->SetXY($posxval, $posy);
- $dlp=dol_print_date($object->date_livraison,"daytext",false,$outputlangs,true);
- $pdf->MultiCell(80, 4, $dlp, 0, 'L');
+ $pdf->SetFont('', 'B', $default_font_size - 2);
+ $pdf->SetXY($this->marge_gauche, $posy);
+ $titre = $outputlangs->transnoentities("DateDeliveryPlanned").':';
+ $pdf->MultiCell(80, 4, $titre, 0, 'L');
+ $pdf->SetFont('', '', $default_font_size - 2);
+ $pdf->SetXY($posxval, $posy);
+ $dlp=dol_print_date($object->date_livraison, "daytext", false, $outputlangs, true);
+ $pdf->MultiCell(80, 4, $dlp, 0, 'L');
$posy=$pdf->GetY()+1;
- }
- elseif ($object->availability_code || $object->availability) // Show availability conditions
- {
- $pdf->SetFont('','B', $default_font_size - 2);
- $pdf->SetXY($this->marge_gauche, $posy);
- $titre = $outputlangs->transnoentities("AvailabilityPeriod").':';
- $pdf->MultiCell(80, 4, $titre, 0, 'L');
- $pdf->SetTextColor(0,0,0);
- $pdf->SetFont('','', $default_font_size - 2);
- $pdf->SetXY($posxval, $posy);
- $lib_availability=$outputlangs->transnoentities("AvailabilityType".$object->availability_code)!=('AvailabilityType'.$object->availability_code)?$outputlangs->transnoentities("AvailabilityType".$object->availability_code):$outputlangs->convToOutputCharset(isset($object->availability)?$object->availability:'');
- $lib_availability=str_replace('\n',"\n",$lib_availability);
- $pdf->MultiCell(80, 4, $lib_availability, 0, 'L');
-
- $posy=$pdf->GetY()+1;
- }
+ } elseif ($object->availability_code || $object->availability) {
+ // Show availability conditions
+
+ $pdf->SetFont('', 'B', $default_font_size - 2);
+ $pdf->SetXY($this->marge_gauche, $posy);
+ $titre = $outputlangs->transnoentities("AvailabilityPeriod").':';
+ $pdf->MultiCell(80, 4, $titre, 0, 'L');
+ $pdf->SetTextColor(0, 0, 0);
+ $pdf->SetFont('', '', $default_font_size - 2);
+ $pdf->SetXY($posxval, $posy);
+ $lib_availability=$outputlangs->transnoentities("AvailabilityType".$object->availability_code)!=('AvailabilityType'.$object->availability_code)?$outputlangs->transnoentities("AvailabilityType".$object->availability_code):$outputlangs->convToOutputCharset(isset($object->availability)?$object->availability:'');
+ $lib_availability=str_replace('\n', "\n", $lib_availability);
+ $pdf->MultiCell(80, 4, $lib_availability, 0, 'L');
+
+ $posy=$pdf->GetY()+1;
+ }
// Show payment mode
if ($object->mode_reglement_code
&& $object->mode_reglement_code != 'CHQ'
- && $object->mode_reglement_code != 'VIR')
- {
- $pdf->SetFont('','B', $default_font_size - 2);
- $pdf->SetXY($this->marge_gauche, $posy);
- $titre = $outputlangs->transnoentities("PaymentMode").':';
- $pdf->MultiCell(80, 5, $titre, 0, 'L');
+ && $object->mode_reglement_code != 'VIR') {
+ $pdf->SetFont('', 'B', $default_font_size - 2);
+ $pdf->SetXY($this->marge_gauche, $posy);
+ $titre = $outputlangs->transnoentities("PaymentMode").':';
+ $pdf->MultiCell(80, 5, $titre, 0, 'L');
- $pdf->SetFont('','', $default_font_size - 2);
- $pdf->SetXY($posxval, $posy);
- $lib_mode_reg=$outputlangs->transnoentities("PaymentType".$object->mode_reglement_code)!=('PaymentType'.$object->mode_reglement_code)?$outputlangs->transnoentities("PaymentType".$object->mode_reglement_code):$outputlangs->convToOutputCharset($object->mode_reglement);
- $pdf->MultiCell(80, 5, $lib_mode_reg,0,'L');
+ $pdf->SetFont('', '', $default_font_size - 2);
+ $pdf->SetXY($posxval, $posy);
+ $lib_mode_reg=$outputlangs->transnoentities("PaymentType".$object->mode_reglement_code)!=('PaymentType'.$object->mode_reglement_code)?$outputlangs->transnoentities("PaymentType".$object->mode_reglement_code):$outputlangs->convToOutputCharset($object->mode_reglement);
+ $pdf->MultiCell(80, 5, $lib_mode_reg, 0, 'L');
- $posy=$pdf->GetY()+2;
- }
+ $posy=$pdf->GetY()+2;
+ }
// Show payment mode CHQ
- if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'CHQ')
- {
- // Si mode reglement non force ou si force a CHQ
- if (! empty($conf->global->FACTURE_CHQ_NUMBER))
- {
- if ($conf->global->FACTURE_CHQ_NUMBER > 0)
- {
+ if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'CHQ') {
+ // Si mode reglement non force ou si force a CHQ
+ if (! empty($conf->global->FACTURE_CHQ_NUMBER)) {
+ if ($conf->global->FACTURE_CHQ_NUMBER > 0) {
$account = new Account($this->db);
$account->fetch($conf->global->FACTURE_CHQ_NUMBER);
$pdf->SetXY($this->marge_gauche, $posy);
- $pdf->SetFont('','B', $default_font_size - 3);
- $pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo',$account->proprio),0,'L',0);
- $posy=$pdf->GetY()+1;
-
- if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
- {
- $pdf->SetXY($this->marge_gauche, $posy);
- $pdf->SetFont('','', $default_font_size - 3);
- $pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($account->owner_address), 0, 'L', 0);
- $posy=$pdf->GetY()+2;
- }
+ $pdf->SetFont('', 'B', $default_font_size - 3);
+ $pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $account->proprio), 0, 'L', 0);
+ $posy=$pdf->GetY()+1;
+
+ if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS)) {
+ $pdf->SetXY($this->marge_gauche, $posy);
+ $pdf->SetFont('', '', $default_font_size - 3);
+ $pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($account->owner_address), 0, 'L', 0);
+ $posy=$pdf->GetY()+2;
+ }
}
- if ($conf->global->FACTURE_CHQ_NUMBER == -1)
- {
+ if ($conf->global->FACTURE_CHQ_NUMBER == -1) {
$pdf->SetXY($this->marge_gauche, $posy);
- $pdf->SetFont('','B', $default_font_size - 3);
- $pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo',$this->emetteur->name),0,'L',0);
- $posy=$pdf->GetY()+1;
-
- if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
- {
- $pdf->SetXY($this->marge_gauche, $posy);
- $pdf->SetFont('','', $default_font_size - 3);
- $pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', 0);
- $posy=$pdf->GetY()+2;
- }
+ $pdf->SetFont('', 'B', $default_font_size - 3);
+ $pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $this->emetteur->name), 0, 'L', 0);
+ $posy=$pdf->GetY()+1;
+
+ if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS)) {
+ $pdf->SetXY($this->marge_gauche, $posy);
+ $pdf->SetFont('', '', $default_font_size - 3);
+ $pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', 0);
+ $posy=$pdf->GetY()+2;
+ }
}
}
- }
+ }
// If payment mode not forced or forced to VIR, show payment with BAN
- if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'VIR')
- {
- if (! empty($object->fk_bank) || ! empty($conf->global->FACTURE_RIB_NUMBER))
- {
- $bankid=(empty($object->fk_bank)?$conf->global->FACTURE_RIB_NUMBER:$object->fk_bank);
- $account = new Account($this->db);
- $account->fetch($bankid);
+ if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'VIR') {
+ if (! empty($object->fk_bank) || ! empty($conf->global->FACTURE_RIB_NUMBER)) {
+ $bankid=(empty($object->fk_bank)?$conf->global->FACTURE_RIB_NUMBER:$object->fk_bank);
+ $account = new Account($this->db);
+ $account->fetch($bankid);
- $curx=$this->marge_gauche;
- $cury=$posy;
+ $curx=$this->marge_gauche;
+ $cury=$posy;
- $posy=pdf_bank($pdf,$outputlangs,$curx,$cury,$account,0,$default_font_size);
+ $posy=pdf_bank($pdf, $outputlangs, $curx, $cury, $account, 0, $default_font_size);
- $posy+=2;
- }
+ $posy+=2;
+ }
}
- return $posy;
+ return $posy;
}
@@ -849,251 +841,248 @@ function _tableau_info(&$pdf, $object, $posy, $outputlangs)
* @param Translate $outputlangs Objet langs
* @return int Position pour suite
*/
- function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
+ public function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
{
global $conf,$mysoc;
- $default_font_size = pdf_getPDFFontSize($outputlangs);
+ $default_font_size = pdf_getPDFFontSize($outputlangs);
- $tab2_top = $posy;
- $tab2_hl = 4;
- $pdf->SetFont('','', $default_font_size - 1);
+ $tab2_top = $posy;
+ $tab2_hl = 4;
+ $pdf->SetFont('', '', $default_font_size - 1);
// Tableau total
- $col1x = 120; $col2x = 170;
- if ($this->page_largeur < 210) // To work with US executive format
- {
+ $col1x = 120;
+ $col2x = 170;
+ if ($this->page_largeur < 210) {
+ // To work with US executive format
+
$col2x-=20;
- }
- $largcol2 = ($this->page_largeur - $this->marge_droite - $col2x);
+ }
+ $largcol2 = ($this->page_largeur - $this->marge_droite - $col2x);
- $useborder=0;
- $index = 0;
+ $useborder=0;
+ $index = 0;
// Total HT
- $pdf->SetFillColor(255,255,255);
- $pdf->SetXY($col1x, $tab2_top + 0);
- $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', 1);
+ $pdf->SetFillColor(255, 255, 255);
+ $pdf->SetXY($col1x, $tab2_top + 0);
+ $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', 1);
- $pdf->SetXY($col2x, $tab2_top + 0);
- $pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ht + (! empty($object->remise)?$object->remise:0), 0, $outputlangs), 0, 'R', 1);
+ $pdf->SetXY($col2x, $tab2_top + 0);
+ $pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ht + (! empty($object->remise)?$object->remise:0), 0, $outputlangs), 0, 'R', 1);
// Show VAT by rates and total
- $pdf->SetFillColor(248,248,248);
-
- $this->atleastoneratenotnull=0;
- if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
- {
- $tvaisnull=((! empty($this->tva) && count($this->tva) == 1 && isset($this->tva['0.000']) && is_float($this->tva['0.000'])) ? true : false);
- if (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_ISNULL) && $tvaisnull)
- {
- // Nothing to do
- }
- else
- {
- //Local tax 1 before VAT
+ $pdf->SetFillColor(248, 248, 248);
+
+ $this->atleastoneratenotnull=0;
+ if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) {
+ $tvaisnull=((! empty($this->tva) && count($this->tva) == 1 && isset($this->tva['0.000']) && is_float($this->tva['0.000'])) ? true : false);
+ if (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_ISNULL) && $tvaisnull) {
+ // Nothing to do
+ } else {
+ //Local tax 1 before VAT
//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
//{
- foreach( $this->localtax1 as $localtax_type => $localtax_rate )
- {
- if (in_array((string) $localtax_type, array('1','3','5'))) continue;
- foreach( $localtax_rate as $tvakey => $tvaval )
- {
- if ($tvakey!=0) // On affiche pas taux 0
- {
+ foreach ($this->localtax1 as $localtax_type => $localtax_rate) {
+ if (in_array((string) $localtax_type, array('1','3','5'))) {
+ continue;
+ }
+ foreach ($localtax_rate as $tvakey => $tvaval) {
+ if ($tvakey!=0) {
+ // On affiche pas taux 0
+
//$this->atleastoneratenotnull++;
$index++;
- $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-
- $tvacompl='';
- if (preg_match('/\*/',$tvakey))
- {
- $tvakey=str_replace('*','',$tvakey);
- $tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
- }
- $totalvat = $outputlangs->transcountrynoentities("TotalLT1",$mysoc->country_code).' ';
- $totalvat.=vatrate(abs($tvakey),1).$tvacompl;
- $pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
-
- $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
- $pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
- }
- }
+ $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+
+ $tvacompl='';
+ if (preg_match('/\*/', $tvakey)) {
+ $tvakey=str_replace('*', '', $tvakey);
+ $tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
+ }
+ $totalvat = $outputlangs->transcountrynoentities("TotalLT1", $mysoc->country_code).' ';
+ $totalvat.=vatrate(abs($tvakey), 1).$tvacompl;
+ $pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+
+ $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+ $pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
+ }
+ }
}
//}
//Local tax 2 before VAT
//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
//{
- foreach( $this->localtax2 as $localtax_type => $localtax_rate )
- {
- if (in_array((string) $localtax_type, array('1','3','5'))) continue;
- foreach( $localtax_rate as $tvakey => $tvaval )
- {
- if ($tvakey!=0) // On affiche pas taux 0
- {
+ foreach ($this->localtax2 as $localtax_type => $localtax_rate) {
+ if (in_array((string) $localtax_type, array('1','3','5'))) {
+ continue;
+ }
+ foreach ($localtax_rate as $tvakey => $tvaval) {
+ if ($tvakey!=0) {
+ // On affiche pas taux 0
+
//$this->atleastoneratenotnull++;
$index++;
- $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-
- $tvacompl='';
- if (preg_match('/\*/',$tvakey))
- {
- $tvakey=str_replace('*','',$tvakey);
- $tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
- }
- $totalvat = $outputlangs->transcountrynoentities("TotalLT2",$mysoc->country_code).' ';
- $totalvat.=vatrate(abs($tvakey),1).$tvacompl;
- $pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
-
- $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
- $pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
-
- }
- }
+ $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+
+ $tvacompl='';
+ if (preg_match('/\*/', $tvakey)) {
+ $tvakey=str_replace('*', '', $tvakey);
+ $tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
+ }
+ $totalvat = $outputlangs->transcountrynoentities("TotalLT2", $mysoc->country_code).' ';
+ $totalvat.=vatrate(abs($tvakey), 1).$tvacompl;
+ $pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+
+ $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+ $pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
+ }
+ }
}
//}
// VAT
- foreach($this->tva as $tvakey => $tvaval)
- {
- if ($tvakey > 0) // On affiche pas taux 0
- {
- $this->atleastoneratenotnull++;
-
- $index++;
- $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+ foreach ($this->tva as $tvakey => $tvaval) {
+ if ($tvakey > 0) {
+ // On affiche pas taux 0
- $tvacompl='';
- if (preg_match('/\*/',$tvakey))
- {
- $tvakey=str_replace('*','',$tvakey);
- $tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
- }
- $totalvat =$outputlangs->transnoentities("TotalVAT").' ';
- $totalvat.=vatrate($tvakey,1).$tvacompl;
- $pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+ $this->atleastoneratenotnull++;
- $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
- $pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
- }
+ $index++;
+ $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+
+ $tvacompl='';
+ if (preg_match('/\*/', $tvakey)) {
+ $tvakey=str_replace('*', '', $tvakey);
+ $tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
+ }
+ $totalvat =$outputlangs->transnoentities("TotalVAT").' ';
+ $totalvat.=vatrate($tvakey, 1).$tvacompl;
+ $pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+
+ $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+ $pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
+ }
}
//Local tax 1 after VAT
//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
//{
- foreach( $this->localtax1 as $localtax_type => $localtax_rate )
- {
- if (in_array((string) $localtax_type, array('2','4','6'))) continue;
-
- foreach( $localtax_rate as $tvakey => $tvaval )
- {
- if ($tvakey != 0) // On affiche pas taux 0
- {
- //$this->atleastoneratenotnull++;
+ foreach ($this->localtax1 as $localtax_type => $localtax_rate) {
+ if (in_array((string) $localtax_type, array('2','4','6'))) {
+ continue;
+ }
- $index++;
- $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+ foreach ($localtax_rate as $tvakey => $tvaval) {
+ if ($tvakey != 0) {
+ // On affiche pas taux 0
- $tvacompl='';
- if (preg_match('/\*/',$tvakey))
- {
- $tvakey=str_replace('*','',$tvakey);
- $tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
- }
- $totalvat = $outputlangs->transcountrynoentities("TotalLT1",$mysoc->country_code).' ';
+ //$this->atleastoneratenotnull++;
- $totalvat.=vatrate(abs($tvakey),1).$tvacompl;
- $pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
- $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
- $pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
- }
- }
+ $index++;
+ $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+
+ $tvacompl='';
+ if (preg_match('/\*/', $tvakey)) {
+ $tvakey=str_replace('*', '', $tvakey);
+ $tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
+ }
+ $totalvat = $outputlangs->transcountrynoentities("TotalLT1", $mysoc->country_code).' ';
+
+ $totalvat.=vatrate(abs($tvakey), 1).$tvacompl;
+ $pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+ $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+ $pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
+ }
+ }
}
//}
//Local tax 2 after VAT
//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
//{
- foreach( $this->localtax2 as $localtax_type => $localtax_rate )
- {
- if (in_array((string) $localtax_type, array('2','4','6'))) continue;
-
- foreach( $localtax_rate as $tvakey => $tvaval )
- {
- if ($tvakey != 0) // On affiche pas taux 0
- {
- //$this->atleastoneratenotnull++;
+ foreach ($this->localtax2 as $localtax_type => $localtax_rate) {
+ if (in_array((string) $localtax_type, array('2','4','6'))) {
+ continue;
+ }
- $index++;
- $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-
- $tvacompl='';
- if (preg_match('/\*/',$tvakey))
- {
- $tvakey=str_replace('*','',$tvakey);
- $tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
- }
- $totalvat = $outputlangs->transcountrynoentities("TotalLT2",$mysoc->country_code).' ';
+ foreach ($localtax_rate as $tvakey => $tvaval) {
+ if ($tvakey != 0) {
+ // On affiche pas taux 0
- $totalvat.=vatrate(abs($tvakey),1).$tvacompl;
- $pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+ //$this->atleastoneratenotnull++;
- $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
- $pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
- }
- }
+ $index++;
+ $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+
+ $tvacompl='';
+ if (preg_match('/\*/', $tvakey)) {
+ $tvakey=str_replace('*', '', $tvakey);
+ $tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
+ }
+ $totalvat = $outputlangs->transcountrynoentities("TotalLT2", $mysoc->country_code).' ';
+
+ $totalvat.=vatrate(abs($tvakey), 1).$tvacompl;
+ $pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+
+ $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+ $pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
+ }
+ }
}
//}
// Total TTC
$index++;
- $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
- $pdf->SetTextColor(0,0,60);
- $pdf->SetFillColor(224,224,224);
- $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC"), $useborder, 'L', 1);
+ $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+ $pdf->SetTextColor(0, 0, 60);
+ $pdf->SetFillColor(224, 224, 224);
+ $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC"), $useborder, 'L', 1);
- $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
- $pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ttc, 0, $outputlangs), $useborder, 'R', 1);
- }
- }
+ $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+ $pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ttc, 0, $outputlangs), $useborder, 'R', 1);
+ }
+ }
- $pdf->SetTextColor(0,0,0);
+ $pdf->SetTextColor(0, 0, 0);
- $creditnoteamount=0;
- $depositsamount=0;
+ $creditnoteamount=0;
+ $depositsamount=0;
//$creditnoteamount=$object->getSumCreditNotesUsed();
//$depositsamount=$object->getSumDepositsUsed();
//print "x".$creditnoteamount."-".$depositsamount;exit;
$resteapayer = price2num($object->total_ttc - $deja_regle - $creditnoteamount - $depositsamount, 'MT');
- if (! empty($object->paye)) $resteapayer=0;
+ if (! empty($object->paye)) {
+ $resteapayer=0;
+ }
- if ($deja_regle > 0)
- {
- // Already paid + Deposits
+ if ($deja_regle > 0) {
+ // Already paid + Deposits
$index++;
- $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
- $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("AlreadyPaid"), 0, 'L', 0);
- $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
- $pdf->MultiCell($largcol2, $tab2_hl, price($deja_regle, 0, $outputlangs), 0, 'R', 0);
+ $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+ $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("AlreadyPaid"), 0, 'L', 0);
+ $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+ $pdf->MultiCell($largcol2, $tab2_hl, price($deja_regle, 0, $outputlangs), 0, 'R', 0);
- $index++;
- $pdf->SetTextColor(0,0,60);
- $pdf->SetFillColor(224,224,224);
- $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
- $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("RemainderToPay"), $useborder, 'L', 1);
+ $index++;
+ $pdf->SetTextColor(0, 0, 60);
+ $pdf->SetFillColor(224, 224, 224);
+ $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+ $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("RemainderToPay"), $useborder, 'L', 1);
- $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
- $pdf->MultiCell($largcol2, $tab2_hl, price($resteapayer, 0, $outputlangs), $useborder, 'R', 1);
+ $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+ $pdf->MultiCell($largcol2, $tab2_hl, price($resteapayer, 0, $outputlangs), $useborder, 'R', 1);
- $pdf->SetFont('','', $default_font_size - 1);
- $pdf->SetTextColor(0,0,0);
- }
+ $pdf->SetFont('', '', $default_font_size - 1);
+ $pdf->SetTextColor(0, 0, 0);
+ }
- $index++;
- return ($tab2_top + ($tab2_hl * $index));
+ $index++;
+ return ($tab2_top + ($tab2_hl * $index));
}
/**
@@ -1108,87 +1097,81 @@ function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
* @param int $hidebottom Hide bottom bar of array
* @return void
*/
- function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop=0, $hidebottom=0)
+ public function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop=0, $hidebottom=0)
{
- global $conf;
+ global $conf;
// Force to disable hidetop and hidebottom
$hidebottom=0;
- if ($hidetop) $hidetop=-1;
+ if ($hidetop) {
+ $hidetop=-1;
+ }
- $default_font_size = pdf_getPDFFontSize($outputlangs);
+ $default_font_size = pdf_getPDFFontSize($outputlangs);
// Amount in (at tab_top - 1)
- $pdf->SetTextColor(0,0,0);
- $pdf->SetFont('','', $default_font_size - 2);
+ $pdf->SetTextColor(0, 0, 0);
+ $pdf->SetFont('', '', $default_font_size - 2);
- if (empty($hidetop))
- {
- $titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$conf->currency));
- $pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top-4);
- $pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
+ if (empty($hidetop)) {
+ $titre = $outputlangs->transnoentities("AmountInCurrency", $outputlangs->transnoentitiesnoconv("Currency".$conf->currency));
+ $pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top-4);
+ $pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
//$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR='230,230,230';
- if (! empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) $pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_droite-$this->marge_gauche, 5, 'F', null, explode(',',$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
- }
+ if (! empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) {
+ $pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_droite-$this->marge_gauche, 5, 'F', null, explode(',', $conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
+ }
+ }
- $pdf->SetDrawColor(128,128,128);
- $pdf->SetFont('','', $default_font_size - 1);
+ $pdf->SetDrawColor(128, 128, 128);
+ $pdf->SetFont('', '', $default_font_size - 1);
// Output Rect
- $this->printRect($pdf,$this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect prend une longueur en 3eme param et 4eme param
+ $this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect prend une longueur en 3eme param et 4eme param
- if (empty($hidetop))
- {
- $pdf->line($this->marge_gauche, $tab_top+5, $this->page_largeur-$this->marge_droite, $tab_top+5); // line prend une position y en 2eme param et 4eme param
+ if (empty($hidetop)) {
+ $pdf->line($this->marge_gauche, $tab_top+5, $this->page_largeur-$this->marge_droite, $tab_top+5); // line prend une position y en 2eme param et 4eme param
$pdf->SetXY($this->posxdesc-1, $tab_top+1);
- $pdf->MultiCell(108,2, $outputlangs->transnoentities("Designation"),'','L');
- }
-
- if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
- {
- $pdf->line($this->posxtva-1, $tab_top, $this->posxtva-1, $tab_top + $tab_height);
- if (empty($hidetop))
- {
- $pdf->SetXY($this->posxtva-3, $tab_top+1);
- $pdf->MultiCell($this->posxup-$this->posxtva+3,2, $outputlangs->transnoentities("VAT"),'','C');
- }
+ $pdf->MultiCell(108, 2, $outputlangs->transnoentities("Designation"), '', 'L');
}
- $pdf->line($this->posxup-1, $tab_top, $this->posxup-1, $tab_top + $tab_height);
- if (empty($hidetop))
- {
- $pdf->SetXY($this->posxup-1, $tab_top+1);
- $pdf->MultiCell($this->posxqty-$this->posxup-1,2, $outputlangs->transnoentities("PriceUHT"),'','C');
- }
-
- $pdf->line($this->posxqty-1, $tab_top, $this->posxqty-1, $tab_top + $tab_height);
- if (empty($hidetop))
- {
- $pdf->SetXY($this->posxqty-1, $tab_top+1);
- $pdf->MultiCell($this->posxdiscount-$this->posxqty-1,2, $outputlangs->transnoentities("Qty"),'','C');
- }
-
- $pdf->line($this->posxdiscount-1, $tab_top, $this->posxdiscount-1, $tab_top + $tab_height);
- if (empty($hidetop))
- {
- if ($this->atleastonediscount)
- {
- $pdf->SetXY($this->posxdiscount-1, $tab_top+1);
- $pdf->MultiCell($this->postotalht-$this->posxdiscount+1,2, $outputlangs->transnoentities("ReductionShort"),'','C');
- }
- }
-
- if ($this->atleastonediscount)
- {
- $pdf->line($this->postotalht, $tab_top, $this->postotalht, $tab_top + $tab_height);
- }
- if (empty($hidetop))
- {
- $pdf->SetXY($this->postotalht-1, $tab_top+1);
- $pdf->MultiCell(30,2, $outputlangs->transnoentities("TotalHT"),'','C');
- }
+ if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) {
+ $pdf->line($this->posxtva-1, $tab_top, $this->posxtva-1, $tab_top + $tab_height);
+ if (empty($hidetop)) {
+ $pdf->SetXY($this->posxtva-3, $tab_top+1);
+ $pdf->MultiCell($this->posxup-$this->posxtva+3, 2, $outputlangs->transnoentities("VAT"), '', 'C');
+ }
+ }
+
+ $pdf->line($this->posxup-1, $tab_top, $this->posxup-1, $tab_top + $tab_height);
+ if (empty($hidetop)) {
+ $pdf->SetXY($this->posxup-1, $tab_top+1);
+ $pdf->MultiCell($this->posxqty-$this->posxup-1, 2, $outputlangs->transnoentities("PriceUHT"), '', 'C');
+ }
+
+ $pdf->line($this->posxqty-1, $tab_top, $this->posxqty-1, $tab_top + $tab_height);
+ if (empty($hidetop)) {
+ $pdf->SetXY($this->posxqty-1, $tab_top+1);
+ $pdf->MultiCell($this->posxdiscount-$this->posxqty-1, 2, $outputlangs->transnoentities("Qty"), '', 'C');
+ }
+
+ $pdf->line($this->posxdiscount-1, $tab_top, $this->posxdiscount-1, $tab_top + $tab_height);
+ if (empty($hidetop)) {
+ if ($this->atleastonediscount) {
+ $pdf->SetXY($this->posxdiscount-1, $tab_top+1);
+ $pdf->MultiCell($this->postotalht-$this->posxdiscount+1, 2, $outputlangs->transnoentities("ReductionShort"), '', 'C');
+ }
+ }
+
+ if ($this->atleastonediscount) {
+ $pdf->line($this->postotalht, $tab_top, $this->postotalht, $tab_top + $tab_height);
+ }
+ if (empty($hidetop)) {
+ $pdf->SetXY($this->postotalht-1, $tab_top+1);
+ $pdf->MultiCell(30, 2, $outputlangs->transnoentities("TotalHT"), '', 'C');
+ }
}
/**
@@ -1200,174 +1183,170 @@ function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop=0,
* @param Translate $outputlangs Object lang for output
* @return void
*/
- function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
+ public function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
{
- global $conf,$langs,$hookmanager;
+ global $conf,$langs,$hookmanager;
- $outputlangs->load("main");
- $outputlangs->load("bills");
- $outputlangs->load("propal");
- $outputlangs->load("companies");
- $outputlangs->load("orders");
- $default_font_size = pdf_getPDFFontSize($outputlangs);
+ $outputlangs->load("main");
+ $outputlangs->load("bills");
+ $outputlangs->load("propal");
+ $outputlangs->load("companies");
+ $outputlangs->load("orders");
+ $default_font_size = pdf_getPDFFontSize($outputlangs);
- pdf_pagehead($pdf,$outputlangs,$this->page_hauteur);
+ pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
// Show Draft Watermark
- if($object->statut==0 && (! empty($conf->global->COMMANDE_DRAFT_WATERMARK)) )
- {
- pdf_watermark($pdf,$outputlangs,$this->page_hauteur,$this->page_largeur,'mm',$conf->global->COMMANDE_DRAFT_WATERMARK);
+ if ($object->statut==0 && (! empty($conf->global->COMMANDE_DRAFT_WATERMARK))) {
+ pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->COMMANDE_DRAFT_WATERMARK);
}
- $pdf->SetTextColor(0,0,60);
- $pdf->SetFont('','B', $default_font_size + 3);
+ $pdf->SetTextColor(0, 0, 60);
+ $pdf->SetFont('', 'B', $default_font_size + 3);
- $posy=$this->marge_haute;
- $posx=$this->page_largeur-$this->marge_droite-100;
+ $posy=$this->marge_haute;
+ $posx=$this->page_largeur-$this->marge_droite-100;
- $pdf->SetXY($this->marge_gauche,$posy);
+ $pdf->SetXY($this->marge_gauche, $posy);
// Logo
$logo=$conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
- if ($this->emetteur->logo)
- {
- if (is_readable($logo))
- {
- $height=pdf_getHeightForLogo($logo);
- $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
- }
- else
- {
- $pdf->SetTextColor(200,0,0);
- $pdf->SetFont('','B', $default_font_size -2);
- $pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
- $pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
- }
- }
- else
- {
- $text=$this->emetteur->name;
- $pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
- }
+ if ($this->emetteur->logo) {
+ if (is_readable($logo)) {
+ $height=pdf_getHeightForLogo($logo);
+ $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
+ } else {
+ $pdf->SetTextColor(200, 0, 0);
+ $pdf->SetFont('', 'B', $default_font_size -2);
+ $pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
+ $pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
+ }
+ } else {
+ $text=$this->emetteur->name;
+ $pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
+ }
- $pdf->SetFont('','B', $default_font_size + 3);
- $pdf->SetXY($posx,$posy);
- $pdf->SetTextColor(0,0,60);
- $title=$outputlangs->transnoentities("Order");
- $pdf->MultiCell(100, 3, $title, '', 'R');
+ $pdf->SetFont('', 'B', $default_font_size + 3);
+ $pdf->SetXY($posx, $posy);
+ $pdf->SetTextColor(0, 0, 60);
+ $title=$outputlangs->transnoentities("Order");
+ $pdf->MultiCell(100, 3, $title, '', 'R');
- $pdf->SetFont('','B',$default_font_size);
+ $pdf->SetFont('', 'B', $default_font_size);
- $posy+=5;
- $pdf->SetXY($posx,$posy);
- $pdf->SetTextColor(0,0,60);
- $pdf->MultiCell(100, 4, $outputlangs->transnoentities("Ref")." : " . $outputlangs->convToOutputCharset($object->ref), '', 'R');
+ $posy+=5;
+ $pdf->SetXY($posx, $posy);
+ $pdf->SetTextColor(0, 0, 60);
+ $pdf->MultiCell(100, 4, $outputlangs->transnoentities("Ref")." : " . $outputlangs->convToOutputCharset($object->ref), '', 'R');
- $posy+=1;
- $pdf->SetFont('','', $default_font_size - 1);
+ $posy+=1;
+ $pdf->SetFont('', '', $default_font_size - 1);
- if ($object->ref_client)
- {
- $posy+=5;
- $pdf->SetXY($posx,$posy);
- $pdf->SetTextColor(0,0,60);
- $pdf->MultiCell(100, 3, $outputlangs->transnoentities("RefCustomer")." : " . $outputlangs->convToOutputCharset($object->ref_client), '', 'R');
- }
+ if ($object->ref_client) {
+ $posy+=5;
+ $pdf->SetXY($posx, $posy);
+ $pdf->SetTextColor(0, 0, 60);
+ $pdf->MultiCell(100, 3, $outputlangs->transnoentities("RefCustomer")." : " . $outputlangs->convToOutputCharset($object->ref_client), '', 'R');
+ }
- $posy+=4;
- $pdf->SetXY($posx,$posy);
- $pdf->SetTextColor(0,0,60);
- $pdf->MultiCell(100, 3, $outputlangs->transnoentities("OrderDate")." : " . dol_print_date($object->date,"%d %b %Y",false,$outputlangs,true), '', 'R');
+ $posy+=4;
+ $pdf->SetXY($posx, $posy);
+ $pdf->SetTextColor(0, 0, 60);
+ $pdf->MultiCell(100, 3, $outputlangs->transnoentities("OrderDate")." : " . dol_print_date($object->date, "%d %b %Y", false, $outputlangs, true), '', 'R');
- $posy+=2;
+ $posy+=2;
// Show list of linked objects
$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'R', $default_font_size);
- if ($showaddress)
- {
- // Sender properties
+ if ($showaddress) {
+ // Sender properties
$carac_emetteur = pdf_build_address($outputlangs, $this->emetteur, $object->client);
// Show sender
$posy=42;
- $posx=$this->marge_gauche;
- if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->page_largeur-$this->marge_droite-80;
- $hautcadre=40;
+ $posx=$this->marge_gauche;
+ if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+ $posx=$this->page_largeur-$this->marge_droite-80;
+ }
+ $hautcadre=40;
// Show sender frame
- $pdf->SetTextColor(0,0,0);
- $pdf->SetFont('','', $default_font_size - 2);
- $pdf->SetXY($posx,$posy-5);
- $pdf->MultiCell(66,5, $outputlangs->transnoentities("BillFrom").":", 0, 'L');
- $pdf->SetXY($posx,$posy);
- $pdf->SetFillColor(230,230,230);
- $pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1);
- $pdf->SetTextColor(0,0,60);
+ $pdf->SetTextColor(0, 0, 0);
+ $pdf->SetFont('', '', $default_font_size - 2);
+ $pdf->SetXY($posx, $posy-5);
+ $pdf->MultiCell(66, 5, $outputlangs->transnoentities("BillFrom").":", 0, 'L');
+ $pdf->SetXY($posx, $posy);
+ $pdf->SetFillColor(230, 230, 230);
+ $pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1);
+ $pdf->SetTextColor(0, 0, 60);
// Show sender name
- $pdf->SetXY($posx+2,$posy+3);
- $pdf->SetFont('','B', $default_font_size);
- $pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
- $posy=$pdf->getY();
+ $pdf->SetXY($posx+2, $posy+3);
+ $pdf->SetFont('', 'B', $default_font_size);
+ $pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
+ $posy=$pdf->getY();
// Show sender information
- $pdf->SetXY($posx+2,$posy);
- $pdf->SetFont('','', $default_font_size - 1);
- $pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L');
+ $pdf->SetXY($posx+2, $posy);
+ $pdf->SetFont('', '', $default_font_size - 1);
+ $pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L');
// If CUSTOMER contact defined on order, we use it
$usecontact=false;
- $arrayidcontact=$object->getIdContact('external','CUSTOMER');
- if (count($arrayidcontact) > 0)
- {
- $usecontact=true;
- $result=$object->fetch_contact($arrayidcontact[0]);
- }
+ $arrayidcontact=$object->getIdContact('external', 'CUSTOMER');
+ if (count($arrayidcontact) > 0) {
+ $usecontact=true;
+ $result=$object->fetch_contact($arrayidcontact[0]);
+ }
// Recipient name
- if (! empty($usecontact))
- {
- // On peut utiliser le nom de la societe du contact
- if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socname = $object->contact->socname;
- else $socname = $object->client->name;
- $carac_client_name=$outputlangs->convToOutputCharset($socname);
- }
- else
- {
- $carac_client_name=$outputlangs->convToOutputCharset($object->client->name);
+ if (! empty($usecontact)) {
+ // On peut utiliser le nom de la societe du contact
+ if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
+ $socname = $object->contact->socname;
+ } else {
+ $socname = $object->client->name;
+ }
+ $carac_client_name=$outputlangs->convToOutputCharset($socname);
+ } else {
+ $carac_client_name=$outputlangs->convToOutputCharset($object->client->name);
}
- $carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->client,($usecontact?$object->contact:''),$usecontact,'target');
+ $carac_client=pdf_build_address($outputlangs, $this->emetteur, $object->client, ($usecontact?$object->contact:''), $usecontact, 'target');
// Show recipient
$widthrecbox=100;
- if ($this->page_largeur < 210) $widthrecbox=84; // To work with US executive format
+ if ($this->page_largeur < 210) {
+ $widthrecbox=84;
+ } // To work with US executive format
$posy=42;
- $posx=$this->page_largeur-$this->marge_droite-$widthrecbox;
- if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->marge_gauche;
+ $posx=$this->page_largeur-$this->marge_droite-$widthrecbox;
+ if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+ $posx=$this->marge_gauche;
+ }
// Show recipient frame
- $pdf->SetTextColor(0,0,0);
- $pdf->SetFont('','', $default_font_size - 2);
- $pdf->SetXY($posx+2,$posy-5);
- $pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("BillTo").":",0,'L');
- $pdf->Rect($posx, $posy, $widthrecbox, $hautcadre);
+ $pdf->SetTextColor(0, 0, 0);
+ $pdf->SetFont('', '', $default_font_size - 2);
+ $pdf->SetXY($posx+2, $posy-5);
+ $pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("BillTo").":", 0, 'L');
+ $pdf->Rect($posx, $posy, $widthrecbox, $hautcadre);
// Show recipient name
- $pdf->SetXY($posx+2,$posy+3);
- $pdf->SetFont('','B', $default_font_size);
- $pdf->MultiCell($widthrecbox, 4, $carac_client_name, 0, 'L');
+ $pdf->SetXY($posx+2, $posy+3);
+ $pdf->SetFont('', 'B', $default_font_size);
+ $pdf->MultiCell($widthrecbox, 4, $carac_client_name, 0, 'L');
// Show recipient information
- $pdf->SetFont('','', $default_font_size - 1);
- $pdf->SetXY($posx+2,$posy+4+(dol_nboflines_bis($carac_client_name,50)*4));
- $pdf->MultiCell($widthrecbox, 4, $carac_client, 0, 'L');
- }
+ $pdf->SetFont('', '', $default_font_size - 1);
+ $pdf->SetXY($posx+2, $posy+4+(dol_nboflines_bis($carac_client_name, 50)*4));
+ $pdf->MultiCell($widthrecbox, 4, $carac_client, 0, 'L');
+ }
- $pdf->SetTextColor(0,0,0);
+ $pdf->SetTextColor(0, 0, 0);
}
/**
@@ -1379,11 +1358,9 @@ function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
* @param int $hidefreetext 1=Hide free text
* @return int Return height of bottom margin including footer text
*/
- function _pagefoot(&$pdf,$object,$outputlangs,$hidefreetext=0)
+ public function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext=0)
{
- $showdetails=0;
- return pdf_pagefoot($pdf,$outputlangs,'COMMANDE_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
+ $showdetails=0;
+ return pdf_pagefoot($pdf, $outputlangs, 'COMMANDE_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
}
-
}
-
diff --git a/core/modules/facture/doc/pdf_crabe_subtotal.modules.php b/core/modules/facture/doc/pdf_crabe_subtotal.modules.php
index 6771286c..c7a48410 100755
--- a/core/modules/facture/doc/pdf_crabe_subtotal.modules.php
+++ b/core/modules/facture/doc/pdf_crabe_subtotal.modules.php
@@ -38,23 +38,23 @@
*/
class pdf_crabe_subtotal extends ModelePDFFactures
{
- var $db;
- var $name;
- var $description;
- var $type;
+ public $db;
+ public $name;
+ public $description;
+ public $type;
- var $phpmin = array(4,3,0); // Minimum version of PHP required by module
- var $version = 'dolibarr';
+ public $phpmin = array(4,3,0); // Minimum version of PHP required by module
+ public $version = 'dolibarr';
- var $page_largeur;
- var $page_hauteur;
- var $format;
- var $marge_gauche;
- var $marge_droite;
- var $marge_haute;
- var $marge_basse;
+ public $page_largeur;
+ public $page_hauteur;
+ public $format;
+ public $marge_gauche;
+ public $marge_droite;
+ public $marge_haute;
+ public $marge_basse;
- var $emetteur; // Objet societe qui emet
+ public $emetteur; // Objet societe qui emet
/**
@@ -62,29 +62,29 @@ class pdf_crabe_subtotal extends ModelePDFFactures
*
* @param DoliDB $db Database handler
*/
- function __construct($db)
+ public function __construct($db)
{
- global $conf,$langs,$mysoc;
+ global $conf,$langs,$mysoc;
- $langs->load("main");
- $langs->load("bills");
+ $langs->load("main");
+ $langs->load("bills");
- $this->db = $db;
- $this->name = "crabe_subtotal";
- $this->description = 'Modèle de facture incluant des spécificités pour le module sous-total.';
+ $this->db = $db;
+ $this->name = "crabe_subtotal";
+ $this->description = 'Modèle de facture incluant des spécificités pour le module sous-total.';
// Dimension page pour format A4
$this->type = 'pdf';
- $formatarray=pdf_getFormat();
- $this->page_largeur = $formatarray['width'];
- $this->page_hauteur = $formatarray['height'];
- $this->format = array($this->page_largeur,$this->page_hauteur);
- $this->marge_gauche=isset($conf->global->MAIN_PDF_MARGIN_LEFT)?$conf->global->MAIN_PDF_MARGIN_LEFT:10;
- $this->marge_droite=isset($conf->global->MAIN_PDF_MARGIN_RIGHT)?$conf->global->MAIN_PDF_MARGIN_RIGHT:10;
- $this->marge_haute =isset($conf->global->MAIN_PDF_MARGIN_TOP)?$conf->global->MAIN_PDF_MARGIN_TOP:10;
- $this->marge_basse =isset($conf->global->MAIN_PDF_MARGIN_BOTTOM)?$conf->global->MAIN_PDF_MARGIN_BOTTOM:10;
-
- $this->option_logo = 1; // Affiche logo
+ $formatarray=pdf_getFormat();
+ $this->page_largeur = $formatarray['width'];
+ $this->page_hauteur = $formatarray['height'];
+ $this->format = array($this->page_largeur,$this->page_hauteur);
+ $this->marge_gauche=isset($conf->global->MAIN_PDF_MARGIN_LEFT)?$conf->global->MAIN_PDF_MARGIN_LEFT:10;
+ $this->marge_droite=isset($conf->global->MAIN_PDF_MARGIN_RIGHT)?$conf->global->MAIN_PDF_MARGIN_RIGHT:10;
+ $this->marge_haute =isset($conf->global->MAIN_PDF_MARGIN_TOP)?$conf->global->MAIN_PDF_MARGIN_TOP:10;
+ $this->marge_basse =isset($conf->global->MAIN_PDF_MARGIN_BOTTOM)?$conf->global->MAIN_PDF_MARGIN_BOTTOM:10;
+
+ $this->option_logo = 1; // Affiche logo
$this->option_tva = 1; // Gere option tva FACTURE_TVAOPTION
$this->option_modereg = 1; // Affiche mode reglement
$this->option_condreg = 1; // Affiche conditions reglement
@@ -99,32 +99,37 @@ function __construct($db)
// Get source company
$this->emetteur=$mysoc;
- if (empty($this->emetteur->country_code)) $this->emetteur->country_code=substr($langs->defaultlang,-2); // By default, if was not defined
+ if (empty($this->emetteur->country_code)) {
+ $this->emetteur->country_code=substr($langs->defaultlang, -2);
+ } // By default, if was not defined
// Define position of columns
$this->posxdesc=$this->marge_gauche+1;
- $this->posxtva=112;
- $this->posxup=126;
- $this->posxqty=145;
- $this->posxdiscount=162;
- $this->postotalht=174;
- if (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) $this->posxtva=$this->posxup;
- $this->posxpicture=$this->posxtva - (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH)?20:$conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH); // width of images
- if ($this->page_largeur < 210) // To work with US executive format
- {
+ $this->posxtva=112;
+ $this->posxup=126;
+ $this->posxqty=145;
+ $this->posxdiscount=162;
+ $this->postotalht=174;
+ if (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) {
+ $this->posxtva=$this->posxup;
+ }
+ $this->posxpicture=$this->posxtva - (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH)?20:$conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH); // width of images
+ if ($this->page_largeur < 210) {
+ // To work with US executive format
+
$this->posxpicture-=20;
- $this->posxtva-=20;
- $this->posxup-=20;
- $this->posxqty-=20;
- $this->posxdiscount-=20;
- $this->postotalht-=20;
+ $this->posxtva-=20;
+ $this->posxup-=20;
+ $this->posxqty-=20;
+ $this->posxdiscount-=20;
+ $this->postotalht-=20;
}
- $this->tva=array();
- $this->localtax1=array();
- $this->localtax2=array();
- $this->atleastoneratenotnull=0;
- $this->atleastonediscount=0;
+ $this->tva=array();
+ $this->localtax1=array();
+ $this->localtax2=array();
+ $this->atleastoneratenotnull=0;
+ $this->atleastonediscount=0;
}
@@ -139,222 +144,216 @@ function __construct($db)
* @param int $hideref Do not show ref
* @return int 1=OK, 0=KO
*/
- function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hidedesc=0,$hideref=0)
+ public function write_file($object, $outputlangs, $srctemplatepath='', $hidedetails=0, $hidedesc=0, $hideref=0)
{
- global $user,$langs,$conf,$mysoc,$db,$hookmanager;
+ global $user,$langs,$conf,$mysoc,$db,$hookmanager;
- if (! is_object($outputlangs)) $outputlangs=$langs;
+ if (! is_object($outputlangs)) {
+ $outputlangs=$langs;
+ }
// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
- if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
+ if (! empty($conf->global->MAIN_USE_FPDF)) {
+ $outputlangs->charset_output='ISO-8859-1';
+ }
- $outputlangs->load("main");
- $outputlangs->load("dict");
- $outputlangs->load("companies");
- $outputlangs->load("bills");
- $outputlangs->load("products");
+ $outputlangs->load("main");
+ $outputlangs->load("dict");
+ $outputlangs->load("companies");
+ $outputlangs->load("bills");
+ $outputlangs->load("products");
- $nblignes = count($object->lines);
+ $nblignes = count($object->lines);
// Loop on each lines to detect if there is at least one image to show
$realpatharray=array();
- if (! empty($conf->global->MAIN_GENERATE_INVOICES_WITH_PICTURE))
- {
- for ($i = 0 ; $i < $nblignes ; $i++)
- {
- if (empty($object->lines[$i]->fk_product)) continue;
-
- $objphoto = new Product($this->db);
- $objphoto->fetch($object->lines[$i]->fk_product);
-
- $pdir = get_exdir($object->lines[$i]->fk_product,2) . $object->lines[$i]->fk_product ."/photos/";
- $dir = $conf->product->dir_output.'/'.$pdir;
-
- $realpath='';
- foreach ($objphoto->liste_photos($dir,1) as $key => $obj)
- {
- $filename=$obj['photo'];
+ if (! empty($conf->global->MAIN_GENERATE_INVOICES_WITH_PICTURE)) {
+ for ($i = 0 ; $i < $nblignes ; $i++) {
+ if (empty($object->lines[$i]->fk_product)) {
+ continue;
+ }
+
+ $objphoto = new Product($this->db);
+ $objphoto->fetch($object->lines[$i]->fk_product);
+
+ $pdir = get_exdir($object->lines[$i]->fk_product, 2) . $object->lines[$i]->fk_product ."/photos/";
+ $dir = $conf->product->dir_output.'/'.$pdir;
+
+ $realpath='';
+ foreach ($objphoto->liste_photos($dir, 1) as $key => $obj) {
+ $filename=$obj['photo'];
//if ($obj['photo_vignette']) $filename='thumbs/'.$obj['photo_vignette'];
$realpath = $dir.$filename;
- break;
- }
+ break;
+ }
- if ($realpath) $realpatharray[$i]=$realpath;
- }
- }
- if (count($realpatharray) == 0) $this->posxpicture=$this->posxtva;
+ if ($realpath) {
+ $realpatharray[$i]=$realpath;
+ }
+ }
+ }
+ if (count($realpatharray) == 0) {
+ $this->posxpicture=$this->posxtva;
+ }
- if ($conf->facture->dir_output)
- {
- $object->fetch_thirdparty();
+ if ($conf->facture->dir_output) {
+ $object->fetch_thirdparty();
- $deja_regle = $object->getSommePaiement();
- $amount_credit_notes_included = $object->getSumCreditNotesUsed();
- $amount_deposits_included = $object->getSumDepositsUsed();
+ $deja_regle = $object->getSommePaiement();
+ $amount_credit_notes_included = $object->getSumCreditNotesUsed();
+ $amount_deposits_included = $object->getSumDepositsUsed();
// Definition of $dir and $file
- if ($object->specimen)
- {
- $dir = $conf->facture->dir_output;
- $file = $dir . "/SPECIMEN.pdf";
- }
- else
- {
- $objectref = dol_sanitizeFileName($object->ref);
- $dir = $conf->facture->dir_output . "/" . $objectref;
- $file = $dir . "/" . $objectref . ".pdf";
- }
- if (! file_exists($dir))
- {
- if (dol_mkdir($dir) < 0)
- {
- $this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
- return 0;
- }
+ if ($object->specimen) {
+ $dir = $conf->facture->dir_output;
+ $file = $dir . "/SPECIMEN.pdf";
+ } else {
+ $objectref = dol_sanitizeFileName($object->ref);
+ $dir = $conf->facture->dir_output . "/" . $objectref;
+ $file = $dir . "/" . $objectref . ".pdf";
}
-
- if (file_exists($dir))
- {
- // Add pdfgeneration hook
- if (! is_object($hookmanager))
- {
- include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
- $hookmanager=new HookManager($this->db);
+ if (! file_exists($dir)) {
+ if (dol_mkdir($dir) < 0) {
+ $this->error=$langs->transnoentities("ErrorCanNotCreateDir", $dir);
+ return 0;
+ }
+ }
+
+ if (file_exists($dir)) {
+ // Add pdfgeneration hook
+ if (! is_object($hookmanager)) {
+ include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+ $hookmanager=new HookManager($this->db);
}
- $hookmanager->initHooks(array('pdfgeneration'));
- $parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
- global $action;
- $reshook=$hookmanager->executeHooks('beforePDFCreation',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks
+ $hookmanager->initHooks(array('pdfgeneration'));
+ $parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+ global $action;
+ $reshook=$hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
// Create pdf instance
$pdf=pdf_getInstance($this->format);
- $default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
+ $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);
+ $pdf->SetAutoPageBreak(1, 0);
- if (class_exists('TCPDF'))
- {
- $pdf->setPrintHeader(false);
- $pdf->setPrintFooter(false);
- }
- $pdf->SetFont(pdf_getPDFFont($outputlangs));
+ if (class_exists('TCPDF')) {
+ $pdf->setPrintHeader(false);
+ $pdf->setPrintFooter(false);
+ }
+ $pdf->SetFont(pdf_getPDFFont($outputlangs));
// Set path to the background PDF File
- if (empty($conf->global->MAIN_DISABLE_FPDI) && ! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
- {
- $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
- $tplidx = $pdf->importPage(1);
+ if (empty($conf->global->MAIN_DISABLE_FPDI) && ! empty($conf->global->MAIN_ADD_PDF_BACKGROUND)) {
+ $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
+ $tplidx = $pdf->importPage(1);
}
- $pdf->Open();
- $pagenb=0;
- $pdf->SetDrawColor(128,128,128);
+ $pdf->Open();
+ $pagenb=0;
+ $pdf->SetDrawColor(128, 128, 128);
- $pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
- $pdf->SetSubject($outputlangs->transnoentities("Invoice"));
- $pdf->SetCreator("Dolibarr ".DOL_VERSION);
- $pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
- $pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Invoice"));
- if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+ $pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
+ $pdf->SetSubject($outputlangs->transnoentities("Invoice"));
+ $pdf->SetCreator("Dolibarr ".DOL_VERSION);
+ $pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
+ $pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Invoice"));
+ if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) {
+ $pdf->SetCompression(false);
+ }
- $pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
+ $pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
// Positionne $this->atleastonediscount si on a au moins une remise
- for ($i = 0 ; $i < $nblignes ; $i++)
- {
- if ($object->lines[$i]->remise_percent)
- {
- $this->atleastonediscount++;
- }
+ for ($i = 0 ; $i < $nblignes ; $i++) {
+ if ($object->lines[$i]->remise_percent) {
+ $this->atleastonediscount++;
+ }
}
- if (empty($this->atleastonediscount))
- {
- $this->posxpicture+=($this->postotalht - $this->posxdiscount);
- $this->posxtva+=($this->postotalht - $this->posxdiscount);
- $this->posxup+=($this->postotalht - $this->posxdiscount);
- $this->posxqty+=($this->postotalht - $this->posxdiscount);
- $this->posxdiscount+=($this->postotalht - $this->posxdiscount);
+ if (empty($this->atleastonediscount)) {
+ $this->posxpicture+=($this->postotalht - $this->posxdiscount);
+ $this->posxtva+=($this->postotalht - $this->posxdiscount);
+ $this->posxup+=($this->postotalht - $this->posxdiscount);
+ $this->posxqty+=($this->postotalht - $this->posxdiscount);
+ $this->posxdiscount+=($this->postotalht - $this->posxdiscount);
//$this->postotalht;
- }
+ }
// New page
$pdf->AddPage();
- if (! empty($tplidx)) $pdf->useTemplate($tplidx);
- $pagenb++;
+ if (! empty($tplidx)) {
+ $pdf->useTemplate($tplidx);
+ }
+ $pagenb++;
- $this->_pagehead($pdf, $object, 1, $outputlangs);
- $pdf->SetFont('','', $default_font_size - 1);
- $pdf->MultiCell(0, 3, ''); // Set interline to 3
- $pdf->SetTextColor(0,0,0);
+ $this->_pagehead($pdf, $object, 1, $outputlangs);
+ $pdf->SetFont('', '', $default_font_size - 1);
+ $pdf->MultiCell(0, 3, ''); // Set interline to 3
+ $pdf->SetTextColor(0, 0, 0);
- $tab_top = 90;
- $tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)?42:10);
- $tab_height = 130;
- $tab_height_newpage = 150;
+ $tab_top = 90;
+ $tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)?42:10);
+ $tab_height = 130;
+ $tab_height_newpage = 150;
// Affiche notes
$notetoshow=empty($object->note_public)?'':$object->note_public;
- if (! empty($conf->global->MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE))
- {
- // Get first sale rep
- if (is_object($object->thirdparty))
- {
- $salereparray=$object->thirdparty->getSalesRepresentatives($user);
- $salerepobj=new User($this->db);
- $salerepobj->fetch($salereparray[0]['id']);
- if (! empty($salerepobj->signature)) $notetoshow=dol_concatdesc($notetoshow, $salerepobj->signature);
+ if (! empty($conf->global->MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE)) {
+ // Get first sale rep
+ if (is_object($object->thirdparty)) {
+ $salereparray=$object->thirdparty->getSalesRepresentatives($user);
+ $salerepobj=new User($this->db);
+ $salerepobj->fetch($salereparray[0]['id']);
+ if (! empty($salerepobj->signature)) {
+ $notetoshow=dol_concatdesc($notetoshow, $salerepobj->signature);
+ }
}
- }
- if ($notetoshow)
- {
- $tab_top = 88;
+ }
+ if ($notetoshow) {
+ $tab_top = 88;
- $pdf->SetFont('','', $default_font_size - 1);
- $pdf->writeHTMLCell(190, 3, $this->posxdesc-1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
- $nexY = $pdf->GetY();
- $height_note=$nexY-$tab_top;
+ $pdf->SetFont('', '', $default_font_size - 1);
+ $pdf->writeHTMLCell(190, 3, $this->posxdesc-1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
+ $nexY = $pdf->GetY();
+ $height_note=$nexY-$tab_top;
// Rect prend une longueur en 3eme param
- $pdf->SetDrawColor(192,192,192);
- $pdf->Rect($this->marge_gauche, $tab_top-1, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_note+1);
-
- $tab_height = $tab_height - $height_note;
- $tab_top = $nexY+6;
- }
- else
- {
- $height_note=0;
- }
-
- $iniY = $tab_top + 7;
- $curY = $tab_top + 7;
- $nexY = $tab_top + 7;
-
- $inPackage = false;
- $TPackageInfos = array();
- $TChilds = array();
- $package_qty = 0;
- $TStack = array();
+ $pdf->SetDrawColor(192, 192, 192);
+ $pdf->Rect($this->marge_gauche, $tab_top-1, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_note+1);
+
+ $tab_height = $tab_height - $height_note;
+ $tab_top = $nexY+6;
+ } else {
+ $height_note=0;
+ }
+
+ $iniY = $tab_top + 7;
+ $curY = $tab_top + 7;
+ $nexY = $tab_top + 7;
+
+ $inPackage = false;
+ $TPackageInfos = array();
+ $TChilds = array();
+ $package_qty = 0;
+ $TStack = array();
// Loop on each lines
- for ($i = 0; $i < $nblignes; $i++)
- {
- $package_qty = $TStack[count($TStack) - 1]['package_qty'];
- $inPackage = count($TStack) > 0;
+ for ($i = 0; $i < $nblignes; $i++) {
+ $package_qty = $TStack[count($TStack) - 1]['package_qty'];
+ $inPackage = count($TStack) > 0;
// Ligne de titre
if ($object->lines[$i]->product_type == 9 && $object->lines[$i]->qty < 97) {
- $inPackage = true;
+ $inPackage = true;
- if ($conf->global->SUBTOTAL_SHOW_QTY_ON_TITLES) {
- if (!empty($object->lines[$i]->fk_product)) {
- $product = new Product($db);
- $product->fetch($object->lines[$i]->fk_product);
+ if ($conf->global->SUBTOTAL_SHOW_QTY_ON_TITLES) {
+ if (!empty($object->lines[$i]->fk_product)) {
+ $product = new Product($db);
+ $product->fetch($object->lines[$i]->fk_product);
- $TChilds = $product->getChildsArbo($product->id);
+ $TChilds = $product->getChildsArbo($product->id);
- $TStack[count($TStack)] = array(
+ $TStack[count($TStack)] = array(
'childs' => $TChilds,
'package' => array(),
'package_qty' => 0
@@ -363,336 +362,353 @@ function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hid
// Si on se trouvait déjà dans un package, on rajoute ce produit à la liste des produits
// du précédent package
if (count($TStack) > 1) {
- $TStack[count($TStack) - 2]['package'][$object->lines[$i]->fk_product] += $object->lines[$i]->qty;
+ $TStack[count($TStack) - 2]['package'][$object->lines[$i]->fk_product] += $object->lines[$i]->qty;
}
- }
- }
+ }
+ }
}
- if ($conf->global->SUBTOTAL_SHOW_QTY_ON_TITLES) {
- if ($inPackage && $object->lines[$i]->product_type != 9 && $object->lines[$i]->fk_product > 0) {
- $TStack[count($TStack) - 1]['package'][$object->lines[$i]->fk_product] += $object->lines[$i]->qty;
- }
- }
+ if ($conf->global->SUBTOTAL_SHOW_QTY_ON_TITLES) {
+ if ($inPackage && $object->lines[$i]->product_type != 9 && $object->lines[$i]->fk_product > 0) {
+ $TStack[count($TStack) - 1]['package'][$object->lines[$i]->fk_product] += $object->lines[$i]->qty;
+ }
+ }
- if ($inPackage && $object->lines[$i]->product_type == 9 && $object->lines[$i]->qty >= 97) {
- if (count($TStack) <= 1) {
- $inPackage = false;
- }
+ if ($inPackage && $object->lines[$i]->product_type == 9 && $object->lines[$i]->qty >= 97) {
+ if (count($TStack) <= 1) {
+ $inPackage = false;
+ }
- if ($conf->global->SUBTOTAL_SHOW_QTY_ON_TITLES) {
- // Comparaison pour déterminer la quantité de package
+ if ($conf->global->SUBTOTAL_SHOW_QTY_ON_TITLES) {
+ // Comparaison pour déterminer la quantité de package
$TProducts = array_keys($TStack[count($TStack) - 1]['package']);
- $TProductsChilds = array_keys($TStack[count($TStack) - 1]['childs']);
+ $TProductsChilds = array_keys($TStack[count($TStack) - 1]['childs']);
- if ($TProductsChilds == $TProducts) {
- // Il s'agit d'un package
+ if ($TProductsChilds == $TProducts) {
+ // Il s'agit d'un package
// On récupére la quantité
$first_child_id = $TProducts[0];
- $document_qty = $TStack[count($TStack) - 1]['package'][$first_child_id];
- $base_qty = $TStack[count($TStack) - 1]['childs'][$first_child_id][1];
+ $document_qty = $TStack[count($TStack) - 1]['package'][$first_child_id];
+ $base_qty = $TStack[count($TStack) - 1]['childs'][$first_child_id][1];
- $TStack[count($TStack) - 1]['package_qty'] = $document_qty / $base_qty;
- $package_qty = $TStack[count($TStack) - 1]['package_qty'];
- }
+ $TStack[count($TStack) - 1]['package_qty'] = $document_qty / $base_qty;
+ $package_qty = $TStack[count($TStack) - 1]['package_qty'];
+ }
- array_pop($TStack);
- }
- }
+ array_pop($TStack);
+ }
+ }
- $curY = $nexY;
- $pdf->SetFont('','', $default_font_size - 1); // Into loop to work with multipage
- $pdf->SetTextColor(0,0,0);
+ $curY = $nexY;
+ $pdf->SetFont('', '', $default_font_size - 1); // Into loop to work with multipage
+ $pdf->SetTextColor(0, 0, 0);
// Define size of image if we need it
$imglinesize=array();
- if (! empty($realpatharray[$i])) $imglinesize=pdf_getSizeForImage($realpatharray[$i]);
+ if (! empty($realpatharray[$i])) {
+ $imglinesize=pdf_getSizeForImage($realpatharray[$i]);
+ }
- $pdf->setTopMargin($tab_top_newpage);
- $pdf->setPageOrientation('', 1, $heightforfooter+$heightforfreetext+$heightforinfotot); // The only function to edit the bottom margin of current page to set it.
+ $pdf->setTopMargin($tab_top_newpage);
+ $pdf->setPageOrientation('', 1, $heightforfooter+$heightforfreetext+$heightforinfotot); // The only function to edit the bottom margin of current page to set it.
$pageposbefore=$pdf->getPage();
- $showpricebeforepagebreak=1;
- $posYAfterImage=0;
- $posYAfterDescription=0;
+ $showpricebeforepagebreak=1;
+ $posYAfterImage=0;
+ $posYAfterDescription=0;
// We start with Photo of product line
- if (isset($imglinesize['width']) && isset($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur-($heightforfooter+$heightforfreetext+$heightforinfotot))) // If photo too high, we moved completely on new page
- {
- $pdf->AddPage('','',true);
- if (! empty($tplidx)) $pdf->useTemplate($tplidx);
- if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
- $pdf->setPage($pageposbefore+1);
-
- $curY = $tab_top_newpage;
- $showpricebeforepagebreak=0;
+ if (isset($imglinesize['width']) && isset($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur-($heightforfooter+$heightforfreetext+$heightforinfotot))) {
+ // If photo too high, we moved completely on new page
+
+ $pdf->AddPage('', '', true);
+ if (! empty($tplidx)) {
+ $pdf->useTemplate($tplidx);
+ }
+ if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+ $this->_pagehead($pdf, $object, 0, $outputlangs);
+ }
+ $pdf->setPage($pageposbefore+1);
+
+ $curY = $tab_top_newpage;
+ $showpricebeforepagebreak=0;
}
- if (isset($imglinesize['width']) && isset($imglinesize['height']))
- {
- $curX = $this->posxpicture-1;
- $pdf->Image($realpatharray[$i], $curX + (($this->posxtva-$this->posxpicture-$imglinesize['width'])/2), $curY, $imglinesize['width'], $imglinesize['height'], '', '', '', 2, 300); // Use 300 dpi
+ if (isset($imglinesize['width']) && isset($imglinesize['height'])) {
+ $curX = $this->posxpicture-1;
+ $pdf->Image($realpatharray[$i], $curX + (($this->posxtva-$this->posxpicture-$imglinesize['width'])/2), $curY, $imglinesize['width'], $imglinesize['height'], '', '', '', 2, 300); // Use 300 dpi
// $pdf->Image does not increase value return by getY, so we save it manually
$posYAfterImage=$curY+$imglinesize['height'];
- }
+ }
// Description of product line
$curX = $this->posxdesc-1;
- $pdf->startTransaction();
- pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxpicture-$curX,3,$curX,$curY,$hideref,$hidedesc);
- $pageposafter=$pdf->getPage();
- if ($pageposafter > $pageposbefore) // There is a pagebreak
- {
+ $pdf->startTransaction();
+ pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->posxpicture-$curX, 3, $curX, $curY, $hideref, $hidedesc);
+ $pageposafter=$pdf->getPage();
+ if ($pageposafter > $pageposbefore) {
+ // There is a pagebreak
+
$pdf->rollbackTransaction(true);
- $pageposafter=$pageposbefore;
+ $pageposafter=$pageposbefore;
//print $pageposafter.'-'.$pageposbefore;exit;
$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
- pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxpicture-$curX,3,$curX,$curY,$hideref,$hidedesc);
- $pageposafter=$pdf->getPage();
- $posyafter=$pdf->GetY();
+ pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->posxpicture-$curX, 3, $curX, $curY, $hideref, $hidedesc);
+ $pageposafter=$pdf->getPage();
+ $posyafter=$pdf->GetY();
//var_dump($posyafter); var_dump(($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))); exit;
- if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))) // There is no space left for total+free text
- {
- if ($i == ($nblignes-1)) // No more lines, and no space left to show total, so we create a new page
- {
- $pdf->AddPage('','',true);
- if (! empty($tplidx)) $pdf->useTemplate($tplidx);
- if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
- $pdf->setPage($pageposafter+1);
+ if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))) {
+ // There is no space left for total+free text
+
+ if ($i == ($nblignes-1)) {
+ // No more lines, and no space left to show total, so we create a new page
+
+ $pdf->AddPage('', '', true);
+ if (! empty($tplidx)) {
+ $pdf->useTemplate($tplidx);
+ }
+ if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+ $this->_pagehead($pdf, $object, 0, $outputlangs);
+ }
+ $pdf->setPage($pageposafter+1);
}
- }
- else
- {
- // We found a page break
+ } else {
+ // We found a page break
$showpricebeforepagebreak=0;
}
- }
- else // No pagebreak
- {
+ } else {
+ // No pagebreak
+
$pdf->commitTransaction();
- }
- $posYAfterDescription=$pdf->GetY();
+ }
+ $posYAfterDescription=$pdf->GetY();
- $nexY = $pdf->GetY();
- $pageposafter=$pdf->getPage();
- $pdf->setPage($pageposbefore);
- $pdf->setTopMargin($this->marge_haute);
- $pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+ $nexY = $pdf->GetY();
+ $pageposafter=$pdf->getPage();
+ $pdf->setPage($pageposbefore);
+ $pdf->setTopMargin($this->marge_haute);
+ $pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
// We suppose that a too long description or photo were moved completely on next page
if ($pageposafter > $pageposbefore && empty($showpricebeforepagebreak)) {
- $pdf->setPage($pageposafter); $curY = $tab_top_newpage;
+ $pdf->setPage($pageposafter);
+ $curY = $tab_top_newpage;
}
- $pdf->SetFont('','', $default_font_size - 1); // On repositionne la police par defaut
+ $pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par defaut
// VAT Rate
- if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
- {
- // Si on ne doit masquer que les sous-produits
+ if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) {
+ // Si on ne doit masquer que les sous-produits
if ($hidedetails && !$inPackage && $conf->global->SUBTOTAL_ONLY_HIDE_SUBPRODUCTS_PRICES) {
- $vat_rate = pdf_getlinevatrate($object, $i, $outputlangs, 0);
+ $vat_rate = pdf_getlinevatrate($object, $i, $outputlangs, 0);
} else {
- $vat_rate = pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails);
+ $vat_rate = pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails);
}
- $pdf->SetXY($this->posxtva, $curY);
- $pdf->MultiCell($this->posxup-$this->posxtva-0.8, 3, $vat_rate, 0, 'R');
+ $pdf->SetXY($this->posxtva, $curY);
+ $pdf->MultiCell($this->posxup-$this->posxtva-0.8, 3, $vat_rate, 0, 'R');
}
// Unit price before discount
if ($hidedetails && !$inPackage && $conf->global->SUBTOTAL_ONLY_HIDE_SUBPRODUCTS_PRICES) {
- $up_excl_tax = pdf_getlineupexcltax($object, $i, $outputlangs, 0);
+ $up_excl_tax = pdf_getlineupexcltax($object, $i, $outputlangs, 0);
} else {
- $up_excl_tax = pdf_getlineupexcltax($object, $i, $outputlangs, $hidedetails);
+ $up_excl_tax = pdf_getlineupexcltax($object, $i, $outputlangs, $hidedetails);
}
- $pdf->SetXY($this->posxup, $curY);
- $pdf->MultiCell($this->posxqty-$this->posxup-0.8, 3, $up_excl_tax, 0, 'R', 0);
+ $pdf->SetXY($this->posxup, $curY);
+ $pdf->MultiCell($this->posxqty-$this->posxup-0.8, 3, $up_excl_tax, 0, 'R', 0);
// Quantity
// Affichage de la quantité sur les lignes de total si la conf l'indique
// Récupération de la quantité à afficher
if ($conf->global->SUBTOTAL_IF_HIDE_PRICES_SHOW_QTY && $hidedetails) {
- if ($conf->global->SUBTOTAL_SHOW_QTY_ON_TITLES && $package_qty > 0) {
- $qty = $package_qty;
- } else {
- $qty = pdf_getlineqty($object, $i, $outputlangs, 0);
- }
+ if ($conf->global->SUBTOTAL_SHOW_QTY_ON_TITLES && $package_qty > 0) {
+ $qty = $package_qty;
+ } else {
+ $qty = pdf_getlineqty($object, $i, $outputlangs, 0);
+ }
} else {
- if ($conf->global->SUBTOTAL_SHOW_QTY_ON_TITLES && $package_qty > 0) {
- $qty = $package_qty;
- } else {
- $qty = pdf_getlineqty($object, $i, $outputlangs, $hidedetails);
- }
+ if ($conf->global->SUBTOTAL_SHOW_QTY_ON_TITLES && $package_qty > 0) {
+ $qty = $package_qty;
+ } else {
+ $qty = pdf_getlineqty($object, $i, $outputlangs, $hidedetails);
+ }
}
- $pdf->SetXY($this->posxqty, $curY);
- $pdf->MultiCell($this->posxdiscount-$this->posxqty-0.8, 3, $qty, 0, 'R'); // Enough for 6 chars
+ $pdf->SetXY($this->posxqty, $curY);
+ $pdf->MultiCell($this->posxdiscount-$this->posxqty-0.8, 3, $qty, 0, 'R'); // Enough for 6 chars
// Discount on line
- if ($object->lines[$i]->remise_percent)
- {
- $pdf->SetXY($this->posxdiscount-2, $curY);
+ if ($object->lines[$i]->remise_percent) {
+ $pdf->SetXY($this->posxdiscount-2, $curY);
$remise_percent = pdf_getlineremisepercent($object, $i, $outputlangs, $hidedetails);
- $pdf->MultiCell($this->postotalht-$this->posxdiscount+2, 3, $remise_percent, 0, 'R');
+ $pdf->MultiCell($this->postotalht-$this->posxdiscount+2, 3, $remise_percent, 0, 'R');
}
// Total HT line
if ($hidedetails && !$inPackage && $conf->global->SUBTOTAL_ONLY_HIDE_SUBPRODUCTS_PRICES) {
- $total_excl_tax = pdf_getlinetotalexcltax($object, $i, $outputlangs, 0);
+ $total_excl_tax = pdf_getlinetotalexcltax($object, $i, $outputlangs, 0);
} else {
- $total_excl_tax = pdf_getlinetotalexcltax($object, $i, $outputlangs, $hidedetails);
+ $total_excl_tax = pdf_getlinetotalexcltax($object, $i, $outputlangs, $hidedetails);
}
- $pdf->SetXY($this->postotalht, $curY);
- $pdf->MultiCell($this->page_largeur-$this->marge_droite-$this->postotalht, 3, $total_excl_tax, 0, 'R', 0);
+ $pdf->SetXY($this->postotalht, $curY);
+ $pdf->MultiCell($this->page_largeur-$this->marge_droite-$this->postotalht, 3, $total_excl_tax, 0, 'R', 0);
// Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva
$tvaligne=$object->lines[$i]->total_tva;
- $localtax1ligne=$object->lines[$i]->total_localtax1;
- $localtax2ligne=$object->lines[$i]->total_localtax2;
- $localtax1_rate=$object->lines[$i]->localtax1_tx;
- $localtax2_rate=$object->lines[$i]->localtax2_tx;
- $localtax1_type=$object->lines[$i]->localtax1_type;
- $localtax2_type=$object->lines[$i]->localtax2_type;
-
- if ($object->remise_percent) $tvaligne-=($tvaligne*$object->remise_percent)/100;
- if ($object->remise_percent) $localtax1ligne-=($localtax1ligne*$object->remise_percent)/100;
- if ($object->remise_percent) $localtax2ligne-=($localtax2ligne*$object->remise_percent)/100;
-
- $vatrate=(string) $object->lines[$i]->tva_tx;
+ $localtax1ligne=$object->lines[$i]->total_localtax1;
+ $localtax2ligne=$object->lines[$i]->total_localtax2;
+ $localtax1_rate=$object->lines[$i]->localtax1_tx;
+ $localtax2_rate=$object->lines[$i]->localtax2_tx;
+ $localtax1_type=$object->lines[$i]->localtax1_type;
+ $localtax2_type=$object->lines[$i]->localtax2_type;
+
+ if ($object->remise_percent) {
+ $tvaligne-=($tvaligne*$object->remise_percent)/100;
+ }
+ if ($object->remise_percent) {
+ $localtax1ligne-=($localtax1ligne*$object->remise_percent)/100;
+ }
+ if ($object->remise_percent) {
+ $localtax2ligne-=($localtax2ligne*$object->remise_percent)/100;
+ }
+
+ $vatrate=(string) $object->lines[$i]->tva_tx;
// Retrieve type from database for backward compatibility with old records
if ((! isset($localtax1_type) || $localtax1_type=='' || ! isset($localtax2_type) || $localtax2_type=='') // if tax type not defined
- && (! empty($localtax1_rate) || ! empty($localtax2_rate))) // and there is local tax
- {
- $localtaxtmp_array=getLocalTaxesFromRate($vatrate,0, $object->thirdparty, $mysoc);
- $localtax1_type = $localtaxtmp_array[0];
- $localtax2_type = $localtaxtmp_array[2];
+ && (! empty($localtax1_rate) || ! empty($localtax2_rate))) {
+ // and there is local tax
+
+ $localtaxtmp_array=getLocalTaxesFromRate($vatrate, 0, $object->thirdparty, $mysoc);
+ $localtax1_type = $localtaxtmp_array[0];
+ $localtax2_type = $localtaxtmp_array[2];
}
// retrieve global local tax
- if ($localtax1_type && $localtax1ligne != 0)
- $this->localtax1[$localtax1_type][$localtax1_rate]+=$localtax1ligne;
- if ($localtax2_type && $localtax2ligne != 0)
- $this->localtax2[$localtax2_type][$localtax2_rate]+=$localtax2ligne;
-
- if (($object->lines[$i]->info_bits & 0x01) == 0x01) $vatrate.='*';
- if (! isset($this->tva[$vatrate])) $this->tva[$vatrate]='';
- $this->tva[$vatrate] += $tvaligne;
-
- if ($posYAfterImage > $posYAfterDescription) $nexY=$posYAfterImage;
+ if ($localtax1_type && $localtax1ligne != 0) {
+ $this->localtax1[$localtax1_type][$localtax1_rate]+=$localtax1ligne;
+ }
+ if ($localtax2_type && $localtax2ligne != 0) {
+ $this->localtax2[$localtax2_type][$localtax2_rate]+=$localtax2ligne;
+ }
+
+ if (($object->lines[$i]->info_bits & 0x01) == 0x01) {
+ $vatrate.='*';
+ }
+ if (! isset($this->tva[$vatrate])) {
+ $this->tva[$vatrate]='';
+ }
+ $this->tva[$vatrate] += $tvaligne;
+
+ if ($posYAfterImage > $posYAfterDescription) {
+ $nexY=$posYAfterImage;
+ }
// Add line
- if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
- {
- $pdf->setPage($pageposafter);
- $pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(210,210,210)));
+ if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1)) {
+ $pdf->setPage($pageposafter);
+ $pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(210,210,210)));
//$pdf->SetDrawColor(190,190,200);
$pdf->line($this->marge_gauche, $nexY+1, $this->page_largeur - $this->marge_droite, $nexY+1);
- $pdf->SetLineStyle(array('dash'=>0));
+ $pdf->SetLineStyle(array('dash'=>0));
}
- $nexY+=2; // Passe espace entre les lignes
+ $nexY+=2; // Passe espace entre les lignes
// Detect if some page were added automatically and output _tableau for past pages
- while ($pagenb < $pageposafter)
- {
- $pdf->setPage($pagenb);
- if ($pagenb == 1)
- {
- $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
+ while ($pagenb < $pageposafter) {
+ $pdf->setPage($pagenb);
+ if ($pagenb == 1) {
+ $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
+ } else {
+ $this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
+ }
+ $this->_pagefoot($pdf, $object, $outputlangs, 1);
+ $pagenb++;
+ $pdf->setPage($pagenb);
+ $pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+ if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+ $this->_pagehead($pdf, $object, 0, $outputlangs);
}
- else
- {
- $this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
- }
- $this->_pagefoot($pdf,$object,$outputlangs,1);
- $pagenb++;
- $pdf->setPage($pagenb);
- $pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
- if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
}
- if (isset($object->lines[$i+1]->pagebreak) && $object->lines[$i+1]->pagebreak)
- {
- if ($pagenb == 1)
- {
- $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
- }
- else
- {
- $this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
- }
- $this->_pagefoot($pdf,$object,$outputlangs,1);
+ if (isset($object->lines[$i+1]->pagebreak) && $object->lines[$i+1]->pagebreak) {
+ if ($pagenb == 1) {
+ $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
+ } else {
+ $this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
+ }
+ $this->_pagefoot($pdf, $object, $outputlangs, 1);
// New page
$pdf->AddPage();
- if (! empty($tplidx)) $pdf->useTemplate($tplidx);
- $pagenb++;
- if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
- }
+ if (! empty($tplidx)) {
+ $pdf->useTemplate($tplidx);
+ }
+ $pagenb++;
+ if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+ $this->_pagehead($pdf, $object, 0, $outputlangs);
+ }
+ }
}
// Show square
- if ($pagenb == 1)
- {
- $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
- $bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
- }
- else
- {
- $this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
- $bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
+ if ($pagenb == 1) {
+ $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
+ $bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
+ } else {
+ $this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
+ $bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
}
// Affiche zone infos
$posy=$this->_tableau_info($pdf, $object, $bottomlasttab, $outputlangs);
- if (!$conf->global->SUBTOTAL_HIDE_DOCUMENT_TOTAL) {
- // Affiche zone totaux
+ if (!$conf->global->SUBTOTAL_HIDE_DOCUMENT_TOTAL) {
+ // Affiche zone totaux
$posy=$this->_tableau_tot($pdf, $object, $deja_regle, $bottomlasttab, $outputlangs);
- }
+ }
// Affiche zone versements
- if ($deja_regle || $amount_credit_notes_included || $amount_deposits_included)
- {
- $posy=$this->_tableau_versements($pdf, $object, $posy, $outputlangs);
+ if ($deja_regle || $amount_credit_notes_included || $amount_deposits_included) {
+ $posy=$this->_tableau_versements($pdf, $object, $posy, $outputlangs);
}
// Pied de page
- $this->_pagefoot($pdf,$object,$outputlangs);
- if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
+ $this->_pagefoot($pdf, $object, $outputlangs);
+ if (method_exists($pdf, 'AliasNbPages')) {
+ $pdf->AliasNbPages();
+ }
- $pdf->Close();
+ $pdf->Close();
- $pdf->Output($file,'F');
+ $pdf->Output($file, 'F');
// Add pdfgeneration hook
$hookmanager->initHooks(array('pdfgeneration'));
- $parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
- global $action;
- $reshook=$hookmanager->executeHooks('afterPDFCreation',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks
+ $parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+ global $action;
+ $reshook=$hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
- if (! empty($conf->global->MAIN_UMASK))
- @chmod($file, octdec($conf->global->MAIN_UMASK));
+ if (! empty($conf->global->MAIN_UMASK)) {
+ @chmod($file, octdec($conf->global->MAIN_UMASK));
+ }
- return 1; // Pas d'erreur
- }
- else
- {
- $this->error=$langs->trans("ErrorCanNotCreateDir",$dir);
- return 0;
- }
- }
- else
- {
- $this->error=$langs->trans("ErrorConstantNotDefined","FAC_OUTPUTDIR");
- return 0;
- }
- $this->error=$langs->trans("ErrorUnknown");
- return 0; // Erreur par defaut
+ return 1; // Pas d'erreur
+ } else {
+ $this->error=$langs->trans("ErrorCanNotCreateDir", $dir);
+ return 0;
+ }
+ } else {
+ $this->error=$langs->trans("ErrorConstantNotDefined", "FAC_OUTPUTDIR");
+ return 0;
+ }
+ $this->error=$langs->trans("ErrorUnknown");
+ return 0; // Erreur par defaut
}
@@ -705,130 +721,131 @@ function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hid
* @param Translate $outputlangs Object langs for output
* @return int <0 if KO, >0 if OK
*/
- function _tableau_versements(&$pdf, $object, $posy, $outputlangs)
+ public function _tableau_versements(&$pdf, $object, $posy, $outputlangs)
{
- global $conf;
+ global $conf;
+
+ $sign=1;
+ if ($object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) {
+ $sign=-1;
+ }
- $sign=1;
- if ($object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1;
+ $tab3_posx = 120;
+ $tab3_top = $posy + 8;
+ $tab3_width = 80;
+ $tab3_height = 4;
+ if ($this->page_largeur < 210) {
+ // To work with US executive format
- $tab3_posx = 120;
- $tab3_top = $posy + 8;
- $tab3_width = 80;
- $tab3_height = 4;
- if ($this->page_largeur < 210) // To work with US executive format
- {
$tab3_posx -= 20;
- }
+ }
- $default_font_size = pdf_getPDFFontSize($outputlangs);
+ $default_font_size = pdf_getPDFFontSize($outputlangs);
- $title=$outputlangs->transnoentities("PaymentsAlreadyDone");
- if ($object->type == 2) $title=$outputlangs->transnoentities("PaymentsBackAlreadyDone");
+ $title=$outputlangs->transnoentities("PaymentsAlreadyDone");
+ if ($object->type == 2) {
+ $title=$outputlangs->transnoentities("PaymentsBackAlreadyDone");
+ }
- $pdf->SetFont('','', $default_font_size - 3);
- $pdf->SetXY($tab3_posx, $tab3_top - 4);
- $pdf->MultiCell(60, 3, $title, 0, 'L', 0);
+ $pdf->SetFont('', '', $default_font_size - 3);
+ $pdf->SetXY($tab3_posx, $tab3_top - 4);
+ $pdf->MultiCell(60, 3, $title, 0, 'L', 0);
- $pdf->line($tab3_posx, $tab3_top, $tab3_posx+$tab3_width, $tab3_top);
+ $pdf->line($tab3_posx, $tab3_top, $tab3_posx+$tab3_width, $tab3_top);
- $pdf->SetFont('','', $default_font_size - 4);
- $pdf->SetXY($tab3_posx, $tab3_top);
- $pdf->MultiCell(20, 3, $outputlangs->transnoentities("Payment"), 0, 'L', 0);
- $pdf->SetXY($tab3_posx+21, $tab3_top);
- $pdf->MultiCell(20, 3, $outputlangs->transnoentities("Amount"), 0, 'L', 0);
- $pdf->SetXY($tab3_posx+40, $tab3_top);
- $pdf->MultiCell(20, 3, $outputlangs->transnoentities("Type"), 0, 'L', 0);
- $pdf->SetXY($tab3_posx+58, $tab3_top);
- $pdf->MultiCell(20, 3, $outputlangs->transnoentities("Num"), 0, 'L', 0);
+ $pdf->SetFont('', '', $default_font_size - 4);
+ $pdf->SetXY($tab3_posx, $tab3_top);
+ $pdf->MultiCell(20, 3, $outputlangs->transnoentities("Payment"), 0, 'L', 0);
+ $pdf->SetXY($tab3_posx+21, $tab3_top);
+ $pdf->MultiCell(20, 3, $outputlangs->transnoentities("Amount"), 0, 'L', 0);
+ $pdf->SetXY($tab3_posx+40, $tab3_top);
+ $pdf->MultiCell(20, 3, $outputlangs->transnoentities("Type"), 0, 'L', 0);
+ $pdf->SetXY($tab3_posx+58, $tab3_top);
+ $pdf->MultiCell(20, 3, $outputlangs->transnoentities("Num"), 0, 'L', 0);
- $pdf->line($tab3_posx, $tab3_top-1+$tab3_height, $tab3_posx+$tab3_width, $tab3_top-1+$tab3_height);
+ $pdf->line($tab3_posx, $tab3_top-1+$tab3_height, $tab3_posx+$tab3_width, $tab3_top-1+$tab3_height);
- $y=0;
+ $y=0;
- $pdf->SetFont('','', $default_font_size - 4);
+ $pdf->SetFont('', '', $default_font_size - 4);
// Loop on each deposits and credit notes included
$sql = "SELECT re.rowid, re.amount_ht, re.amount_tva, re.amount_ttc,";
- $sql.= " re.description, re.fk_facture_source,";
- $sql.= " f.type, f.datef";
- $sql.= " FROM ".MAIN_DB_PREFIX ."societe_remise_except as re, ".MAIN_DB_PREFIX ."facture as f";
- $sql.= " WHERE re.fk_facture_source = f.rowid AND re.fk_facture = ".$object->id;
- $resql=$this->db->query($sql);
- if ($resql)
- {
- $num = $this->db->num_rows($resql);
- $i=0;
- $invoice=new Facture($this->db);
- while ($i < $num)
- {
- $y+=3;
- $obj = $this->db->fetch_object($resql);
-
- if ($obj->type == 2) $text=$outputlangs->trans("CreditNote");
- elseif ($obj->type == 3) $text=$outputlangs->trans("Deposit");
- else $text=$outputlangs->trans("UnknownType");
-
- $invoice->fetch($obj->fk_facture_source);
-
- $pdf->SetXY($tab3_posx, $tab3_top+$y);
- $pdf->MultiCell(20, 3, dol_print_date($obj->datef,'day',false,$outputlangs,true), 0, 'L', 0);
- $pdf->SetXY($tab3_posx+21, $tab3_top+$y);
- $pdf->MultiCell(20, 3, price($obj->amount_ttc, 0, $outputlangs), 0, 'L', 0);
- $pdf->SetXY($tab3_posx+40, $tab3_top+$y);
- $pdf->MultiCell(20, 3, $text, 0, 'L', 0);
- $pdf->SetXY($tab3_posx+58, $tab3_top+$y);
- $pdf->MultiCell(20, 3, $invoice->ref, 0, 'L', 0);
-
- $pdf->line($tab3_posx, $tab3_top+$y+3, $tab3_posx+$tab3_width, $tab3_top+$y+3);
-
- $i++;
- }
- }
- else
- {
- $this->error=$this->db->lasterror();
- return -1;
- }
+ $sql.= " re.description, re.fk_facture_source,";
+ $sql.= " f.type, f.datef";
+ $sql.= " FROM ".MAIN_DB_PREFIX ."societe_remise_except as re, ".MAIN_DB_PREFIX ."facture as f";
+ $sql.= " WHERE re.fk_facture_source = f.rowid AND re.fk_facture = ".$object->id;
+ $resql=$this->db->query($sql);
+ if ($resql) {
+ $num = $this->db->num_rows($resql);
+ $i=0;
+ $invoice=new Facture($this->db);
+ while ($i < $num) {
+ $y+=3;
+ $obj = $this->db->fetch_object($resql);
+
+ if ($obj->type == 2) {
+ $text=$outputlangs->trans("CreditNote");
+ } elseif ($obj->type == 3) {
+ $text=$outputlangs->trans("Deposit");
+ } else {
+ $text=$outputlangs->trans("UnknownType");
+ }
+
+ $invoice->fetch($obj->fk_facture_source);
+
+ $pdf->SetXY($tab3_posx, $tab3_top+$y);
+ $pdf->MultiCell(20, 3, dol_print_date($obj->datef, 'day', false, $outputlangs, true), 0, 'L', 0);
+ $pdf->SetXY($tab3_posx+21, $tab3_top+$y);
+ $pdf->MultiCell(20, 3, price($obj->amount_ttc, 0, $outputlangs), 0, 'L', 0);
+ $pdf->SetXY($tab3_posx+40, $tab3_top+$y);
+ $pdf->MultiCell(20, 3, $text, 0, 'L', 0);
+ $pdf->SetXY($tab3_posx+58, $tab3_top+$y);
+ $pdf->MultiCell(20, 3, $invoice->ref, 0, 'L', 0);
+
+ $pdf->line($tab3_posx, $tab3_top+$y+3, $tab3_posx+$tab3_width, $tab3_top+$y+3);
+
+ $i++;
+ }
+ } else {
+ $this->error=$this->db->lasterror();
+ return -1;
+ }
// Loop on each payment
$sql = "SELECT p.datep as date, p.fk_paiement as type, p.num_paiement as num, pf.amount as amount,";
- $sql.= " cp.code";
- $sql.= " FROM ".MAIN_DB_PREFIX."paiement_facture as pf, ".MAIN_DB_PREFIX."paiement as p";
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as cp ON p.fk_paiement = cp.id";
- $sql.= " WHERE pf.fk_paiement = p.rowid AND pf.fk_facture = ".$object->id;
- $sql.= " ORDER BY p.datep";
- $resql=$this->db->query($sql);
- if ($resql)
- {
- $num = $this->db->num_rows($resql);
- $i=0;
- while ($i < $num) {
- $y+=3;
- $row = $this->db->fetch_object($resql);
-
- $pdf->SetXY($tab3_posx, $tab3_top+$y);
- $pdf->MultiCell(20, 3, dol_print_date($this->db->jdate($row->date),'day',false,$outputlangs,true), 0, 'L', 0);
- $pdf->SetXY($tab3_posx+21, $tab3_top+$y);
- $pdf->MultiCell(20, 3, price($sign * $row->amount, 0, $outputlangs), 0, 'L', 0);
- $pdf->SetXY($tab3_posx+40, $tab3_top+$y);
- $oper = $outputlangs->transnoentitiesnoconv("PaymentTypeShort" . $row->code);
-
- $pdf->MultiCell(20, 3, $oper, 0, 'L', 0);
- $pdf->SetXY($tab3_posx+58, $tab3_top+$y);
- $pdf->MultiCell(30, 3, $row->num, 0, 'L', 0);
-
- $pdf->line($tab3_posx, $tab3_top+$y+3, $tab3_posx+$tab3_width, $tab3_top+$y+3);
-
- $i++;
- }
- }
- else
- {
- $this->error=$this->db->lasterror();
- return -1;
- }
-
+ $sql.= " cp.code";
+ $sql.= " FROM ".MAIN_DB_PREFIX."paiement_facture as pf, ".MAIN_DB_PREFIX."paiement as p";
+ $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as cp ON p.fk_paiement = cp.id";
+ $sql.= " WHERE pf.fk_paiement = p.rowid AND pf.fk_facture = ".$object->id;
+ $sql.= " ORDER BY p.datep";
+ $resql=$this->db->query($sql);
+ if ($resql) {
+ $num = $this->db->num_rows($resql);
+ $i=0;
+ while ($i < $num) {
+ $y+=3;
+ $row = $this->db->fetch_object($resql);
+
+ $pdf->SetXY($tab3_posx, $tab3_top+$y);
+ $pdf->MultiCell(20, 3, dol_print_date($this->db->jdate($row->date), 'day', false, $outputlangs, true), 0, 'L', 0);
+ $pdf->SetXY($tab3_posx+21, $tab3_top+$y);
+ $pdf->MultiCell(20, 3, price($sign * $row->amount, 0, $outputlangs), 0, 'L', 0);
+ $pdf->SetXY($tab3_posx+40, $tab3_top+$y);
+ $oper = $outputlangs->transnoentitiesnoconv("PaymentTypeShort" . $row->code);
+
+ $pdf->MultiCell(20, 3, $oper, 0, 'L', 0);
+ $pdf->SetXY($tab3_posx+58, $tab3_top+$y);
+ $pdf->MultiCell(30, 3, $row->num, 0, 'L', 0);
+
+ $pdf->line($tab3_posx, $tab3_top+$y+3, $tab3_posx+$tab3_width, $tab3_top+$y+3);
+
+ $i++;
+ }
+ } else {
+ $this->error=$this->db->lasterror();
+ return -1;
+ }
}
@@ -841,150 +858,136 @@ function _tableau_versements(&$pdf, $object, $posy, $outputlangs)
* @param Translate $outputlangs Langs object
* @return void
*/
- function _tableau_info(&$pdf, $object, $posy, $outputlangs)
+ public function _tableau_info(&$pdf, $object, $posy, $outputlangs)
{
- global $conf;
+ global $conf;
- $default_font_size = pdf_getPDFFontSize($outputlangs);
+ $default_font_size = pdf_getPDFFontSize($outputlangs);
- $pdf->SetFont('','', $default_font_size - 1);
+ $pdf->SetFont('', '', $default_font_size - 1);
// If France, show VAT mention if not applicable
- if ($this->emetteur->country_code == 'FR' && $this->franchise == 1)
- {
- $pdf->SetFont('','B', $default_font_size - 2);
- $pdf->SetXY($this->marge_gauche, $posy);
- $pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedForInvoice"), 0, 'L', 0);
+ if ($this->emetteur->country_code == 'FR' && $this->franchise == 1) {
+ $pdf->SetFont('', 'B', $default_font_size - 2);
+ $pdf->SetXY($this->marge_gauche, $posy);
+ $pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedForInvoice"), 0, 'L', 0);
- $posy=$pdf->GetY()+4;
+ $posy=$pdf->GetY()+4;
}
- $posxval=52;
+ $posxval=52;
// Show payments conditions
- if ($object->type != 2 && ($object->cond_reglement_code || $object->cond_reglement))
- {
- $pdf->SetFont('','B', $default_font_size - 2);
- $pdf->SetXY($this->marge_gauche, $posy);
- $titre = $outputlangs->transnoentities("PaymentConditions").':';
- $pdf->MultiCell(80, 4, $titre, 0, 'L');
-
- $pdf->SetFont('','', $default_font_size - 2);
- $pdf->SetXY($posxval, $posy);
- $lib_condition_paiement=$outputlangs->transnoentities("PaymentCondition".$object->cond_reglement_code)!=('PaymentCondition'.$object->cond_reglement_code)?$outputlangs->transnoentities("PaymentCondition".$object->cond_reglement_code):$outputlangs->convToOutputCharset($object->cond_reglement_doc);
- $lib_condition_paiement=str_replace('\n',"\n",$lib_condition_paiement);
- $pdf->MultiCell(80, 4, $lib_condition_paiement,0,'L');
-
- $posy=$pdf->GetY()+3;
+ if ($object->type != 2 && ($object->cond_reglement_code || $object->cond_reglement)) {
+ $pdf->SetFont('', 'B', $default_font_size - 2);
+ $pdf->SetXY($this->marge_gauche, $posy);
+ $titre = $outputlangs->transnoentities("PaymentConditions").':';
+ $pdf->MultiCell(80, 4, $titre, 0, 'L');
+
+ $pdf->SetFont('', '', $default_font_size - 2);
+ $pdf->SetXY($posxval, $posy);
+ $lib_condition_paiement=$outputlangs->transnoentities("PaymentCondition".$object->cond_reglement_code)!=('PaymentCondition'.$object->cond_reglement_code)?$outputlangs->transnoentities("PaymentCondition".$object->cond_reglement_code):$outputlangs->convToOutputCharset($object->cond_reglement_doc);
+ $lib_condition_paiement=str_replace('\n', "\n", $lib_condition_paiement);
+ $pdf->MultiCell(80, 4, $lib_condition_paiement, 0, 'L');
+
+ $posy=$pdf->GetY()+3;
}
- if ($object->type != 2)
- {
- // Check a payment mode is defined
+ if ($object->type != 2) {
+ // Check a payment mode is defined
if (empty($object->mode_reglement_code)
&& empty($conf->global->FACTURE_CHQ_NUMBER)
- && empty($conf->global->FACTURE_RIB_NUMBER))
- {
- $this->error = $outputlangs->transnoentities("ErrorNoPaiementModeConfigured");
+ && empty($conf->global->FACTURE_RIB_NUMBER)) {
+ $this->error = $outputlangs->transnoentities("ErrorNoPaiementModeConfigured");
}
// Avoid having any valid PDF with setup that is not complete
elseif (($object->mode_reglement_code == 'CHQ' && empty($conf->global->FACTURE_CHQ_NUMBER))
- || ($object->mode_reglement_code == 'VIR' && empty($conf->global->FACTURE_RIB_NUMBER)))
- {
- $outputlangs->load("errors");
-
- $pdf->SetXY($this->marge_gauche, $posy);
- $pdf->SetTextColor(200,0,0);
- $pdf->SetFont('','B', $default_font_size - 2);
- $this->error = $outputlangs->transnoentities("ErrorPaymentModeDefinedToWithoutSetup",$object->mode_reglement_code);
- $pdf->MultiCell(80, 3, $this->error,0,'L',0);
- $pdf->SetTextColor(0,0,0);
-
- $posy=$pdf->GetY()+1;
+ || ($object->mode_reglement_code == 'VIR' && empty($conf->global->FACTURE_RIB_NUMBER))) {
+ $outputlangs->load("errors");
+
+ $pdf->SetXY($this->marge_gauche, $posy);
+ $pdf->SetTextColor(200, 0, 0);
+ $pdf->SetFont('', 'B', $default_font_size - 2);
+ $this->error = $outputlangs->transnoentities("ErrorPaymentModeDefinedToWithoutSetup", $object->mode_reglement_code);
+ $pdf->MultiCell(80, 3, $this->error, 0, 'L', 0);
+ $pdf->SetTextColor(0, 0, 0);
+
+ $posy=$pdf->GetY()+1;
}
// Show payment mode
if ($object->mode_reglement_code
&& $object->mode_reglement_code != 'CHQ'
- && $object->mode_reglement_code != 'VIR')
- {
- $pdf->SetFont('','B', $default_font_size - 2);
- $pdf->SetXY($this->marge_gauche, $posy);
- $titre = $outputlangs->transnoentities("PaymentMode").':';
- $pdf->MultiCell(80, 5, $titre, 0, 'L');
-
- $pdf->SetFont('','', $default_font_size - 2);
- $pdf->SetXY($posxval, $posy);
- $lib_mode_reg=$outputlangs->transnoentities("PaymentType".$object->mode_reglement_code)!=('PaymentType'.$object->mode_reglement_code)?$outputlangs->transnoentities("PaymentType".$object->mode_reglement_code):$outputlangs->convToOutputCharset($object->mode_reglement);
- $pdf->MultiCell(80, 5, $lib_mode_reg,0,'L');
-
- $posy=$pdf->GetY()+2;
+ && $object->mode_reglement_code != 'VIR') {
+ $pdf->SetFont('', 'B', $default_font_size - 2);
+ $pdf->SetXY($this->marge_gauche, $posy);
+ $titre = $outputlangs->transnoentities("PaymentMode").':';
+ $pdf->MultiCell(80, 5, $titre, 0, 'L');
+
+ $pdf->SetFont('', '', $default_font_size - 2);
+ $pdf->SetXY($posxval, $posy);
+ $lib_mode_reg=$outputlangs->transnoentities("PaymentType".$object->mode_reglement_code)!=('PaymentType'.$object->mode_reglement_code)?$outputlangs->transnoentities("PaymentType".$object->mode_reglement_code):$outputlangs->convToOutputCharset($object->mode_reglement);
+ $pdf->MultiCell(80, 5, $lib_mode_reg, 0, 'L');
+
+ $posy=$pdf->GetY()+2;
}
// Show payment mode CHQ
- if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'CHQ')
- {
- // Si mode reglement non force ou si force a CHQ
- if (! empty($conf->global->FACTURE_CHQ_NUMBER))
- {
- $diffsizetitle=(empty($conf->global->PDF_DIFFSIZE_TITLE)?3:$conf->global->PDF_DIFFSIZE_TITLE);
-
- if ($conf->global->FACTURE_CHQ_NUMBER > 0)
- {
- $account = new Account($this->db);
- $account->fetch($conf->global->FACTURE_CHQ_NUMBER);
-
- $pdf->SetXY($this->marge_gauche, $posy);
- $pdf->SetFont('','B', $default_font_size - $diffsizetitle);
- $pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo',$account->proprio),0,'L',0);
- $posy=$pdf->GetY()+1;
-
- if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
- {
- $pdf->SetXY($this->marge_gauche, $posy);
- $pdf->SetFont('','', $default_font_size - $diffsizetitle);
- $pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($account->owner_address), 0, 'L', 0);
- $posy=$pdf->GetY()+2;
- }
- }
- if ($conf->global->FACTURE_CHQ_NUMBER == -1)
- {
- $pdf->SetXY($this->marge_gauche, $posy);
- $pdf->SetFont('','B', $default_font_size - $diffsizetitle);
- $pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo',$this->emetteur->name),0,'L',0);
- $posy=$pdf->GetY()+1;
-
- if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
- {
- $pdf->SetXY($this->marge_gauche, $posy);
- $pdf->SetFont('','', $default_font_size - $diffsizetitle);
- $pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', 0);
- $posy=$pdf->GetY()+2;
- }
- }
+ if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'CHQ') {
+ // Si mode reglement non force ou si force a CHQ
+ if (! empty($conf->global->FACTURE_CHQ_NUMBER)) {
+ $diffsizetitle=(empty($conf->global->PDF_DIFFSIZE_TITLE)?3:$conf->global->PDF_DIFFSIZE_TITLE);
+
+ if ($conf->global->FACTURE_CHQ_NUMBER > 0) {
+ $account = new Account($this->db);
+ $account->fetch($conf->global->FACTURE_CHQ_NUMBER);
+
+ $pdf->SetXY($this->marge_gauche, $posy);
+ $pdf->SetFont('', 'B', $default_font_size - $diffsizetitle);
+ $pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $account->proprio), 0, 'L', 0);
+ $posy=$pdf->GetY()+1;
+
+ if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS)) {
+ $pdf->SetXY($this->marge_gauche, $posy);
+ $pdf->SetFont('', '', $default_font_size - $diffsizetitle);
+ $pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($account->owner_address), 0, 'L', 0);
+ $posy=$pdf->GetY()+2;
+ }
+ }
+ if ($conf->global->FACTURE_CHQ_NUMBER == -1) {
+ $pdf->SetXY($this->marge_gauche, $posy);
+ $pdf->SetFont('', 'B', $default_font_size - $diffsizetitle);
+ $pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $this->emetteur->name), 0, 'L', 0);
+ $posy=$pdf->GetY()+1;
+
+ if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS)) {
+ $pdf->SetXY($this->marge_gauche, $posy);
+ $pdf->SetFont('', '', $default_font_size - $diffsizetitle);
+ $pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', 0);
+ $posy=$pdf->GetY()+2;
+ }
+ }
}
}
// If payment mode not forced or forced to VIR, show payment with BAN
- if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'VIR')
- {
- if (! empty($object->fk_bank) || ! empty($conf->global->FACTURE_RIB_NUMBER))
- {
- $bankid=(empty($object->fk_bank)?$conf->global->FACTURE_RIB_NUMBER:$object->fk_bank);
- $account = new Account($this->db);
- $account->fetch($bankid);
+ if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'VIR') {
+ if (! empty($object->fk_bank) || ! empty($conf->global->FACTURE_RIB_NUMBER)) {
+ $bankid=(empty($object->fk_bank)?$conf->global->FACTURE_RIB_NUMBER:$object->fk_bank);
+ $account = new Account($this->db);
+ $account->fetch($bankid);
- $curx=$this->marge_gauche;
- $cury=$posy;
+ $curx=$this->marge_gauche;
+ $cury=$posy;
- $posy=pdf_bank($pdf,$outputlangs,$curx,$cury,$account,0,$default_font_size);
+ $posy=pdf_bank($pdf, $outputlangs, $curx, $cury, $account, 0, $default_font_size);
- $posy+=2;
- }
+ $posy+=2;
+ }
}
- }
+ }
- return $posy;
+ return $posy;
}
@@ -998,288 +1001,284 @@ function _tableau_info(&$pdf, $object, $posy, $outputlangs)
* @param Translate $outputlangs Objet langs
* @return int Position pour suite
*/
- function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
+ public function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
{
- global $conf,$mysoc;
+ global $conf,$mysoc;
- $sign=1;
- if ($object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1;
+ $sign=1;
+ if ($object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) {
+ $sign=-1;
+ }
- $default_font_size = pdf_getPDFFontSize($outputlangs);
+ $default_font_size = pdf_getPDFFontSize($outputlangs);
- $tab2_top = $posy;
- $tab2_hl = 4;
- $pdf->SetFont('','', $default_font_size - 1);
+ $tab2_top = $posy;
+ $tab2_hl = 4;
+ $pdf->SetFont('', '', $default_font_size - 1);
// Tableau total
- $col1x = 120; $col2x = 170;
- if ($this->page_largeur < 210) // To work with US executive format
- {
+ $col1x = 120;
+ $col2x = 170;
+ if ($this->page_largeur < 210) {
+ // To work with US executive format
+
$col2x-=20;
- }
- $largcol2 = ($this->page_largeur - $this->marge_droite - $col2x);
+ }
+ $largcol2 = ($this->page_largeur - $this->marge_droite - $col2x);
- $useborder=0;
- $index = 0;
+ $useborder=0;
+ $index = 0;
// Total HT
- $pdf->SetFillColor(255,255,255);
- $pdf->SetXY($col1x, $tab2_top + 0);
- $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', 1);
- $pdf->SetXY($col2x, $tab2_top + 0);
- $pdf->MultiCell($largcol2, $tab2_hl, price($sign * ($object->total_ht + (! empty($object->remise)?$object->remise:0)), 0, $outputlangs), 0, 'R', 1);
+ $pdf->SetFillColor(255, 255, 255);
+ $pdf->SetXY($col1x, $tab2_top + 0);
+ $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', 1);
+ $pdf->SetXY($col2x, $tab2_top + 0);
+ $pdf->MultiCell($largcol2, $tab2_hl, price($sign * ($object->total_ht + (! empty($object->remise)?$object->remise:0)), 0, $outputlangs), 0, 'R', 1);
// Show VAT by rates and total
- $pdf->SetFillColor(248,248,248);
-
- $this->atleastoneratenotnull=0;
- if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
- {
- $tvaisnull=((! empty($this->tva) && count($this->tva) == 1 && isset($this->tva['0.000']) && is_float($this->tva['0.000'])) ? true : false);
- if (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_ISNULL) && $tvaisnull)
- {
- // Nothing to do
- }
- else
- {
- //Local tax 1 before VAT
+ $pdf->SetFillColor(248, 248, 248);
+
+ $this->atleastoneratenotnull=0;
+ if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) {
+ $tvaisnull=((! empty($this->tva) && count($this->tva) == 1 && isset($this->tva['0.000']) && is_float($this->tva['0.000'])) ? true : false);
+ if (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_ISNULL) && $tvaisnull) {
+ // Nothing to do
+ } else {
+ //Local tax 1 before VAT
//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
//{
- foreach( $this->localtax1 as $localtax_type => $localtax_rate )
- {
- if (in_array((string) $localtax_type, array('1','3','5'))) continue;
-
- foreach( $localtax_rate as $tvakey => $tvaval )
- {
- if ($tvakey!=0) // On affiche pas taux 0
- {
- //$this->atleastoneratenotnull++;
-
- $index++;
- $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+ foreach ($this->localtax1 as $localtax_type => $localtax_rate) {
+ if (in_array((string) $localtax_type, array('1','3','5'))) {
+ continue;
+ }
- $tvacompl='';
- if (preg_match('/\*/',$tvakey))
- {
- $tvakey=str_replace('*','',$tvakey);
- $tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
- }
+ foreach ($localtax_rate as $tvakey => $tvaval) {
+ if ($tvakey!=0) {
+ // On affiche pas taux 0
- $totalvat = $outputlangs->transcountrynoentities("TotalLT1",$mysoc->country_code).' ';
- $totalvat.=vatrate(abs($tvakey),1).$tvacompl;
- $pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+ //$this->atleastoneratenotnull++;
- $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
- $pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
- }
- }
+ $index++;
+ $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+
+ $tvacompl='';
+ if (preg_match('/\*/', $tvakey)) {
+ $tvakey=str_replace('*', '', $tvakey);
+ $tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
+ }
+
+ $totalvat = $outputlangs->transcountrynoentities("TotalLT1", $mysoc->country_code).' ';
+ $totalvat.=vatrate(abs($tvakey), 1).$tvacompl;
+ $pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+
+ $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+ $pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
+ }
+ }
}
//}
//Local tax 2 before VAT
//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
//{
- foreach( $this->localtax2 as $localtax_type => $localtax_rate )
- {
- if (in_array((string) $localtax_type, array('1','3','5'))) continue;
-
- foreach( $localtax_rate as $tvakey => $tvaval )
- {
- if ($tvakey!=0) // On affiche pas taux 0
- {
- //$this->atleastoneratenotnull++;
-
+ foreach ($this->localtax2 as $localtax_type => $localtax_rate) {
+ if (in_array((string) $localtax_type, array('1','3','5'))) {
+ continue;
+ }
+ foreach ($localtax_rate as $tvakey => $tvaval) {
+ if ($tvakey!=0) {
+ // On affiche pas taux 0
- $index++;
- $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+ //$this->atleastoneratenotnull++;
- $tvacompl='';
- if (preg_match('/\*/',$tvakey))
- {
- $tvakey=str_replace('*','',$tvakey);
- $tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
- }
- $totalvat = $outputlangs->transcountrynoentities("TotalLT2",$mysoc->country_code).' ';
- $totalvat.=vatrate(abs($tvakey),1).$tvacompl;
- $pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
- $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
- $pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
- }
- }
+ $index++;
+ $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+
+ $tvacompl='';
+ if (preg_match('/\*/', $tvakey)) {
+ $tvakey=str_replace('*', '', $tvakey);
+ $tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
+ }
+ $totalvat = $outputlangs->transcountrynoentities("TotalLT2", $mysoc->country_code).' ';
+ $totalvat.=vatrate(abs($tvakey), 1).$tvacompl;
+ $pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+
+ $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+ $pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
+ }
+ }
}
//}
// VAT
- foreach($this->tva as $tvakey => $tvaval)
- {
- if ($tvakey > 0) // On affiche pas taux 0
- {
- $this->atleastoneratenotnull++;
+ foreach ($this->tva as $tvakey => $tvaval) {
+ if ($tvakey > 0) {
+ // On affiche pas taux 0
- $index++;
- $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-
- $tvacompl='';
- if (preg_match('/\*/',$tvakey))
- {
- $tvakey=str_replace('*','',$tvakey);
- $tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
- }
- $totalvat =$outputlangs->transnoentities("TotalVAT").' ';
- $totalvat.=vatrate($tvakey,1).$tvacompl;
- $pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+ $this->atleastoneratenotnull++;
- $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
- $pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
- }
+ $index++;
+ $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+
+ $tvacompl='';
+ if (preg_match('/\*/', $tvakey)) {
+ $tvakey=str_replace('*', '', $tvakey);
+ $tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
+ }
+ $totalvat =$outputlangs->transnoentities("TotalVAT").' ';
+ $totalvat.=vatrate($tvakey, 1).$tvacompl;
+ $pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+
+ $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+ $pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
+ }
}
//Local tax 1 after VAT
//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
//{
- foreach( $this->localtax1 as $localtax_type => $localtax_rate )
- {
- if (in_array((string) $localtax_type, array('2','4','6'))) continue;
-
- foreach( $localtax_rate as $tvakey => $tvaval )
- {
- if ($tvakey != 0) // On affiche pas taux 0
- {
- //$this->atleastoneratenotnull++;
+ foreach ($this->localtax1 as $localtax_type => $localtax_rate) {
+ if (in_array((string) $localtax_type, array('2','4','6'))) {
+ continue;
+ }
- $index++;
- $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+ foreach ($localtax_rate as $tvakey => $tvaval) {
+ if ($tvakey != 0) {
+ // On affiche pas taux 0
- $tvacompl='';
- if (preg_match('/\*/',$tvakey))
- {
- $tvakey=str_replace('*','',$tvakey);
- $tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
- }
- $totalvat = $outputlangs->transcountrynoentities("TotalLT1",$mysoc->country_code).' ';
- $totalvat.=vatrate(abs($tvakey),1).$tvacompl;
+ //$this->atleastoneratenotnull++;
- $pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
- $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
- $pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
- }
- }
+ $index++;
+ $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+
+ $tvacompl='';
+ if (preg_match('/\*/', $tvakey)) {
+ $tvakey=str_replace('*', '', $tvakey);
+ $tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
+ }
+ $totalvat = $outputlangs->transcountrynoentities("TotalLT1", $mysoc->country_code).' ';
+ $totalvat.=vatrate(abs($tvakey), 1).$tvacompl;
+
+ $pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+ $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+ $pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
+ }
+ }
}
//}
//Local tax 2 after VAT
//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
//{
- foreach( $this->localtax2 as $localtax_type => $localtax_rate )
- {
- if (in_array((string) $localtax_type, array('2','4','6'))) continue;
-
- foreach( $localtax_rate as $tvakey => $tvaval )
- {
- // retrieve global local tax
- if ($tvakey != 0) // On affiche pas taux 0
- {
+ foreach ($this->localtax2 as $localtax_type => $localtax_rate) {
+ if (in_array((string) $localtax_type, array('2','4','6'))) {
+ continue;
+ }
+
+ foreach ($localtax_rate as $tvakey => $tvaval) {
+ // retrieve global local tax
+ if ($tvakey != 0) {
+ // On affiche pas taux 0
+
//$this->atleastoneratenotnull++;
$index++;
- $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+ $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
- $tvacompl='';
- if (preg_match('/\*/',$tvakey))
- {
- $tvakey=str_replace('*','',$tvakey);
- $tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
- }
- $totalvat = $outputlangs->transcountrynoentities("TotalLT2",$mysoc->country_code).' ';
+ $tvacompl='';
+ if (preg_match('/\*/', $tvakey)) {
+ $tvakey=str_replace('*', '', $tvakey);
+ $tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
+ }
+ $totalvat = $outputlangs->transcountrynoentities("TotalLT2", $mysoc->country_code).' ';
- $totalvat.=vatrate(abs($tvakey),1).$tvacompl;
- $pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+ $totalvat.=vatrate(abs($tvakey), 1).$tvacompl;
+ $pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
- $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
- $pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
+ $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+ $pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
}
- }
+ }
//}
- }
+ }
// Revenue stamp
- if (price2num($object->revenuestamp) != 0)
- {
- $index++;
- $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
- $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("RevenueStamp"), $useborder, 'L', 1);
-
- $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
- $pdf->MultiCell($largcol2, $tab2_hl, price($sign * $object->revenuestamp), $useborder, 'R', 1);
+ if (price2num($object->revenuestamp) != 0) {
+ $index++;
+ $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+ $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("RevenueStamp"), $useborder, 'L', 1);
+
+ $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+ $pdf->MultiCell($largcol2, $tab2_hl, price($sign * $object->revenuestamp), $useborder, 'R', 1);
}
// Total TTC
$index++;
- $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
- $pdf->SetTextColor(0,0,60);
- $pdf->SetFillColor(224,224,224);
- $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC"), $useborder, 'L', 1);
+ $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+ $pdf->SetTextColor(0, 0, 60);
+ $pdf->SetFillColor(224, 224, 224);
+ $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC"), $useborder, 'L', 1);
- $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
- $pdf->MultiCell($largcol2, $tab2_hl, price($sign * $object->total_ttc, 0, $outputlangs), $useborder, 'R', 1);
- }
- }
+ $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+ $pdf->MultiCell($largcol2, $tab2_hl, price($sign * $object->total_ttc, 0, $outputlangs), $useborder, 'R', 1);
+ }
+ }
- $pdf->SetTextColor(0,0,0);
+ $pdf->SetTextColor(0, 0, 0);
- $creditnoteamount=$object->getSumCreditNotesUsed();
- $depositsamount=$object->getSumDepositsUsed();
+ $creditnoteamount=$object->getSumCreditNotesUsed();
+ $depositsamount=$object->getSumDepositsUsed();
//print "x".$creditnoteamount."-".$depositsamount;exit;
$resteapayer = price2num($object->total_ttc - $deja_regle - $creditnoteamount - $depositsamount, 'MT');
- if ($object->paye) $resteapayer=0;
+ if ($object->paye) {
+ $resteapayer=0;
+ }
- if ($deja_regle > 0 || $creditnoteamount > 0 || $depositsamount > 0)
- {
- // Already paid + Deposits
+ if ($deja_regle > 0 || $creditnoteamount > 0 || $depositsamount > 0) {
+ // Already paid + Deposits
$index++;
- $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
- $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("Paid"), 0, 'L', 0);
- $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
- $pdf->MultiCell($largcol2, $tab2_hl, price($deja_regle + $depositsamount, 0, $outputlangs), 0, 'R', 0);
+ $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+ $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("Paid"), 0, 'L', 0);
+ $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+ $pdf->MultiCell($largcol2, $tab2_hl, price($deja_regle + $depositsamount, 0, $outputlangs), 0, 'R', 0);
// Credit note
- if ($creditnoteamount)
- {
- $index++;
- $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
- $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("CreditNotes"), 0, 'L', 0);
- $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
- $pdf->MultiCell($largcol2, $tab2_hl, price($creditnoteamount, 0, $outputlangs), 0, 'R', 0);
+ if ($creditnoteamount) {
+ $index++;
+ $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+ $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("CreditNotes"), 0, 'L', 0);
+ $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+ $pdf->MultiCell($largcol2, $tab2_hl, price($creditnoteamount, 0, $outputlangs), 0, 'R', 0);
}
// Escompte
- if ($object->close_code == 'discount_vat')
- {
- $index++;
- $pdf->SetFillColor(255,255,255);
+ if ($object->close_code == 'discount_vat') {
+ $index++;
+ $pdf->SetFillColor(255, 255, 255);
- $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
- $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("EscompteOffered"), $useborder, 'L', 1);
- $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
- $pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ttc - $deja_regle - $creditnoteamount - $depositsamount, 0, $outputlangs), $useborder, 'R', 1);
+ $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+ $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("EscompteOffered"), $useborder, 'L', 1);
+ $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+ $pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ttc - $deja_regle - $creditnoteamount - $depositsamount, 0, $outputlangs), $useborder, 'R', 1);
- $resteapayer=0;
+ $resteapayer=0;
}
- $index++;
- $pdf->SetTextColor(0,0,60);
- $pdf->SetFillColor(224,224,224);
- $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
- $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("RemainderToPay"), $useborder, 'L', 1);
- $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
- $pdf->MultiCell($largcol2, $tab2_hl, price($resteapayer, 0, $outputlangs), $useborder, 'R', 1);
-
- $pdf->SetFont('','', $default_font_size - 1);
- $pdf->SetTextColor(0,0,0);
- }
+ $index++;
+ $pdf->SetTextColor(0, 0, 60);
+ $pdf->SetFillColor(224, 224, 224);
+ $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+ $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("RemainderToPay"), $useborder, 'L', 1);
+ $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+ $pdf->MultiCell($largcol2, $tab2_hl, price($resteapayer, 0, $outputlangs), $useborder, 'R', 1);
+
+ $pdf->SetFont('', '', $default_font_size - 1);
+ $pdf->SetTextColor(0, 0, 0);
+ }
- $index++;
- return ($tab2_top + ($tab2_hl * $index));
+ $index++;
+ return ($tab2_top + ($tab2_hl * $index));
}
/**
@@ -1294,96 +1293,88 @@ function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
* @param int $hidebottom Hide bottom bar of array
* @return void
*/
- function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop=0, $hidebottom=0)
+ public function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop=0, $hidebottom=0)
{
- global $conf;
+ global $conf;
// Force to disable hidetop and hidebottom
$hidebottom=0;
- if ($hidetop) $hidetop=-1;
+ if ($hidetop) {
+ $hidetop=-1;
+ }
- $default_font_size = pdf_getPDFFontSize($outputlangs);
+ $default_font_size = pdf_getPDFFontSize($outputlangs);
// Amount in (at tab_top - 1)
- $pdf->SetTextColor(0,0,0);
- $pdf->SetFont('','', $default_font_size - 2);
+ $pdf->SetTextColor(0, 0, 0);
+ $pdf->SetFont('', '', $default_font_size - 2);
- if (empty($hidetop))
- {
- $titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$conf->currency));
- $pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top-4);
- $pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
+ if (empty($hidetop)) {
+ $titre = $outputlangs->transnoentities("AmountInCurrency", $outputlangs->transnoentitiesnoconv("Currency".$conf->currency));
+ $pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top-4);
+ $pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
//$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR='230,230,230';
- if (! empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) $pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_droite-$this->marge_gauche, 5, 'F', null, explode(',',$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
- }
+ if (! empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) {
+ $pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_droite-$this->marge_gauche, 5, 'F', null, explode(',', $conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
+ }
+ }
- $pdf->SetDrawColor(128,128,128);
- $pdf->SetFont('','', $default_font_size - 1);
+ $pdf->SetDrawColor(128, 128, 128);
+ $pdf->SetFont('', '', $default_font_size - 1);
// Output Rect
- $this->printRect($pdf,$this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect prend une longueur en 3eme param et 4eme param
+ $this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect prend une longueur en 3eme param et 4eme param
- if (empty($hidetop))
- {
- $pdf->line($this->marge_gauche, $tab_top+5, $this->page_largeur-$this->marge_droite, $tab_top+5); // line prend une position y en 2eme param et 4eme param
+ if (empty($hidetop)) {
+ $pdf->line($this->marge_gauche, $tab_top+5, $this->page_largeur-$this->marge_droite, $tab_top+5); // line prend une position y en 2eme param et 4eme param
$pdf->SetXY($this->posxdesc-1, $tab_top+1);
- $pdf->MultiCell(108,2, $outputlangs->transnoentities("Designation"),'','L');
+ $pdf->MultiCell(108, 2, $outputlangs->transnoentities("Designation"), '', 'L');
}
- if (! empty($conf->global->MAIN_GENERATE_INVOICES_WITH_PICTURE))
- {
- $pdf->line($this->posxpicture-1, $tab_top, $this->posxpicture-1, $tab_top + $tab_height);
- if (empty($hidetop))
- {
- //$pdf->SetXY($this->posxpicture-1, $tab_top+1);
+ if (! empty($conf->global->MAIN_GENERATE_INVOICES_WITH_PICTURE)) {
+ $pdf->line($this->posxpicture-1, $tab_top, $this->posxpicture-1, $tab_top + $tab_height);
+ if (empty($hidetop)) {
+ //$pdf->SetXY($this->posxpicture-1, $tab_top+1);
//$pdf->MultiCell($this->posxtva-$this->posxpicture-1,2, $outputlangs->transnoentities("Photo"),'','C');
- }
- }
-
- if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
- {
- $pdf->line($this->posxtva-1, $tab_top, $this->posxtva-1, $tab_top + $tab_height);
- if (empty($hidetop))
- {
- $pdf->SetXY($this->posxtva-3, $tab_top+1);
- $pdf->MultiCell($this->posxup-$this->posxtva+3,2, $outputlangs->transnoentities("VAT"),'','C');
- }
- }
-
- $pdf->line($this->posxup-1, $tab_top, $this->posxup-1, $tab_top + $tab_height);
- if (empty($hidetop))
- {
- $pdf->SetXY($this->posxup-1, $tab_top+1);
- $pdf->MultiCell($this->posxqty-$this->posxup-1,2, $outputlangs->transnoentities("PriceUHT"),'','C');
- }
-
- $pdf->line($this->posxqty-1, $tab_top, $this->posxqty-1, $tab_top + $tab_height);
- if (empty($hidetop))
- {
- $pdf->SetXY($this->posxqty-1, $tab_top+1);
- $pdf->MultiCell($this->posxdiscount-$this->posxqty-1,2, $outputlangs->transnoentities("Qty"),'','C');
- }
-
- $pdf->line($this->posxdiscount-1, $tab_top, $this->posxdiscount-1, $tab_top + $tab_height);
- if (empty($hidetop))
- {
- if ($this->atleastonediscount)
- {
- $pdf->SetXY($this->posxdiscount-1, $tab_top+1);
- $pdf->MultiCell($this->postotalht-$this->posxdiscount+1,2, $outputlangs->transnoentities("ReductionShort"),'','C');
- }
- }
- if ($this->atleastonediscount)
- {
- $pdf->line($this->postotalht, $tab_top, $this->postotalht, $tab_top + $tab_height);
- }
- if (empty($hidetop))
- {
- $pdf->SetXY($this->postotalht-1, $tab_top+1);
- $pdf->MultiCell(30,2, $outputlangs->transnoentities("TotalHT"),'','C');
- }
+ }
+ }
+
+ if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) {
+ $pdf->line($this->posxtva-1, $tab_top, $this->posxtva-1, $tab_top + $tab_height);
+ if (empty($hidetop)) {
+ $pdf->SetXY($this->posxtva-3, $tab_top+1);
+ $pdf->MultiCell($this->posxup-$this->posxtva+3, 2, $outputlangs->transnoentities("VAT"), '', 'C');
+ }
+ }
+
+ $pdf->line($this->posxup-1, $tab_top, $this->posxup-1, $tab_top + $tab_height);
+ if (empty($hidetop)) {
+ $pdf->SetXY($this->posxup-1, $tab_top+1);
+ $pdf->MultiCell($this->posxqty-$this->posxup-1, 2, $outputlangs->transnoentities("PriceUHT"), '', 'C');
+ }
+
+ $pdf->line($this->posxqty-1, $tab_top, $this->posxqty-1, $tab_top + $tab_height);
+ if (empty($hidetop)) {
+ $pdf->SetXY($this->posxqty-1, $tab_top+1);
+ $pdf->MultiCell($this->posxdiscount-$this->posxqty-1, 2, $outputlangs->transnoentities("Qty"), '', 'C');
+ }
+
+ $pdf->line($this->posxdiscount-1, $tab_top, $this->posxdiscount-1, $tab_top + $tab_height);
+ if (empty($hidetop)) {
+ if ($this->atleastonediscount) {
+ $pdf->SetXY($this->posxdiscount-1, $tab_top+1);
+ $pdf->MultiCell($this->postotalht-$this->posxdiscount+1, 2, $outputlangs->transnoentities("ReductionShort"), '', 'C');
+ }
+ }
+ if ($this->atleastonediscount) {
+ $pdf->line($this->postotalht, $tab_top, $this->postotalht, $tab_top + $tab_height);
+ }
+ if (empty($hidetop)) {
+ $pdf->SetXY($this->postotalht-1, $tab_top+1);
+ $pdf->MultiCell(30, 2, $outputlangs->transnoentities("TotalHT"), '', 'C');
+ }
}
/**
@@ -1395,226 +1386,225 @@ function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop=0,
* @param Translate $outputlangs Object lang for output
* @return void
*/
- function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
+ public function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
{
- global $conf,$langs;
+ global $conf,$langs;
- $outputlangs->load("main");
- $outputlangs->load("bills");
- $outputlangs->load("propal");
- $outputlangs->load("companies");
+ $outputlangs->load("main");
+ $outputlangs->load("bills");
+ $outputlangs->load("propal");
+ $outputlangs->load("companies");
- $default_font_size = pdf_getPDFFontSize($outputlangs);
+ $default_font_size = pdf_getPDFFontSize($outputlangs);
- pdf_pagehead($pdf,$outputlangs,$this->page_hauteur);
+ pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
// Show Draft Watermark
- if($object->statut==0 && (! empty($conf->global->FACTURE_DRAFT_WATERMARK)) )
- {
- pdf_watermark($pdf,$outputlangs,$this->page_hauteur,$this->page_largeur,'mm',$conf->global->FACTURE_DRAFT_WATERMARK);
- }
+ if ($object->statut==0 && (! empty($conf->global->FACTURE_DRAFT_WATERMARK))) {
+ pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->FACTURE_DRAFT_WATERMARK);
+ }
- $pdf->SetTextColor(0,0,60);
- $pdf->SetFont('','B', $default_font_size + 3);
+ $pdf->SetTextColor(0, 0, 60);
+ $pdf->SetFont('', 'B', $default_font_size + 3);
- $posy=$this->marge_haute;
- $posx=$this->page_largeur-$this->marge_droite-100;
+ $posy=$this->marge_haute;
+ $posx=$this->page_largeur-$this->marge_droite-100;
- $pdf->SetXY($this->marge_gauche,$posy);
+ $pdf->SetXY($this->marge_gauche, $posy);
// Logo
$logo=$conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
- if ($this->emetteur->logo)
- {
- if (is_readable($logo))
- {
- $height=pdf_getHeightForLogo($logo);
- $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
- }
- else
- {
- $pdf->SetTextColor(200,0,0);
- $pdf->SetFont('','B',$default_font_size - 2);
- $pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
- $pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
- }
- }
- else
- {
- $text=$this->emetteur->name;
- $pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
- }
-
- $pdf->SetFont('','B', $default_font_size + 3);
- $pdf->SetXY($posx,$posy);
- $pdf->SetTextColor(0,0,60);
- $title=$outputlangs->transnoentities("Invoice");
- if ($object->type == 1) $title=$outputlangs->transnoentities("InvoiceReplacement");
- if ($object->type == 2) $title=$outputlangs->transnoentities("InvoiceAvoir");
- if ($object->type == 3) $title=$outputlangs->transnoentities("InvoiceDeposit");
- if ($object->type == 4) $title=$outputlangs->transnoentities("InvoiceProFormat");
- $pdf->MultiCell(100, 3, $title, '', 'R');
-
- $pdf->SetFont('','B',$default_font_size);
-
- $posy+=5;
- $pdf->SetXY($posx,$posy);
- $pdf->SetTextColor(0,0,60);
- $pdf->MultiCell(100, 4, $outputlangs->transnoentities("Ref")." : " . $outputlangs->convToOutputCharset($object->ref), '', 'R');
-
- $posy+=1;
- $pdf->SetFont('','', $default_font_size - 2);
-
- if ($object->ref_client)
- {
- $posy+=4;
- $pdf->SetXY($posx,$posy);
- $pdf->SetTextColor(0,0,60);
- $pdf->MultiCell(100, 3, $outputlangs->transnoentities("RefCustomer")." : " . $outputlangs->convToOutputCharset($object->ref_client), '', 'R');
- }
-
- $objectidnext=$object->getIdReplacingInvoice('validated');
- if ($object->type == 0 && $objectidnext)
- {
- $objectreplacing=new Facture($this->db);
- $objectreplacing->fetch($objectidnext);
-
- $posy+=3;
- $pdf->SetXY($posx,$posy);
- $pdf->SetTextColor(0,0,60);
- $pdf->MultiCell(100, 3, $outputlangs->transnoentities("ReplacementByInvoice").' : '.$outputlangs->convToOutputCharset($objectreplacing->ref), '', 'R');
- }
- if ($object->type == 1)
- {
- $objectreplaced=new Facture($this->db);
- $objectreplaced->fetch($object->fk_facture_source);
-
- $posy+=4;
- $pdf->SetXY($posx,$posy);
- $pdf->SetTextColor(0,0,60);
- $pdf->MultiCell(100, 3, $outputlangs->transnoentities("ReplacementInvoice").' : '.$outputlangs->convToOutputCharset($objectreplaced->ref), '', 'R');
- }
- if ($object->type == 2)
- {
- $objectreplaced=new Facture($this->db);
- $objectreplaced->fetch($object->fk_facture_source);
-
- $posy+=3;
- $pdf->SetXY($posx,$posy);
- $pdf->SetTextColor(0,0,60);
- $pdf->MultiCell(100, 3, $outputlangs->transnoentities("CorrectionInvoice").' : '.$outputlangs->convToOutputCharset($objectreplaced->ref), '', 'R');
- }
-
- $posy+=4;
- $pdf->SetXY($posx,$posy);
- $pdf->SetTextColor(0,0,60);
- $pdf->MultiCell(100, 3, $outputlangs->transnoentities("DateInvoice")." : " . dol_print_date($object->date,"day",false,$outputlangs), '', 'R');
-
- if ($object->type != 2)
- {
- $posy+=3;
- $pdf->SetXY($posx,$posy);
- $pdf->SetTextColor(0,0,60);
- $pdf->MultiCell(100, 3, $outputlangs->transnoentities("DateEcheance")." : " . dol_print_date($object->date_lim_reglement,"day",false,$outputlangs,true), '', 'R');
- }
-
- if ($object->client->code_client)
- {
- $posy+=3;
- $pdf->SetXY($posx,$posy);
- $pdf->SetTextColor(0,0,60);
- $pdf->MultiCell(100, 3, $outputlangs->transnoentities("CustomerCode")." : " . $outputlangs->transnoentities($object->client->code_client), '', 'R');
- }
-
- $posy+=1;
+ if ($this->emetteur->logo) {
+ if (is_readable($logo)) {
+ $height=pdf_getHeightForLogo($logo);
+ $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
+ } else {
+ $pdf->SetTextColor(200, 0, 0);
+ $pdf->SetFont('', 'B', $default_font_size - 2);
+ $pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
+ $pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
+ }
+ } else {
+ $text=$this->emetteur->name;
+ $pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
+ }
+
+ $pdf->SetFont('', 'B', $default_font_size + 3);
+ $pdf->SetXY($posx, $posy);
+ $pdf->SetTextColor(0, 0, 60);
+ $title=$outputlangs->transnoentities("Invoice");
+ if ($object->type == 1) {
+ $title=$outputlangs->transnoentities("InvoiceReplacement");
+ }
+ if ($object->type == 2) {
+ $title=$outputlangs->transnoentities("InvoiceAvoir");
+ }
+ if ($object->type == 3) {
+ $title=$outputlangs->transnoentities("InvoiceDeposit");
+ }
+ if ($object->type == 4) {
+ $title=$outputlangs->transnoentities("InvoiceProFormat");
+ }
+ $pdf->MultiCell(100, 3, $title, '', 'R');
+
+ $pdf->SetFont('', 'B', $default_font_size);
+
+ $posy+=5;
+ $pdf->SetXY($posx, $posy);
+ $pdf->SetTextColor(0, 0, 60);
+ $pdf->MultiCell(100, 4, $outputlangs->transnoentities("Ref")." : " . $outputlangs->convToOutputCharset($object->ref), '', 'R');
+
+ $posy+=1;
+ $pdf->SetFont('', '', $default_font_size - 2);
+
+ if ($object->ref_client) {
+ $posy+=4;
+ $pdf->SetXY($posx, $posy);
+ $pdf->SetTextColor(0, 0, 60);
+ $pdf->MultiCell(100, 3, $outputlangs->transnoentities("RefCustomer")." : " . $outputlangs->convToOutputCharset($object->ref_client), '', 'R');
+ }
+
+ $objectidnext=$object->getIdReplacingInvoice('validated');
+ if ($object->type == 0 && $objectidnext) {
+ $objectreplacing=new Facture($this->db);
+ $objectreplacing->fetch($objectidnext);
+
+ $posy+=3;
+ $pdf->SetXY($posx, $posy);
+ $pdf->SetTextColor(0, 0, 60);
+ $pdf->MultiCell(100, 3, $outputlangs->transnoentities("ReplacementByInvoice").' : '.$outputlangs->convToOutputCharset($objectreplacing->ref), '', 'R');
+ }
+ if ($object->type == 1) {
+ $objectreplaced=new Facture($this->db);
+ $objectreplaced->fetch($object->fk_facture_source);
+
+ $posy+=4;
+ $pdf->SetXY($posx, $posy);
+ $pdf->SetTextColor(0, 0, 60);
+ $pdf->MultiCell(100, 3, $outputlangs->transnoentities("ReplacementInvoice").' : '.$outputlangs->convToOutputCharset($objectreplaced->ref), '', 'R');
+ }
+ if ($object->type == 2) {
+ $objectreplaced=new Facture($this->db);
+ $objectreplaced->fetch($object->fk_facture_source);
+
+ $posy+=3;
+ $pdf->SetXY($posx, $posy);
+ $pdf->SetTextColor(0, 0, 60);
+ $pdf->MultiCell(100, 3, $outputlangs->transnoentities("CorrectionInvoice").' : '.$outputlangs->convToOutputCharset($objectreplaced->ref), '', 'R');
+ }
+
+ $posy+=4;
+ $pdf->SetXY($posx, $posy);
+ $pdf->SetTextColor(0, 0, 60);
+ $pdf->MultiCell(100, 3, $outputlangs->transnoentities("DateInvoice")." : " . dol_print_date($object->date, "day", false, $outputlangs), '', 'R');
+
+ if ($object->type != 2) {
+ $posy+=3;
+ $pdf->SetXY($posx, $posy);
+ $pdf->SetTextColor(0, 0, 60);
+ $pdf->MultiCell(100, 3, $outputlangs->transnoentities("DateEcheance")." : " . dol_print_date($object->date_lim_reglement, "day", false, $outputlangs, true), '', 'R');
+ }
+
+ if ($object->client->code_client) {
+ $posy+=3;
+ $pdf->SetXY($posx, $posy);
+ $pdf->SetTextColor(0, 0, 60);
+ $pdf->MultiCell(100, 3, $outputlangs->transnoentities("CustomerCode")." : " . $outputlangs->transnoentities($object->client->code_client), '', 'R');
+ }
+
+ $posy+=1;
// Show list of linked objects
$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'R', $default_font_size);
- if ($showaddress)
- {
- // Sender properties
+ if ($showaddress) {
+ // Sender properties
$carac_emetteur = pdf_build_address($outputlangs, $this->emetteur, $object->client);
// Show sender
$posy=42;
- $posx=$this->marge_gauche;
- if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->page_largeur-$this->marge_droite-80;
- $hautcadre=40;
+ $posx=$this->marge_gauche;
+ if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+ $posx=$this->page_largeur-$this->marge_droite-80;
+ }
+ $hautcadre=40;
// Show sender frame
- $pdf->SetTextColor(0,0,0);
- $pdf->SetFont('','', $default_font_size - 2);
- $pdf->SetXY($posx,$posy-5);
- $pdf->MultiCell(66,5, $outputlangs->transnoentities("BillFrom").":", 0, 'L');
- $pdf->SetXY($posx,$posy);
- $pdf->SetFillColor(230,230,230);
- $pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1);
- $pdf->SetTextColor(0,0,60);
+ $pdf->SetTextColor(0, 0, 0);
+ $pdf->SetFont('', '', $default_font_size - 2);
+ $pdf->SetXY($posx, $posy-5);
+ $pdf->MultiCell(66, 5, $outputlangs->transnoentities("BillFrom").":", 0, 'L');
+ $pdf->SetXY($posx, $posy);
+ $pdf->SetFillColor(230, 230, 230);
+ $pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1);
+ $pdf->SetTextColor(0, 0, 60);
// Show sender name
- $pdf->SetXY($posx+2,$posy+3);
- $pdf->SetFont('','B', $default_font_size);
- $pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
- $posy=$pdf->getY();
+ $pdf->SetXY($posx+2, $posy+3);
+ $pdf->SetFont('', 'B', $default_font_size);
+ $pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
+ $posy=$pdf->getY();
// Show sender information
- $pdf->SetXY($posx+2,$posy);
- $pdf->SetFont('','', $default_font_size - 1);
- $pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L');
+ $pdf->SetXY($posx+2, $posy);
+ $pdf->SetFont('', '', $default_font_size - 1);
+ $pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L');
// If BILLING contact defined on invoice, we use it
$usecontact=false;
- $arrayidcontact=$object->getIdContact('external','BILLING');
- if (count($arrayidcontact) > 0)
- {
- $usecontact=true;
- $result=$object->fetch_contact($arrayidcontact[0]);
- }
+ $arrayidcontact=$object->getIdContact('external', 'BILLING');
+ if (count($arrayidcontact) > 0) {
+ $usecontact=true;
+ $result=$object->fetch_contact($arrayidcontact[0]);
+ }
// Recipient name
- if (! empty($usecontact))
- {
- // On peut utiliser le nom de la societe du contact
- if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socname = $object->contact->socname;
- else $socname = $object->client->name;
- $carac_client_name=$outputlangs->convToOutputCharset($socname);
- }
- else
- {
- $carac_client_name=$outputlangs->convToOutputCharset($object->client->name);
+ if (! empty($usecontact)) {
+ // On peut utiliser le nom de la societe du contact
+ if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
+ $socname = $object->contact->socname;
+ } else {
+ $socname = $object->client->name;
+ }
+ $carac_client_name=$outputlangs->convToOutputCharset($socname);
+ } else {
+ $carac_client_name=$outputlangs->convToOutputCharset($object->client->name);
}
- $carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->client,($usecontact?$object->contact:''),$usecontact,'target');
+ $carac_client=pdf_build_address($outputlangs, $this->emetteur, $object->client, ($usecontact?$object->contact:''), $usecontact, 'target');
// Show recipient
$widthrecbox=100;
- if ($this->page_largeur < 210) $widthrecbox=84; // To work with US executive format
+ if ($this->page_largeur < 210) {
+ $widthrecbox=84;
+ } // To work with US executive format
$posy=42;
- $posx=$this->page_largeur-$this->marge_droite-$widthrecbox;
- if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->marge_gauche;
+ $posx=$this->page_largeur-$this->marge_droite-$widthrecbox;
+ if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+ $posx=$this->marge_gauche;
+ }
// Show recipient frame
- $pdf->SetTextColor(0,0,0);
- $pdf->SetFont('','', $default_font_size - 2);
- $pdf->SetXY($posx+2,$posy-5);
- $pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("BillTo").":",0,'L');
- $pdf->Rect($posx, $posy, $widthrecbox, $hautcadre);
+ $pdf->SetTextColor(0, 0, 0);
+ $pdf->SetFont('', '', $default_font_size - 2);
+ $pdf->SetXY($posx+2, $posy-5);
+ $pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("BillTo").":", 0, 'L');
+ $pdf->Rect($posx, $posy, $widthrecbox, $hautcadre);
// Show recipient name
- $pdf->SetXY($posx+2,$posy+3);
- $pdf->SetFont('','B', $default_font_size);
- $pdf->MultiCell($widthrecbox, 4, $carac_client_name, 0, 'L');
+ $pdf->SetXY($posx+2, $posy+3);
+ $pdf->SetFont('', 'B', $default_font_size);
+ $pdf->MultiCell($widthrecbox, 4, $carac_client_name, 0, 'L');
// Show recipient information
- $pdf->SetFont('','', $default_font_size - 1);
- $pdf->SetXY($posx+2,$posy+4+(dol_nboflines_bis($carac_client_name,50)*4));
- $pdf->MultiCell($widthrecbox, 4, $carac_client, 0, 'L');
- }
+ $pdf->SetFont('', '', $default_font_size - 1);
+ $pdf->SetXY($posx+2, $posy+4+(dol_nboflines_bis($carac_client_name, 50)*4));
+ $pdf->MultiCell($widthrecbox, 4, $carac_client, 0, 'L');
+ }
- $pdf->SetTextColor(0,0,0);
+ $pdf->SetTextColor(0, 0, 0);
}
/**
@@ -1626,11 +1616,9 @@ function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
* @param int $hidefreetext 1=Hide free text
* @return int Return height of bottom margin including footer text
*/
- function _pagefoot(&$pdf,$object,$outputlangs,$hidefreetext=0)
+ public function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext=0)
{
- $showdetails=0;
- return pdf_pagefoot($pdf,$outputlangs,'FACTURE_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
+ $showdetails=0;
+ return pdf_pagefoot($pdf, $outputlangs, 'FACTURE_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
}
-
}
-
diff --git a/core/modules/modSubtotal.class.php b/core/modules/modSubtotal.class.php
index d98c1d0c..ef3c4cf7 100644
--- a/core/modules/modSubtotal.class.php
+++ b/core/modules/modSubtotal.class.php
@@ -112,7 +112,7 @@ public function __construct($db)
// List of modules id that must be enabled if this module is enabled
$this->depends = array();
- $this->conflictwith=array('modMilestone');
+ $this->conflictwith=array('modMilestone');
// List of modules id to disable if this one is disabled
$this->requiredby = array();
// Minimum version of PHP required by module
@@ -432,7 +432,7 @@ public function __construct($db)
*/
public function init($options = '')
{
- global $conf;
+ global $conf;
/* if($conf->milestone->enabled) {
@@ -443,7 +443,7 @@ public function init($options = '')
$result = $this->loadTables();
- dolibarr_set_const($this->db, 'SUBTOTAL_MANAGE_SUBSUBTOTAL', isset($conf->global->SUBTOTAL_MANAGE_SUBSUBTOTAL) ? $conf->global->SUBTOTAL_MANAGE_SUBSUBTOTAL : 0 ,'integer',1,'Gère ou pas les sous-sous-totaux',0);
+ dolibarr_set_const($this->db, 'SUBTOTAL_MANAGE_SUBSUBTOTAL', isset($conf->global->SUBTOTAL_MANAGE_SUBSUBTOTAL) ? $conf->global->SUBTOTAL_MANAGE_SUBSUBTOTAL : 0, 'integer', 1, 'Gère ou pas les sous-sous-totaux', 0);
return $this->_init($sql, $options);
}
diff --git a/core/modules/propale/doc/pdf_azur_subtotal.modules.php b/core/modules/propale/doc/pdf_azur_subtotal.modules.php
index 3c54e160..11e67e58 100644
--- a/core/modules/propale/doc/pdf_azur_subtotal.modules.php
+++ b/core/modules/propale/doc/pdf_azur_subtotal.modules.php
@@ -37,23 +37,23 @@
*/
class pdf_azur_subtotal extends ModelePDFPropales
{
- var $db;
- var $name;
- var $description;
- var $type;
+ public $db;
+ public $name;
+ public $description;
+ public $type;
- var $phpmin = array(4,3,0); // Minimum version of PHP required by module
- var $version = 'dolibarr';
+ public $phpmin = array(4,3,0); // Minimum version of PHP required by module
+ public $version = 'dolibarr';
- var $page_largeur;
- var $page_hauteur;
- var $format;
- var $marge_gauche;
- var $marge_droite;
- var $marge_haute;
- var $marge_basse;
+ public $page_largeur;
+ public $page_hauteur;
+ public $format;
+ public $marge_gauche;
+ public $marge_droite;
+ public $marge_haute;
+ public $marge_basse;
- var $emetteur; // Objet societe qui emet
+ public $emetteur; // Objet societe qui emet
/**
@@ -61,29 +61,29 @@ class pdf_azur_subtotal extends ModelePDFPropales
*
* @param DoliDB $db Database handler
*/
- function __construct($db)
+ public function __construct($db)
{
- global $conf,$langs,$mysoc;
+ global $conf,$langs,$mysoc;
- $langs->load("main");
- $langs->load("bills");
+ $langs->load("main");
+ $langs->load("bills");
- $this->db = $db;
- $this->name = "azur_subtotal";
- $this->description = 'Modèle de proposition commerciale incluant des spécificités du module sous-total';
+ $this->db = $db;
+ $this->name = "azur_subtotal";
+ $this->description = 'Modèle de proposition commerciale incluant des spécificités du module sous-total';
// Dimension page pour format A4
$this->type = 'pdf';
- $formatarray=pdf_getFormat();
- $this->page_largeur = $formatarray['width'];
- $this->page_hauteur = $formatarray['height'];
- $this->format = array($this->page_largeur,$this->page_hauteur);
- $this->marge_gauche=isset($conf->global->MAIN_PDF_MARGIN_LEFT)?$conf->global->MAIN_PDF_MARGIN_LEFT:10;
- $this->marge_droite=isset($conf->global->MAIN_PDF_MARGIN_RIGHT)?$conf->global->MAIN_PDF_MARGIN_RIGHT:10;
- $this->marge_haute =isset($conf->global->MAIN_PDF_MARGIN_TOP)?$conf->global->MAIN_PDF_MARGIN_TOP:10;
- $this->marge_basse =isset($conf->global->MAIN_PDF_MARGIN_BOTTOM)?$conf->global->MAIN_PDF_MARGIN_BOTTOM:10;
-
- $this->option_logo = 1; // Affiche logo
+ $formatarray=pdf_getFormat();
+ $this->page_largeur = $formatarray['width'];
+ $this->page_hauteur = $formatarray['height'];
+ $this->format = array($this->page_largeur,$this->page_hauteur);
+ $this->marge_gauche=isset($conf->global->MAIN_PDF_MARGIN_LEFT)?$conf->global->MAIN_PDF_MARGIN_LEFT:10;
+ $this->marge_droite=isset($conf->global->MAIN_PDF_MARGIN_RIGHT)?$conf->global->MAIN_PDF_MARGIN_RIGHT:10;
+ $this->marge_haute =isset($conf->global->MAIN_PDF_MARGIN_TOP)?$conf->global->MAIN_PDF_MARGIN_TOP:10;
+ $this->marge_basse =isset($conf->global->MAIN_PDF_MARGIN_BOTTOM)?$conf->global->MAIN_PDF_MARGIN_BOTTOM:10;
+
+ $this->option_logo = 1; // Affiche logo
$this->option_tva = 1; // Gere option tva FACTURE_TVAOPTION
$this->option_modereg = 1; // Affiche mode reglement
$this->option_condreg = 1; // Affiche conditions reglement
@@ -98,32 +98,37 @@ function __construct($db)
// Get source company
$this->emetteur=$mysoc;
- if (empty($this->emetteur->country_code)) $this->emetteur->country_code=substr($langs->defaultlang,-2); // By default, if was not defined
+ if (empty($this->emetteur->country_code)) {
+ $this->emetteur->country_code=substr($langs->defaultlang, -2);
+ } // By default, if was not defined
// Define position of columns
$this->posxdesc=$this->marge_gauche+1;
- $this->posxtva=112;
- $this->posxup=126;
- $this->posxqty=145;
- $this->posxdiscount=162;
- $this->postotalht=174;
- if (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) $this->posxtva=$this->posxup;
- $this->posxpicture=$this->posxtva - (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH)?20:$conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH); // width of images
- if ($this->page_largeur < 210) // To work with US executive format
- {
+ $this->posxtva=112;
+ $this->posxup=126;
+ $this->posxqty=145;
+ $this->posxdiscount=162;
+ $this->postotalht=174;
+ if (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) {
+ $this->posxtva=$this->posxup;
+ }
+ $this->posxpicture=$this->posxtva - (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH)?20:$conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH); // width of images
+ if ($this->page_largeur < 210) {
+ // To work with US executive format
+
$this->posxpicture-=20;
- $this->posxtva-=20;
- $this->posxup-=20;
- $this->posxqty-=20;
- $this->posxdiscount-=20;
- $this->postotalht-=20;
+ $this->posxtva-=20;
+ $this->posxup-=20;
+ $this->posxqty-=20;
+ $this->posxdiscount-=20;
+ $this->postotalht-=20;
}
- $this->tva=array();
- $this->localtax1=array();
- $this->localtax2=array();
- $this->atleastoneratenotnull=0;
- $this->atleastonediscount=0;
+ $this->tva=array();
+ $this->localtax1=array();
+ $this->localtax2=array();
+ $this->atleastoneratenotnull=0;
+ $this->atleastonediscount=0;
}
/**
@@ -137,252 +142,237 @@ function __construct($db)
* @param int $hideref Do not show ref
* @return int 1=OK, 0=KO
*/
- function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hidedesc=0,$hideref=0)
+ public function write_file($object, $outputlangs, $srctemplatepath='', $hidedetails=0, $hidedesc=0, $hideref=0)
{
- global $user,$langs,$conf,$mysoc,$db,$hookmanager;
+ global $user,$langs,$conf,$mysoc,$db,$hookmanager;
- if (! is_object($outputlangs)) $outputlangs=$langs;
+ if (! is_object($outputlangs)) {
+ $outputlangs=$langs;
+ }
// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
- if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
+ if (! empty($conf->global->MAIN_USE_FPDF)) {
+ $outputlangs->charset_output='ISO-8859-1';
+ }
- $outputlangs->load("main");
- $outputlangs->load("dict");
- $outputlangs->load("companies");
- $outputlangs->load("bills");
- $outputlangs->load("propal");
- $outputlangs->load("products");
+ $outputlangs->load("main");
+ $outputlangs->load("dict");
+ $outputlangs->load("companies");
+ $outputlangs->load("bills");
+ $outputlangs->load("propal");
+ $outputlangs->load("products");
- $nblignes = count($object->lines);
+ $nblignes = count($object->lines);
// Loop on each lines to detect if there is at least one image to show
$realpatharray=array();
- if (! empty($conf->global->MAIN_GENERATE_PROPOSALS_WITH_PICTURE))
- {
- $objphoto = new Product($this->db);
-
- for ($i = 0 ; $i < $nblignes ; $i++)
- {
- if (empty($object->lines[$i]->fk_product)) continue;
-
- $objphoto->fetch($object->lines[$i]->fk_product);
-
- if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
- {
- $pdir[0] = get_exdir($objphoto->id,2) . $objphoto->id ."/photos/";
- $pdir[1] = dol_sanitizeFileName($objphoto->ref).'/';
- }
- else
- {
- $pdir[0] = dol_sanitizeFileName($objphoto->ref).'/';
- $pdir[1] = get_exdir($objphoto->id,2) . $objphoto->id ."/photos/";
- }
-
- $arephoto = false;
- foreach ($pdir as $midir)
- {
- if (! $arephoto)
- {
- $dir = $conf->product->dir_output.'/'.$midir;
-
- foreach ($objphoto->liste_photos($dir,1) as $key => $obj)
- {
- if (empty($conf->global->CAT_HIGH_QUALITY_IMAGES)) // If CAT_HIGH_QUALITY_IMAGES not defined, we use thumb if defined and then original photo
- {
- if ($obj['photo_vignette'])
- {
- $filename= $obj['photo_vignette'];
+ if (! empty($conf->global->MAIN_GENERATE_PROPOSALS_WITH_PICTURE)) {
+ $objphoto = new Product($this->db);
+
+ for ($i = 0 ; $i < $nblignes ; $i++) {
+ if (empty($object->lines[$i]->fk_product)) {
+ continue;
+ }
+
+ $objphoto->fetch($object->lines[$i]->fk_product);
+
+ if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {
+ $pdir[0] = get_exdir($objphoto->id, 2) . $objphoto->id ."/photos/";
+ $pdir[1] = dol_sanitizeFileName($objphoto->ref).'/';
+ } else {
+ $pdir[0] = dol_sanitizeFileName($objphoto->ref).'/';
+ $pdir[1] = get_exdir($objphoto->id, 2) . $objphoto->id ."/photos/";
+ }
+
+ $arephoto = false;
+ foreach ($pdir as $midir) {
+ if (! $arephoto) {
+ $dir = $conf->product->dir_output.'/'.$midir;
+
+ foreach ($objphoto->liste_photos($dir, 1) as $key => $obj) {
+ if (empty($conf->global->CAT_HIGH_QUALITY_IMAGES)) {
+ // If CAT_HIGH_QUALITY_IMAGES not defined, we use thumb if defined and then original photo
+
+ if ($obj['photo_vignette']) {
+ $filename= $obj['photo_vignette'];
+ } else {
+ $filename=$obj['photo'];
}
- else
- {
- $filename=$obj['photo'];
- }
- }
- else
- {
- $filename=$obj['photo'];
- }
+ } else {
+ $filename=$obj['photo'];
+ }
- $realpath = $dir.$filename;
- $arephoto = true;
- }
- }
- }
+ $realpath = $dir.$filename;
+ $arephoto = true;
+ }
+ }
+ }
- if ($realpath && $arephoto) $realpatharray[$i]=$realpath;
- }
- }
+ if ($realpath && $arephoto) {
+ $realpatharray[$i]=$realpath;
+ }
+ }
+ }
- if (count($realpatharray) == 0) $this->posxpicture=$this->posxtva;
+ if (count($realpatharray) == 0) {
+ $this->posxpicture=$this->posxtva;
+ }
- if ($conf->propal->dir_output)
- {
- $object->fetch_thirdparty();
+ if ($conf->propal->dir_output) {
+ $object->fetch_thirdparty();
// $deja_regle = 0;
// Definition of $dir and $file
- if ($object->specimen)
- {
- $dir = $conf->propal->dir_output;
- $file = $dir . "/SPECIMEN.pdf";
- }
- else
- {
- $objectref = dol_sanitizeFileName($object->ref);
- $dir = $conf->propal->dir_output . "/" . $objectref;
- $file = $dir . "/" . $objectref . ".pdf";
- }
-
- if (! file_exists($dir))
- {
- if (dol_mkdir($dir) < 0)
- {
- $this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
- return 0;
- }
+ if ($object->specimen) {
+ $dir = $conf->propal->dir_output;
+ $file = $dir . "/SPECIMEN.pdf";
+ } else {
+ $objectref = dol_sanitizeFileName($object->ref);
+ $dir = $conf->propal->dir_output . "/" . $objectref;
+ $file = $dir . "/" . $objectref . ".pdf";
}
- if (file_exists($dir))
- {
- // Add pdfgeneration hook
- if (! is_object($hookmanager))
- {
- include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
- $hookmanager=new HookManager($this->db);
+ if (! file_exists($dir)) {
+ if (dol_mkdir($dir) < 0) {
+ $this->error=$langs->transnoentities("ErrorCanNotCreateDir", $dir);
+ return 0;
+ }
+ }
+
+ if (file_exists($dir)) {
+ // Add pdfgeneration hook
+ if (! is_object($hookmanager)) {
+ include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+ $hookmanager=new HookManager($this->db);
}
- $hookmanager->initHooks(array('pdfgeneration'));
- $parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
- global $action;
- $reshook=$hookmanager->executeHooks('beforePDFCreation',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks
+ $hookmanager->initHooks(array('pdfgeneration'));
+ $parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+ global $action;
+ $reshook=$hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
// Create pdf instance
$pdf=pdf_getInstance($this->format);
- $default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
+ $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);
+ $pdf->SetAutoPageBreak(1, 0);
- if (class_exists('TCPDF'))
- {
- $pdf->setPrintHeader(false);
- $pdf->setPrintFooter(false);
- }
- $pdf->SetFont(pdf_getPDFFont($outputlangs));
+ if (class_exists('TCPDF')) {
+ $pdf->setPrintHeader(false);
+ $pdf->setPrintFooter(false);
+ }
+ $pdf->SetFont(pdf_getPDFFont($outputlangs));
// Set path to the background PDF File
- if (empty($conf->global->MAIN_DISABLE_FPDI) && ! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
- {
+ if (empty($conf->global->MAIN_DISABLE_FPDI) && ! empty($conf->global->MAIN_ADD_PDF_BACKGROUND)) {
$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
$tplidx = $pdf->importPage(1);
}
- $pdf->Open();
- $pagenb=0;
- $pdf->SetDrawColor(128,128,128);
+ $pdf->Open();
+ $pagenb=0;
+ $pdf->SetDrawColor(128, 128, 128);
- $pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
- $pdf->SetSubject($outputlangs->transnoentities("CommercialProposal"));
- $pdf->SetCreator("Dolibarr ".DOL_VERSION);
- $pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
- $pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("CommercialProposal"));
- if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+ $pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
+ $pdf->SetSubject($outputlangs->transnoentities("CommercialProposal"));
+ $pdf->SetCreator("Dolibarr ".DOL_VERSION);
+ $pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
+ $pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("CommercialProposal"));
+ if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) {
+ $pdf->SetCompression(false);
+ }
- $pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
+ $pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
// Positionne $this->atleastonediscount si on a au moins une remise
- for ($i = 0 ; $i < $nblignes ; $i++)
- {
- if ($object->lines[$i]->remise_percent)
- {
- $this->atleastonediscount++;
- }
+ for ($i = 0 ; $i < $nblignes ; $i++) {
+ if ($object->lines[$i]->remise_percent) {
+ $this->atleastonediscount++;
+ }
}
- if (empty($this->atleastonediscount))
- {
- $this->posxpicture+=($this->postotalht - $this->posxdiscount);
- $this->posxtva+=($this->postotalht - $this->posxdiscount);
- $this->posxup+=($this->postotalht - $this->posxdiscount);
- $this->posxqty+=($this->postotalht - $this->posxdiscount);
- $this->posxdiscount+=($this->postotalht - $this->posxdiscount);
+ if (empty($this->atleastonediscount)) {
+ $this->posxpicture+=($this->postotalht - $this->posxdiscount);
+ $this->posxtva+=($this->postotalht - $this->posxdiscount);
+ $this->posxup+=($this->postotalht - $this->posxdiscount);
+ $this->posxqty+=($this->postotalht - $this->posxdiscount);
+ $this->posxdiscount+=($this->postotalht - $this->posxdiscount);
//$this->postotalht;
- }
+ }
// New page
$pdf->AddPage();
- if (! empty($tplidx)) $pdf->useTemplate($tplidx);
- $pagenb++;
- $this->_pagehead($pdf, $object, 1, $outputlangs);
- $pdf->SetFont('','', $default_font_size - 1);
- $pdf->MultiCell(0, 3, ''); // Set interline to 3
- $pdf->SetTextColor(0,0,0);
-
- $tab_top = 90;
- $tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)?42:10);
- $tab_height = 130;
- $tab_height_newpage = 150;
+ if (! empty($tplidx)) {
+ $pdf->useTemplate($tplidx);
+ }
+ $pagenb++;
+ $this->_pagehead($pdf, $object, 1, $outputlangs);
+ $pdf->SetFont('', '', $default_font_size - 1);
+ $pdf->MultiCell(0, 3, ''); // Set interline to 3
+ $pdf->SetTextColor(0, 0, 0);
+
+ $tab_top = 90;
+ $tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)?42:10);
+ $tab_height = 130;
+ $tab_height_newpage = 150;
// Affiche notes
$notetoshow=empty($object->note_public)?'':$object->note_public;
- if (! empty($conf->global->MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE))
- {
- // Get first sale rep
- if (is_object($object->thirdparty))
- {
- $salereparray=$object->thirdparty->getSalesRepresentatives($user);
- $salerepobj=new User($this->db);
- $salerepobj->fetch($salereparray[0]['id']);
- if (! empty($salerepobj->signature)) $notetoshow=dol_concatdesc($notetoshow, $salerepobj->signature);
+ if (! empty($conf->global->MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE)) {
+ // Get first sale rep
+ if (is_object($object->thirdparty)) {
+ $salereparray=$object->thirdparty->getSalesRepresentatives($user);
+ $salerepobj=new User($this->db);
+ $salerepobj->fetch($salereparray[0]['id']);
+ if (! empty($salerepobj->signature)) {
+ $notetoshow=dol_concatdesc($notetoshow, $salerepobj->signature);
+ }
}
- }
- if ($notetoshow)
- {
- $tab_top = 88;
+ }
+ if ($notetoshow) {
+ $tab_top = 88;
- $pdf->SetFont('','', $default_font_size - 1);
- $pdf->writeHTMLCell(190, 3, $this->posxdesc-1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
- $nexY = $pdf->GetY();
- $height_note=$nexY-$tab_top;
+ $pdf->SetFont('', '', $default_font_size - 1);
+ $pdf->writeHTMLCell(190, 3, $this->posxdesc-1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
+ $nexY = $pdf->GetY();
+ $height_note=$nexY-$tab_top;
// Rect prend une longueur en 3eme param
- $pdf->SetDrawColor(192,192,192);
- $pdf->Rect($this->marge_gauche, $tab_top-1, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_note+1);
-
- $tab_height = $tab_height - $height_note;
- $tab_top = $nexY+6;
- }
- else
- {
- $height_note=0;
- }
-
- $iniY = $tab_top + 7;
- $curY = $tab_top + 7;
- $nexY = $tab_top + 7;
-
- $inPackage = false;
- $TPackageInfos = array();
- $TChilds = array();
- $package_qty = 0;
- $TStack = array();
+ $pdf->SetDrawColor(192, 192, 192);
+ $pdf->Rect($this->marge_gauche, $tab_top-1, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_note+1);
+
+ $tab_height = $tab_height - $height_note;
+ $tab_top = $nexY+6;
+ } else {
+ $height_note=0;
+ }
+
+ $iniY = $tab_top + 7;
+ $curY = $tab_top + 7;
+ $nexY = $tab_top + 7;
+
+ $inPackage = false;
+ $TPackageInfos = array();
+ $TChilds = array();
+ $package_qty = 0;
+ $TStack = array();
// Loop on each lines
- for ($i = 0 ; $i < $nblignes ; $i++)
- {
- $package_qty = $TStack[count($TStack) - 1]['package_qty'];
- $inPackage = count($TStack) > 0;
+ for ($i = 0 ; $i < $nblignes ; $i++) {
+ $package_qty = $TStack[count($TStack) - 1]['package_qty'];
+ $inPackage = count($TStack) > 0;
// Ligne de titre
if ($object->lines[$i]->product_type == 9 && $object->lines[$i]->qty < 97 && $object->lines[$i]->fk_product > 0) {
- $inPackage = true;
+ $inPackage = true;
- if ($conf->global->SUBTOTAL_SHOW_QTY_ON_TITLES) {
- if (!empty($object->lines[$i]->fk_product)) {
- $product = new Product($db);
- $product->fetch($object->lines[$i]->fk_product);
+ if ($conf->global->SUBTOTAL_SHOW_QTY_ON_TITLES) {
+ if (!empty($object->lines[$i]->fk_product)) {
+ $product = new Product($db);
+ $product->fetch($object->lines[$i]->fk_product);
- $TChilds = $product->getChildsArbo($product->id);
+ $TChilds = $product->getChildsArbo($product->id);
- $TStack[count($TStack)] = array(
+ $TStack[count($TStack)] = array(
'childs' => $TChilds,
'package' => array(),
'package_qty' => 0
@@ -391,157 +381,168 @@ function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hid
// Si on se trouvait déjà dans un package, on rajoute ce produit à la liste des produits
// du précédent package
if (count($TStack) > 1) {
- $TStack[count($TStack) - 2]['package'][$object->lines[$i]->fk_product] += $object->lines[$i]->qty;
+ $TStack[count($TStack) - 2]['package'][$object->lines[$i]->fk_product] += $object->lines[$i]->qty;
}
- }
- }
+ }
+ }
}
- if ($conf->global->SUBTOTAL_SHOW_QTY_ON_TITLES) {
- if ($inPackage && $object->lines[$i]->product_type != 9 && $object->lines[$i]->fk_product > 0) {
- $TStack[count($TStack) - 1]['package'][$object->lines[$i]->fk_product] += $object->lines[$i]->qty;
- }
- }
+ if ($conf->global->SUBTOTAL_SHOW_QTY_ON_TITLES) {
+ if ($inPackage && $object->lines[$i]->product_type != 9 && $object->lines[$i]->fk_product > 0) {
+ $TStack[count($TStack) - 1]['package'][$object->lines[$i]->fk_product] += $object->lines[$i]->qty;
+ }
+ }
// Ligne de sous-total
if ($inPackage && $object->lines[$i]->product_type == 9 && $object->lines[$i]->qty >= 97) {
- if (count($TStack) <= 1) {
- $inPackage = false;
- }
+ if (count($TStack) <= 1) {
+ $inPackage = false;
+ }
- if ($conf->global->SUBTOTAL_SHOW_QTY_ON_TITLES) {
- // Comparaison pour déterminer la quantité de package
+ if ($conf->global->SUBTOTAL_SHOW_QTY_ON_TITLES) {
+ // Comparaison pour déterminer la quantité de package
$TProducts = array_keys($TStack[count($TStack) - 1]['package']);
- $TProductsChilds = array_keys($TStack[count($TStack) - 1]['childs']);
+ $TProductsChilds = array_keys($TStack[count($TStack) - 1]['childs']);
- if ($TProductsChilds == $TProducts) {
- // Il s'agit d'un package
+ if ($TProductsChilds == $TProducts) {
+ // Il s'agit d'un package
// On récupére la quantité
$first_child_id = $TProducts[0];
- $document_qty = $TStack[count($TStack) - 1]['package'][$first_child_id];
- $base_qty = $TStack[count($TStack) - 1]['childs'][$first_child_id][1];
+ $document_qty = $TStack[count($TStack) - 1]['package'][$first_child_id];
+ $base_qty = $TStack[count($TStack) - 1]['childs'][$first_child_id][1];
- $TStack[count($TStack) - 1]['package_qty'] = $document_qty / $base_qty;
- $package_qty = $TStack[count($TStack) - 1]['package_qty'];
- }
+ $TStack[count($TStack) - 1]['package_qty'] = $document_qty / $base_qty;
+ $package_qty = $TStack[count($TStack) - 1]['package_qty'];
+ }
- array_pop($TStack);
- }
+ array_pop($TStack);
+ }
}
- $curY = $nexY;
- $pdf->SetFont('','', $default_font_size - 1); // Into loop to work with multipage
- $pdf->SetTextColor(0,0,0);
+ $curY = $nexY;
+ $pdf->SetFont('', '', $default_font_size - 1); // Into loop to work with multipage
+ $pdf->SetTextColor(0, 0, 0);
// Define size of image if we need it
$imglinesize=array();
- if (! empty($realpatharray[$i])) $imglinesize=pdf_getSizeForImage($realpatharray[$i]);
+ if (! empty($realpatharray[$i])) {
+ $imglinesize=pdf_getSizeForImage($realpatharray[$i]);
+ }
- $pdf->setTopMargin($tab_top_newpage);
- $pdf->setPageOrientation('', 1, $heightforfooter+$heightforfreetext+$heightforinfotot); // The only function to edit the bottom margin of current page to set it.
+ $pdf->setTopMargin($tab_top_newpage);
+ $pdf->setPageOrientation('', 1, $heightforfooter+$heightforfreetext+$heightforinfotot); // The only function to edit the bottom margin of current page to set it.
$pageposbefore=$pdf->getPage();
- $showpricebeforepagebreak=1;
- $posYAfterImage=0;
- $posYAfterDescription=0;
+ $showpricebeforepagebreak=1;
+ $posYAfterImage=0;
+ $posYAfterDescription=0;
// We start with Photo of product line
- if (isset($imglinesize['width']) && isset($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur-($heightforfooter+$heightforfreetext+$heightforinfotot))) // If photo too high, we moved completely on new page
- {
- $pdf->AddPage('','',true);
- if (! empty($tplidx)) $pdf->useTemplate($tplidx);
- if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
- $pdf->setPage($pageposbefore+1);
-
- $curY = $tab_top_newpage;
- $showpricebeforepagebreak=0;
+ if (isset($imglinesize['width']) && isset($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur-($heightforfooter+$heightforfreetext+$heightforinfotot))) {
+ // If photo too high, we moved completely on new page
+
+ $pdf->AddPage('', '', true);
+ if (! empty($tplidx)) {
+ $pdf->useTemplate($tplidx);
+ }
+ if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+ $this->_pagehead($pdf, $object, 0, $outputlangs);
+ }
+ $pdf->setPage($pageposbefore+1);
+
+ $curY = $tab_top_newpage;
+ $showpricebeforepagebreak=0;
}
- if (isset($imglinesize['width']) && isset($imglinesize['height']))
- {
- $curX = $this->posxpicture-1;
- $pdf->Image($realpatharray[$i], $curX + (($this->posxtva-$this->posxpicture-$imglinesize['width'])/2), $curY, $imglinesize['width'], $imglinesize['height'], '', '', '', 2, 300); // Use 300 dpi
+ if (isset($imglinesize['width']) && isset($imglinesize['height'])) {
+ $curX = $this->posxpicture-1;
+ $pdf->Image($realpatharray[$i], $curX + (($this->posxtva-$this->posxpicture-$imglinesize['width'])/2), $curY, $imglinesize['width'], $imglinesize['height'], '', '', '', 2, 300); // Use 300 dpi
// $pdf->Image does not increase value return by getY, so we save it manually
$posYAfterImage=$curY+$imglinesize['height'];
- }
+ }
// Description of product line
$curX = $this->posxdesc-1;
- $pdf->startTransaction();
- pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxpicture-$curX,3,$curX,$curY,$hideref,$hidedesc);
+ $pdf->startTransaction();
+ pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->posxpicture-$curX, 3, $curX, $curY, $hideref, $hidedesc);
+
+ $pageposafter=$pdf->getPage();
+ if ($pageposafter > $pageposbefore) {
+ // There is a pagebreak
- $pageposafter=$pdf->getPage();
- if ($pageposafter > $pageposbefore) // There is a pagebreak
- {
$pdf->rollbackTransaction(true);
- $pageposafter=$pageposbefore;
+ $pageposafter=$pageposbefore;
//print $pageposafter.'-'.$pageposbefore;exit;
$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
- pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxpicture-$curX,3,$curX,$curY,$hideref,$hidedesc);
+ pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->posxpicture-$curX, 3, $curX, $curY, $hideref, $hidedesc);
- $pageposafter=$pdf->getPage();
- $posyafter=$pdf->GetY();
+ $pageposafter=$pdf->getPage();
+ $posyafter=$pdf->GetY();
//var_dump($posyafter); var_dump(($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))); exit;
- if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))) // There is no space left for total+free text
- {
- if ($i == ($nblignes-1)) // No more lines, and no space left to show total, so we create a new page
- {
- $pdf->AddPage('','',true);
- if (! empty($tplidx)) $pdf->useTemplate($tplidx);
- if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
- $pdf->setPage($pageposafter+1);
+ if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))) {
+ // There is no space left for total+free text
+
+ if ($i == ($nblignes-1)) {
+ // No more lines, and no space left to show total, so we create a new page
+
+ $pdf->AddPage('', '', true);
+ if (! empty($tplidx)) {
+ $pdf->useTemplate($tplidx);
+ }
+ if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+ $this->_pagehead($pdf, $object, 0, $outputlangs);
+ }
+ $pdf->setPage($pageposafter+1);
}
- }
- else
- {
- // We found a page break
+ } else {
+ // We found a page break
$showpricebeforepagebreak=0;
}
- }
- else // No pagebreak
- {
+ } else {
+ // No pagebreak
+
$pdf->commitTransaction();
- }
- $posYAfterDescription=$pdf->GetY();
+ }
+ $posYAfterDescription=$pdf->GetY();
- $nexY = $pdf->GetY();
- $pageposafter=$pdf->getPage();
+ $nexY = $pdf->GetY();
+ $pageposafter=$pdf->getPage();
- $pdf->setPage($pageposbefore);
- $pdf->setTopMargin($this->marge_haute);
- $pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+ $pdf->setPage($pageposbefore);
+ $pdf->setTopMargin($this->marge_haute);
+ $pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
// We suppose that a too long description or photo were moved completely on next page
if ($pageposafter > $pageposbefore && empty($showpricebeforepagebreak)) {
- $pdf->setPage($pageposafter); $curY = $tab_top_newpage;
+ $pdf->setPage($pageposafter);
+ $curY = $tab_top_newpage;
}
- $pdf->SetFont('','', $default_font_size - 1); // On repositionne la police par defaut
+ $pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par defaut
// VAT Rate
- if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
- {
- // Si on ne doit masquer que les sous-produits
+ if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) {
+ // Si on ne doit masquer que les sous-produits
if ($hidedetails && !$inPackage && $conf->global->SUBTOTAL_ONLY_HIDE_SUBPRODUCTS_PRICES) {
- $vat_rate = pdf_getlinevatrate($object, $i, $outputlangs, 0);
+ $vat_rate = pdf_getlinevatrate($object, $i, $outputlangs, 0);
} else {
- $vat_rate = pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails);
+ $vat_rate = pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails);
}
- $pdf->SetXY($this->posxtva, $curY);
- $pdf->MultiCell($this->posxup-$this->posxtva-0.8, 3, $vat_rate, 0, 'R');
+ $pdf->SetXY($this->posxtva, $curY);
+ $pdf->MultiCell($this->posxup-$this->posxtva-0.8, 3, $vat_rate, 0, 'R');
}
// Unit price before discount
if ($hidedetails && !$inPackage && $conf->global->SUBTOTAL_ONLY_HIDE_SUBPRODUCTS_PRICES) {
- $up_excl_tax = pdf_getlineupexcltax($object, $i, $outputlangs, 0);
+ $up_excl_tax = pdf_getlineupexcltax($object, $i, $outputlangs, 0);
} else {
- $up_excl_tax = pdf_getlineupexcltax($object, $i, $outputlangs, $hidedetails);
+ $up_excl_tax = pdf_getlineupexcltax($object, $i, $outputlangs, $hidedetails);
}
- $pdf->SetXY($this->posxup, $curY);
- $pdf->MultiCell($this->posxqty-$this->posxup-0.8, 3, $up_excl_tax, 0, 'R', 0);
+ $pdf->SetXY($this->posxup, $curY);
+ $pdf->MultiCell($this->posxqty-$this->posxup-0.8, 3, $up_excl_tax, 0, 'R', 0);
// Booléen pour déterminer s'il s'agit d'une ligne de titre ou non
$isTitle = false;
@@ -551,144 +552,152 @@ function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hid
// Récupération de la quantité à afficher
if ($conf->global->SUBTOTAL_IF_HIDE_PRICES_SHOW_QTY) {
- if ($conf->global->SUBTOTAL_SHOW_QTY_ON_TITLES && $package_qty > 0) {
- $qty = $package_qty;
- } else {
- $qty = pdf_getlineqty($object, $i, $outputlangs, 0);
- }
+ if ($conf->global->SUBTOTAL_SHOW_QTY_ON_TITLES && $package_qty > 0) {
+ $qty = $package_qty;
+ } else {
+ $qty = pdf_getlineqty($object, $i, $outputlangs, 0);
+ }
} else {
- if ($conf->global->SUBTOTAL_SHOW_QTY_ON_TITLES && $package_qty > 0) {
- $qty = $package_qty;
- } else {
- $qty = pdf_getlineqty($object, $i, $outputlangs, $hidedetails);
- }
+ if ($conf->global->SUBTOTAL_SHOW_QTY_ON_TITLES && $package_qty > 0) {
+ $qty = $package_qty;
+ } else {
+ $qty = pdf_getlineqty($object, $i, $outputlangs, $hidedetails);
+ }
}
- $pdf->SetXY($this->posxqty, $curY);
- $pdf->MultiCell($this->posxdiscount-$this->posxqty-0.8, 3, $qty, 0, 'R'); // Enough for 6 chars
+ $pdf->SetXY($this->posxqty, $curY);
+ $pdf->MultiCell($this->posxdiscount-$this->posxqty-0.8, 3, $qty, 0, 'R'); // Enough for 6 chars
// Discount on line
- if ($object->lines[$i]->remise_percent)
- {
- $pdf->SetXY($this->posxdiscount-2, $curY);
- $remise_percent = pdf_getlineremisepercent($object, $i, $outputlangs, $hidedetails);
- $pdf->MultiCell($this->postotalht-$this->posxdiscount+2, 3, $remise_percent, 0, 'R');
+ if ($object->lines[$i]->remise_percent) {
+ $pdf->SetXY($this->posxdiscount-2, $curY);
+ $remise_percent = pdf_getlineremisepercent($object, $i, $outputlangs, $hidedetails);
+ $pdf->MultiCell($this->postotalht-$this->posxdiscount+2, 3, $remise_percent, 0, 'R');
}
// Total HT line
if ($hidedetails && !$inPackage && $conf->global->SUBTOTAL_ONLY_HIDE_SUBPRODUCTS_PRICES) {
- $total_excl_tax = pdf_getlinetotalexcltax($object, $i, $outputlangs, 0);
+ $total_excl_tax = pdf_getlinetotalexcltax($object, $i, $outputlangs, 0);
} else {
- $total_excl_tax = pdf_getlinetotalexcltax($object, $i, $outputlangs, $hidedetails);
+ $total_excl_tax = pdf_getlinetotalexcltax($object, $i, $outputlangs, $hidedetails);
}
- $pdf->SetXY($this->postotalht, $curY);
- $pdf->MultiCell($this->page_largeur-$this->marge_droite-$this->postotalht, 3, $total_excl_tax, 0, 'R', 0);
+ $pdf->SetXY($this->postotalht, $curY);
+ $pdf->MultiCell($this->page_largeur-$this->marge_droite-$this->postotalht, 3, $total_excl_tax, 0, 'R', 0);
// Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva
$tvaligne=$object->lines[$i]->total_tva;
- $localtax1ligne=$object->lines[$i]->total_localtax1;
- $localtax2ligne=$object->lines[$i]->total_localtax2;
- $localtax1_rate=$object->lines[$i]->localtax1_tx;
- $localtax2_rate=$object->lines[$i]->localtax2_tx;
- $localtax1_type=$object->lines[$i]->localtax1_type;
- $localtax2_type=$object->lines[$i]->localtax2_type;
-
- if ($object->remise_percent) $tvaligne-=($tvaligne*$object->remise_percent)/100;
- if ($object->remise_percent) $localtax1ligne-=($localtax1ligne*$object->remise_percent)/100;
- if ($object->remise_percent) $localtax2ligne-=($localtax2ligne*$object->remise_percent)/100;
-
- $vatrate=(string) $object->lines[$i]->tva_tx;
+ $localtax1ligne=$object->lines[$i]->total_localtax1;
+ $localtax2ligne=$object->lines[$i]->total_localtax2;
+ $localtax1_rate=$object->lines[$i]->localtax1_tx;
+ $localtax2_rate=$object->lines[$i]->localtax2_tx;
+ $localtax1_type=$object->lines[$i]->localtax1_type;
+ $localtax2_type=$object->lines[$i]->localtax2_type;
+
+ if ($object->remise_percent) {
+ $tvaligne-=($tvaligne*$object->remise_percent)/100;
+ }
+ if ($object->remise_percent) {
+ $localtax1ligne-=($localtax1ligne*$object->remise_percent)/100;
+ }
+ if ($object->remise_percent) {
+ $localtax2ligne-=($localtax2ligne*$object->remise_percent)/100;
+ }
+
+ $vatrate=(string) $object->lines[$i]->tva_tx;
// Retrieve type from database for backward compatibility with old records
if ((! isset($localtax1_type) || $localtax1_type=='' || ! isset($localtax2_type) || $localtax2_type=='') // if tax type not defined
- && (! empty($localtax1_rate) || ! empty($localtax2_rate))) // and there is local tax
- {
- $localtaxtmp_array=getLocalTaxesFromRate($vatrate,0,$object->thirdparty,$mysoc);
- $localtax1_type = $localtaxtmp_array[0];
- $localtax2_type = $localtaxtmp_array[2];
+ && (! empty($localtax1_rate) || ! empty($localtax2_rate))) {
+ // and there is local tax
+
+ $localtaxtmp_array=getLocalTaxesFromRate($vatrate, 0, $object->thirdparty, $mysoc);
+ $localtax1_type = $localtaxtmp_array[0];
+ $localtax2_type = $localtaxtmp_array[2];
}
// retrieve global local tax
- if ($localtax1_type && $localtax1ligne != 0)
- $this->localtax1[$localtax1_type][$localtax1_rate]+=$localtax1ligne;
- if ($localtax2_type && $localtax2ligne != 0)
- $this->localtax2[$localtax2_type][$localtax2_rate]+=$localtax2ligne;
-
- if (($object->lines[$i]->info_bits & 0x01) == 0x01) $vatrate.='*';
- if (! isset($this->tva[$vatrate])) $this->tva[$vatrate]='';
- $this->tva[$vatrate] += $tvaligne;
-
- if ($posYAfterImage > $posYAfterDescription) $nexY=$posYAfterImage;
+ if ($localtax1_type && $localtax1ligne != 0) {
+ $this->localtax1[$localtax1_type][$localtax1_rate]+=$localtax1ligne;
+ }
+ if ($localtax2_type && $localtax2ligne != 0) {
+ $this->localtax2[$localtax2_type][$localtax2_rate]+=$localtax2ligne;
+ }
+
+ if (($object->lines[$i]->info_bits & 0x01) == 0x01) {
+ $vatrate.='*';
+ }
+ if (! isset($this->tva[$vatrate])) {
+ $this->tva[$vatrate]='';
+ }
+ $this->tva[$vatrate] += $tvaligne;
+
+ if ($posYAfterImage > $posYAfterDescription) {
+ $nexY=$posYAfterImage;
+ }
// Add line
- if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
- {
- $pdf->setPage($pageposafter);
- $pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(210,210,210)));
+ if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1)) {
+ $pdf->setPage($pageposafter);
+ $pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(210,210,210)));
//$pdf->SetDrawColor(190,190,200);
$pdf->line($this->marge_gauche, $nexY+1, $this->page_largeur - $this->marge_droite, $nexY+1);
- $pdf->SetLineStyle(array('dash'=>0));
+ $pdf->SetLineStyle(array('dash'=>0));
}
- $nexY+=2; // Passe espace entre les lignes
+ $nexY+=2; // Passe espace entre les lignes
// Detect if some page were added automatically and output _tableau for past pages
- while ($pagenb < $pageposafter)
- {
- $pdf->setPage($pagenb);
- if ($pagenb == 1)
- {
- $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
+ while ($pagenb < $pageposafter) {
+ $pdf->setPage($pagenb);
+ if ($pagenb == 1) {
+ $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
+ } else {
+ $this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
+ }
+ $this->_pagefoot($pdf, $object, $outputlangs, 1);
+ $pagenb++;
+ $pdf->setPage($pagenb);
+ $pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+ if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+ $this->_pagehead($pdf, $object, 0, $outputlangs);
}
- else
- {
- $this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
- }
- $this->_pagefoot($pdf,$object,$outputlangs,1);
- $pagenb++;
- $pdf->setPage($pagenb);
- $pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
- if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
}
- if (isset($object->lines[$i+1]->pagebreak) && $object->lines[$i+1]->pagebreak)
- {
- if ($pagenb == 1)
- {
- $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
- }
- else
- {
- $this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
- }
- $this->_pagefoot($pdf,$object,$outputlangs,1);
+ if (isset($object->lines[$i+1]->pagebreak) && $object->lines[$i+1]->pagebreak) {
+ if ($pagenb == 1) {
+ $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
+ } else {
+ $this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
+ }
+ $this->_pagefoot($pdf, $object, $outputlangs, 1);
// New page
$pdf->AddPage();
- if (! empty($tplidx)) $pdf->useTemplate($tplidx);
- $pagenb++;
- if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
- }
+ if (! empty($tplidx)) {
+ $pdf->useTemplate($tplidx);
+ }
+ $pagenb++;
+ if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+ $this->_pagehead($pdf, $object, 0, $outputlangs);
+ }
+ }
}
// Show square
- if ($pagenb == 1)
- {
- $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
- $bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
- }
- else
- {
- $this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
- $bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
+ if ($pagenb == 1) {
+ $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
+ $bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
+ } else {
+ $this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
+ $bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
}
// Affiche zone infos
$posy=$this->_tableau_info($pdf, $object, $bottomlasttab, $outputlangs);
- if (!$conf->global->SUBTOTAL_HIDE_DOCUMENT_TOTAL) {
- // Affiche zone totaux
+ if (!$conf->global->SUBTOTAL_HIDE_DOCUMENT_TOTAL) {
+ // Affiche zone totaux
$posy=$this->_tableau_tot($pdf, $object, 0, $bottomlasttab, $outputlangs);
- }
+ }
// Affiche zone versements
/*
@@ -699,38 +708,37 @@ function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hid
*/
// Pied de page
- $this->_pagefoot($pdf,$object,$outputlangs);
- if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
+ $this->_pagefoot($pdf, $object, $outputlangs);
+ if (method_exists($pdf, 'AliasNbPages')) {
+ $pdf->AliasNbPages();
+ }
- $pdf->Close();
+ $pdf->Close();
- $pdf->Output($file,'F');
+ $pdf->Output($file, 'F');
//Add pdfgeneration hook
$hookmanager->initHooks(array('pdfgeneration'));
- $parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
- global $action;
- $reshook=$hookmanager->executeHooks('afterPDFCreation',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks
-
- if (! empty($conf->global->MAIN_UMASK))
- @chmod($file, octdec($conf->global->MAIN_UMASK));
+ $parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+ global $action;
+ $reshook=$hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
- return 1; // Pas d'erreur
- }
- else
- {
- $this->error=$langs->trans("ErrorCanNotCreateDir",$dir);
- return 0;
- }
- }
- else
- {
- $this->error=$langs->trans("ErrorConstantNotDefined","PROP_OUTPUTDIR");
- return 0;
- }
+ if (! empty($conf->global->MAIN_UMASK)) {
+ @chmod($file, octdec($conf->global->MAIN_UMASK));
+ }
- $this->error=$langs->trans("ErrorUnknown");
- return 0; // Erreur par defaut
+ return 1; // Pas d'erreur
+ } else {
+ $this->error=$langs->trans("ErrorCanNotCreateDir", $dir);
+ return 0;
+ }
+ } else {
+ $this->error=$langs->trans("ErrorConstantNotDefined", "PROP_OUTPUTDIR");
+ return 0;
+ }
+
+ $this->error=$langs->trans("ErrorUnknown");
+ return 0; // Erreur par defaut
}
/**
@@ -742,9 +750,8 @@ function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hid
* @param Translate $outputlangs Object langs for output
* @return int <0 if KO, >0 if OK
*/
- function _tableau_versements(&$pdf, $object, $posy, $outputlangs)
+ public function _tableau_versements(&$pdf, $object, $posy, $outputlangs)
{
-
}
@@ -757,76 +764,72 @@ function _tableau_versements(&$pdf, $object, $posy, $outputlangs)
* @param Translate $outputlangs Langs object
* @return void
*/
- function _tableau_info(&$pdf, $object, $posy, $outputlangs)
+ public function _tableau_info(&$pdf, $object, $posy, $outputlangs)
{
- global $conf;
- $default_font_size = pdf_getPDFFontSize($outputlangs);
+ global $conf;
+ $default_font_size = pdf_getPDFFontSize($outputlangs);
- $pdf->SetFont('','', $default_font_size - 1);
+ $pdf->SetFont('', '', $default_font_size - 1);
// If France, show VAT mention if not applicable
- if ($this->emetteur->country_code == 'FR' && $this->franchise == 1)
- {
- $pdf->SetFont('','B', $default_font_size - 2);
- $pdf->SetXY($this->marge_gauche, $posy);
- $pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedForInvoice"), 0, 'L', 0);
+ if ($this->emetteur->country_code == 'FR' && $this->franchise == 1) {
+ $pdf->SetFont('', 'B', $default_font_size - 2);
+ $pdf->SetXY($this->marge_gauche, $posy);
+ $pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedForInvoice"), 0, 'L', 0);
- $posy=$pdf->GetY()+4;
+ $posy=$pdf->GetY()+4;
}
- $posxval=52;
+ $posxval=52;
// Show shipping date
- if (! empty($object->date_livraison))
- {
+ if (! empty($object->date_livraison)) {
$outputlangs->load("sendings");
- $pdf->SetFont('','B', $default_font_size - 2);
- $pdf->SetXY($this->marge_gauche, $posy);
- $titre = $outputlangs->transnoentities("DateDeliveryPlanned").':';
- $pdf->MultiCell(80, 4, $titre, 0, 'L');
- $pdf->SetFont('','', $default_font_size - 2);
- $pdf->SetXY($posxval, $posy);
- $dlp=dol_print_date($object->date_livraison,"daytext",false,$outputlangs,true);
- $pdf->MultiCell(80, 4, $dlp, 0, 'L');
+ $pdf->SetFont('', 'B', $default_font_size - 2);
+ $pdf->SetXY($this->marge_gauche, $posy);
+ $titre = $outputlangs->transnoentities("DateDeliveryPlanned").':';
+ $pdf->MultiCell(80, 4, $titre, 0, 'L');
+ $pdf->SetFont('', '', $default_font_size - 2);
+ $pdf->SetXY($posxval, $posy);
+ $dlp=dol_print_date($object->date_livraison, "daytext", false, $outputlangs, true);
+ $pdf->MultiCell(80, 4, $dlp, 0, 'L');
$posy=$pdf->GetY()+1;
- }
- elseif ($object->availability_code || $object->availability) // Show availability conditions
- {
- $pdf->SetFont('','B', $default_font_size - 2);
- $pdf->SetXY($this->marge_gauche, $posy);
- $titre = $outputlangs->transnoentities("AvailabilityPeriod").':';
- $pdf->MultiCell(80, 4, $titre, 0, 'L');
- $pdf->SetTextColor(0,0,0);
- $pdf->SetFont('','', $default_font_size - 2);
- $pdf->SetXY($posxval, $posy);
- $lib_availability=$outputlangs->transnoentities("AvailabilityType".$object->availability_code)!=('AvailabilityType'.$object->availability_code)?$outputlangs->transnoentities("AvailabilityType".$object->availability_code):$outputlangs->convToOutputCharset($object->availability);
- $lib_availability=str_replace('\n',"\n",$lib_availability);
- $pdf->MultiCell(80, 4, $lib_availability, 0, 'L');
-
- $posy=$pdf->GetY()+1;
- }
+ } elseif ($object->availability_code || $object->availability) {
+ // Show availability conditions
+
+ $pdf->SetFont('', 'B', $default_font_size - 2);
+ $pdf->SetXY($this->marge_gauche, $posy);
+ $titre = $outputlangs->transnoentities("AvailabilityPeriod").':';
+ $pdf->MultiCell(80, 4, $titre, 0, 'L');
+ $pdf->SetTextColor(0, 0, 0);
+ $pdf->SetFont('', '', $default_font_size - 2);
+ $pdf->SetXY($posxval, $posy);
+ $lib_availability=$outputlangs->transnoentities("AvailabilityType".$object->availability_code)!=('AvailabilityType'.$object->availability_code)?$outputlangs->transnoentities("AvailabilityType".$object->availability_code):$outputlangs->convToOutputCharset($object->availability);
+ $lib_availability=str_replace('\n', "\n", $lib_availability);
+ $pdf->MultiCell(80, 4, $lib_availability, 0, 'L');
+
+ $posy=$pdf->GetY()+1;
+ }
// Show payments conditions
- if (empty($conf->global->PROPALE_PDF_HIDE_PAYMENTTERMCOND) && ($object->cond_reglement_code || $object->cond_reglement))
- {
- $pdf->SetFont('','B', $default_font_size - 2);
- $pdf->SetXY($this->marge_gauche, $posy);
- $titre = $outputlangs->transnoentities("PaymentConditions").':';
- $pdf->MultiCell(80, 4, $titre, 0, 'L');
-
- $pdf->SetFont('','', $default_font_size - 2);
- $pdf->SetXY($posxval, $posy);
- $lib_condition_paiement=$outputlangs->transnoentities("PaymentCondition".$object->cond_reglement_code)!=('PaymentCondition'.$object->cond_reglement_code)?$outputlangs->transnoentities("PaymentCondition".$object->cond_reglement_code):$outputlangs->convToOutputCharset($object->cond_reglement_doc);
- $lib_condition_paiement=str_replace('\n',"\n",$lib_condition_paiement);
- $pdf->MultiCell(80, 4, $lib_condition_paiement,0,'L');
-
- $posy=$pdf->GetY()+3;
+ if (empty($conf->global->PROPALE_PDF_HIDE_PAYMENTTERMCOND) && ($object->cond_reglement_code || $object->cond_reglement)) {
+ $pdf->SetFont('', 'B', $default_font_size - 2);
+ $pdf->SetXY($this->marge_gauche, $posy);
+ $titre = $outputlangs->transnoentities("PaymentConditions").':';
+ $pdf->MultiCell(80, 4, $titre, 0, 'L');
+
+ $pdf->SetFont('', '', $default_font_size - 2);
+ $pdf->SetXY($posxval, $posy);
+ $lib_condition_paiement=$outputlangs->transnoentities("PaymentCondition".$object->cond_reglement_code)!=('PaymentCondition'.$object->cond_reglement_code)?$outputlangs->transnoentities("PaymentCondition".$object->cond_reglement_code):$outputlangs->convToOutputCharset($object->cond_reglement_doc);
+ $lib_condition_paiement=str_replace('\n', "\n", $lib_condition_paiement);
+ $pdf->MultiCell(80, 4, $lib_condition_paiement, 0, 'L');
+
+ $posy=$pdf->GetY()+3;
}
- if (empty($conf->global->PROPALE_PDF_HIDE_PAYMENTTERMCOND))
- {
- // Check a payment mode is defined
+ if (empty($conf->global->PROPALE_PDF_HIDE_PAYMENTTERMCOND)) {
+ // Check a payment mode is defined
/* Not required on a proposal
if (empty($object->mode_reglement_code)
&& ! $conf->global->FACTURE_CHQ_NUMBER
@@ -845,84 +848,75 @@ function _tableau_info(&$pdf, $object, $posy, $outputlangs)
// Show payment mode
if ($object->mode_reglement_code
&& $object->mode_reglement_code != 'CHQ'
- && $object->mode_reglement_code != 'VIR')
- {
- $pdf->SetFont('','B', $default_font_size - 2);
- $pdf->SetXY($this->marge_gauche, $posy);
- $titre = $outputlangs->transnoentities("PaymentMode").':';
- $pdf->MultiCell(80, 5, $titre, 0, 'L');
- $pdf->SetFont('','', $default_font_size - 2);
- $pdf->SetXY($posxval, $posy);
- $lib_mode_reg=$outputlangs->transnoentities("PaymentType".$object->mode_reglement_code)!=('PaymentType'.$object->mode_reglement_code)?$outputlangs->transnoentities("PaymentType".$object->mode_reglement_code):$outputlangs->convToOutputCharset($object->mode_reglement);
- $pdf->MultiCell(80, 5, $lib_mode_reg,0,'L');
-
- $posy=$pdf->GetY()+2;
+ && $object->mode_reglement_code != 'VIR') {
+ $pdf->SetFont('', 'B', $default_font_size - 2);
+ $pdf->SetXY($this->marge_gauche, $posy);
+ $titre = $outputlangs->transnoentities("PaymentMode").':';
+ $pdf->MultiCell(80, 5, $titre, 0, 'L');
+ $pdf->SetFont('', '', $default_font_size - 2);
+ $pdf->SetXY($posxval, $posy);
+ $lib_mode_reg=$outputlangs->transnoentities("PaymentType".$object->mode_reglement_code)!=('PaymentType'.$object->mode_reglement_code)?$outputlangs->transnoentities("PaymentType".$object->mode_reglement_code):$outputlangs->convToOutputCharset($object->mode_reglement);
+ $pdf->MultiCell(80, 5, $lib_mode_reg, 0, 'L');
+
+ $posy=$pdf->GetY()+2;
}
// Show payment mode CHQ
- if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'CHQ')
- {
- // Si mode reglement non force ou si force a CHQ
- if (! empty($conf->global->FACTURE_CHQ_NUMBER))
- {
- $diffsizetitle=(empty($conf->global->PDF_DIFFSIZE_TITLE)?3:$conf->global->PDF_DIFFSIZE_TITLE);
-
- if ($conf->global->FACTURE_CHQ_NUMBER > 0)
- {
- $account = new Account($this->db);
- $account->fetch($conf->global->FACTURE_CHQ_NUMBER);
-
- $pdf->SetXY($this->marge_gauche, $posy);
- $pdf->SetFont('','B', $default_font_size - $diffsizetitle);
- $pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo',$account->proprio),0,'L',0);
- $posy=$pdf->GetY()+1;
-
- if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
- {
- $pdf->SetXY($this->marge_gauche, $posy);
- $pdf->SetFont('','', $default_font_size - $diffsizetitle);
- $pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($account->owner_address), 0, 'L', 0);
- $posy=$pdf->GetY()+2;
- }
- }
- if ($conf->global->FACTURE_CHQ_NUMBER == -1)
- {
- $pdf->SetXY($this->marge_gauche, $posy);
- $pdf->SetFont('','B', $default_font_size - $diffsizetitle);
- $pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo',$this->emetteur->name),0,'L',0);
- $posy=$pdf->GetY()+1;
-
- if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
- {
- $pdf->SetXY($this->marge_gauche, $posy);
- $pdf->SetFont('','', $default_font_size - $diffsizetitle);
- $pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', 0);
- $posy=$pdf->GetY()+2;
- }
- }
+ if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'CHQ') {
+ // Si mode reglement non force ou si force a CHQ
+ if (! empty($conf->global->FACTURE_CHQ_NUMBER)) {
+ $diffsizetitle=(empty($conf->global->PDF_DIFFSIZE_TITLE)?3:$conf->global->PDF_DIFFSIZE_TITLE);
+
+ if ($conf->global->FACTURE_CHQ_NUMBER > 0) {
+ $account = new Account($this->db);
+ $account->fetch($conf->global->FACTURE_CHQ_NUMBER);
+
+ $pdf->SetXY($this->marge_gauche, $posy);
+ $pdf->SetFont('', 'B', $default_font_size - $diffsizetitle);
+ $pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $account->proprio), 0, 'L', 0);
+ $posy=$pdf->GetY()+1;
+
+ if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS)) {
+ $pdf->SetXY($this->marge_gauche, $posy);
+ $pdf->SetFont('', '', $default_font_size - $diffsizetitle);
+ $pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($account->owner_address), 0, 'L', 0);
+ $posy=$pdf->GetY()+2;
+ }
+ }
+ if ($conf->global->FACTURE_CHQ_NUMBER == -1) {
+ $pdf->SetXY($this->marge_gauche, $posy);
+ $pdf->SetFont('', 'B', $default_font_size - $diffsizetitle);
+ $pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $this->emetteur->name), 0, 'L', 0);
+ $posy=$pdf->GetY()+1;
+
+ if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS)) {
+ $pdf->SetXY($this->marge_gauche, $posy);
+ $pdf->SetFont('', '', $default_font_size - $diffsizetitle);
+ $pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', 0);
+ $posy=$pdf->GetY()+2;
+ }
+ }
}
}
// If payment mode not forced or forced to VIR, show payment with BAN
- if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'VIR')
- {
- if (! empty($object->fk_bank) || ! empty($conf->global->FACTURE_RIB_NUMBER))
- {
- $bankid=(empty($object->fk_bank)?$conf->global->FACTURE_RIB_NUMBER:$object->fk_bank);
- $account = new Account($this->db);
- $account->fetch($bankid);
+ if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'VIR') {
+ if (! empty($object->fk_bank) || ! empty($conf->global->FACTURE_RIB_NUMBER)) {
+ $bankid=(empty($object->fk_bank)?$conf->global->FACTURE_RIB_NUMBER:$object->fk_bank);
+ $account = new Account($this->db);
+ $account->fetch($bankid);
- $curx=$this->marge_gauche;
- $cury=$posy;
+ $curx=$this->marge_gauche;
+ $cury=$posy;
- $posy=pdf_bank($pdf,$outputlangs,$curx,$cury,$account,0,$default_font_size);
+ $posy=pdf_bank($pdf, $outputlangs, $curx, $cury, $account, 0, $default_font_size);
- $posy+=2;
- }
+ $posy+=2;
+ }
}
- }
+ }
- return $posy;
+ return $posy;
}
@@ -936,234 +930,229 @@ function _tableau_info(&$pdf, $object, $posy, $outputlangs)
* @param Translate $outputlangs Objet langs
* @return int Position pour suite
*/
- function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
+ public function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
{
- global $conf,$mysoc;
- $default_font_size = pdf_getPDFFontSize($outputlangs);
+ global $conf,$mysoc;
+ $default_font_size = pdf_getPDFFontSize($outputlangs);
- $tab2_top = $posy;
- $tab2_hl = 4;
- $pdf->SetFont('','', $default_font_size - 1);
+ $tab2_top = $posy;
+ $tab2_hl = 4;
+ $pdf->SetFont('', '', $default_font_size - 1);
// Tableau total
- $col1x = 120; $col2x = 170;
- if ($this->page_largeur < 210) // To work with US executive format
- {
+ $col1x = 120;
+ $col2x = 170;
+ if ($this->page_largeur < 210) {
+ // To work with US executive format
+
$col2x-=20;
- }
- $largcol2 = ($this->page_largeur - $this->marge_droite - $col2x);
+ }
+ $largcol2 = ($this->page_largeur - $this->marge_droite - $col2x);
- $useborder=0;
- $index = 0;
+ $useborder=0;
+ $index = 0;
// Total HT
- $pdf->SetFillColor(255,255,255);
- $pdf->SetXY($col1x, $tab2_top + 0);
- $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', 1);
+ $pdf->SetFillColor(255, 255, 255);
+ $pdf->SetXY($col1x, $tab2_top + 0);
+ $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', 1);
- $pdf->SetXY($col2x, $tab2_top + 0);
- $pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ht + (! empty($object->remise)?$object->remise:0), 0, $outputlangs), 0, 'R', 1);
+ $pdf->SetXY($col2x, $tab2_top + 0);
+ $pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ht + (! empty($object->remise)?$object->remise:0), 0, $outputlangs), 0, 'R', 1);
// Show VAT by rates and total
- $pdf->SetFillColor(248,248,248);
-
- $this->atleastoneratenotnull=0;
- if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
- {
- $tvaisnull=((! empty($this->tva) && count($this->tva) == 1 && isset($this->tva['0.000']) && is_float($this->tva['0.000'])) ? true : false);
- if (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_ISNULL) && $tvaisnull)
- {
- // Nothing to do
- }
- else
- {
- //Local tax 1 before VAT
+ $pdf->SetFillColor(248, 248, 248);
+
+ $this->atleastoneratenotnull=0;
+ if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) {
+ $tvaisnull=((! empty($this->tva) && count($this->tva) == 1 && isset($this->tva['0.000']) && is_float($this->tva['0.000'])) ? true : false);
+ if (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_ISNULL) && $tvaisnull) {
+ // Nothing to do
+ } else {
+ //Local tax 1 before VAT
//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
//{
- foreach( $this->localtax1 as $localtax_type => $localtax_rate )
- {
- if (in_array((string) $localtax_type, array('1','3','5'))) continue;
-
- foreach( $localtax_rate as $tvakey => $tvaval )
- {
- if ($tvakey!=0) // On affiche pas taux 0
- {
- //$this->atleastoneratenotnull++;
+ foreach ($this->localtax1 as $localtax_type => $localtax_rate) {
+ if (in_array((string) $localtax_type, array('1','3','5'))) {
+ continue;
+ }
- $index++;
- $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+ foreach ($localtax_rate as $tvakey => $tvaval) {
+ if ($tvakey!=0) {
+ // On affiche pas taux 0
- $tvacompl='';
- if (preg_match('/\*/',$tvakey))
- {
- $tvakey=str_replace('*','',$tvakey);
- $tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
- }
- $totalvat = $outputlangs->transcountrynoentities("TotalLT1",$mysoc->country_code).' ';
- $totalvat.=vatrate(abs($tvakey),1).$tvacompl;
- $pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+ //$this->atleastoneratenotnull++;
- $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
- $pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
- }
- }
+ $index++;
+ $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+
+ $tvacompl='';
+ if (preg_match('/\*/', $tvakey)) {
+ $tvakey=str_replace('*', '', $tvakey);
+ $tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
+ }
+ $totalvat = $outputlangs->transcountrynoentities("TotalLT1", $mysoc->country_code).' ';
+ $totalvat.=vatrate(abs($tvakey), 1).$tvacompl;
+ $pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+
+ $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+ $pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
+ }
+ }
}
//}
//Local tax 2 before VAT
//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
//{
- foreach( $this->localtax2 as $localtax_type => $localtax_rate )
- {
- if (in_array((string) $localtax_type, array('1','3','5'))) continue;
-
- foreach( $localtax_rate as $tvakey => $tvaval )
- {
- if ($tvakey!=0) // On affiche pas taux 0
- {
- //$this->atleastoneratenotnull++;
-
+ foreach ($this->localtax2 as $localtax_type => $localtax_rate) {
+ if (in_array((string) $localtax_type, array('1','3','5'))) {
+ continue;
+ }
+ foreach ($localtax_rate as $tvakey => $tvaval) {
+ if ($tvakey!=0) {
+ // On affiche pas taux 0
- $index++;
- $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+ //$this->atleastoneratenotnull++;
- $tvacompl='';
- if (preg_match('/\*/',$tvakey))
- {
- $tvakey=str_replace('*','',$tvakey);
- $tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
- }
- $totalvat = $outputlangs->transcountrynoentities("TotalLT2", $mysoc->country_code).' ';
- $totalvat.=vatrate(abs($tvakey),1).$tvacompl;
- $pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
- $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
- $pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
- }
- }
+ $index++;
+ $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+
+ $tvacompl='';
+ if (preg_match('/\*/', $tvakey)) {
+ $tvakey=str_replace('*', '', $tvakey);
+ $tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
+ }
+ $totalvat = $outputlangs->transcountrynoentities("TotalLT2", $mysoc->country_code).' ';
+ $totalvat.=vatrate(abs($tvakey), 1).$tvacompl;
+ $pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+
+ $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+ $pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
+ }
+ }
}
//}
// VAT
- foreach($this->tva as $tvakey => $tvaval)
- {
- if ($tvakey > 0) // On affiche pas taux 0
- {
- $this->atleastoneratenotnull++;
-
- $index++;
- $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+ foreach ($this->tva as $tvakey => $tvaval) {
+ if ($tvakey > 0) {
+ // On affiche pas taux 0
- $tvacompl='';
- if (preg_match('/\*/',$tvakey))
- {
- $tvakey=str_replace('*','',$tvakey);
- $tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
- }
- $totalvat =$outputlangs->transnoentities("TotalVAT").' ';
- $totalvat.=vatrate($tvakey,1).$tvacompl;
- $pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+ $this->atleastoneratenotnull++;
- $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
- $pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
- }
+ $index++;
+ $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+
+ $tvacompl='';
+ if (preg_match('/\*/', $tvakey)) {
+ $tvakey=str_replace('*', '', $tvakey);
+ $tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
+ }
+ $totalvat =$outputlangs->transnoentities("TotalVAT").' ';
+ $totalvat.=vatrate($tvakey, 1).$tvacompl;
+ $pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+
+ $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+ $pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
+ }
}
//Local tax 1 after VAT
//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
//{
- foreach( $this->localtax1 as $localtax_type => $localtax_rate )
- {
- if (in_array((string) $localtax_type, array('2','4','6'))) continue;
-
- foreach( $localtax_rate as $tvakey => $tvaval )
- {
- if ($tvakey != 0) // On affiche pas taux 0
- {
- //$this->atleastoneratenotnull++;
+ foreach ($this->localtax1 as $localtax_type => $localtax_rate) {
+ if (in_array((string) $localtax_type, array('2','4','6'))) {
+ continue;
+ }
- $index++;
- $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+ foreach ($localtax_rate as $tvakey => $tvaval) {
+ if ($tvakey != 0) {
+ // On affiche pas taux 0
- $tvacompl='';
- if (preg_match('/\*/',$tvakey))
- {
- $tvakey=str_replace('*','',$tvakey);
- $tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
- }
- $totalvat = $outputlangs->transcountrynoentities("TotalLT1",$mysoc->country_code).' ';
+ //$this->atleastoneratenotnull++;
- $totalvat.=vatrate(abs($tvakey),1).$tvacompl;
- $pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
- $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
- $pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
- }
- }
+ $index++;
+ $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+
+ $tvacompl='';
+ if (preg_match('/\*/', $tvakey)) {
+ $tvakey=str_replace('*', '', $tvakey);
+ $tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
+ }
+ $totalvat = $outputlangs->transcountrynoentities("TotalLT1", $mysoc->country_code).' ';
+
+ $totalvat.=vatrate(abs($tvakey), 1).$tvacompl;
+ $pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+ $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+ $pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
+ }
+ }
}
//}
//Local tax 2 after VAT
//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
//{
- foreach( $this->localtax2 as $localtax_type => $localtax_rate )
- {
- if (in_array((string) $localtax_type, array('2','4','6'))) continue;
-
- foreach( $localtax_rate as $tvakey => $tvaval )
- {
- // retrieve global local tax
- if ($tvakey != 0) // On affiche pas taux 0
- {
+ foreach ($this->localtax2 as $localtax_type => $localtax_rate) {
+ if (in_array((string) $localtax_type, array('2','4','6'))) {
+ continue;
+ }
+
+ foreach ($localtax_rate as $tvakey => $tvaval) {
+ // retrieve global local tax
+ if ($tvakey != 0) {
+ // On affiche pas taux 0
+
//$this->atleastoneratenotnull++;
$index++;
- $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+ $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
- $tvacompl='';
- if (preg_match('/\*/',$tvakey))
- {
- $tvakey=str_replace('*','',$tvakey);
- $tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
- }
- $totalvat = $outputlangs->transcountrynoentities("TotalLT2",$mysoc->country_code).' ';
+ $tvacompl='';
+ if (preg_match('/\*/', $tvakey)) {
+ $tvakey=str_replace('*', '', $tvakey);
+ $tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
+ }
+ $totalvat = $outputlangs->transcountrynoentities("TotalLT2", $mysoc->country_code).' ';
- $totalvat.=vatrate(abs($tvakey),1).$tvacompl;
- $pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+ $totalvat.=vatrate(abs($tvakey), 1).$tvacompl;
+ $pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
- $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
- $pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
+ $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+ $pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
}
- }
+ }
}
//}
// Total TTC
$index++;
- $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
- $pdf->SetTextColor(0,0,60);
- $pdf->SetFillColor(224,224,224);
- $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC"), $useborder, 'L', 1);
+ $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+ $pdf->SetTextColor(0, 0, 60);
+ $pdf->SetFillColor(224, 224, 224);
+ $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC"), $useborder, 'L', 1);
- $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
- $pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ttc, 0, $outputlangs), $useborder, 'R', 1);
- }
- }
+ $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+ $pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ttc, 0, $outputlangs), $useborder, 'R', 1);
+ }
+ }
- $pdf->SetTextColor(0,0,0);
+ $pdf->SetTextColor(0, 0, 0);
/*
$resteapayer = $object->total_ttc - $deja_regle;
if (! empty($object->paye)) $resteapayer=0;
*/
- if ($deja_regle > 0)
- {
- $index++;
+ if ($deja_regle > 0) {
+ $index++;
- $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
- $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("AlreadyPaid"), 0, 'L', 0);
+ $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+ $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("AlreadyPaid"), 0, 'L', 0);
- $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
- $pdf->MultiCell($largcol2, $tab2_hl, price($deja_regle, 0, $outputlangs), 0, 'R', 0);
+ $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+ $pdf->MultiCell($largcol2, $tab2_hl, price($deja_regle, 0, $outputlangs), 0, 'R', 0);
/*
if ($object->close_code == 'discount_vat')
@@ -1182,20 +1171,20 @@ function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
*/
$index++;
- $pdf->SetTextColor(0,0,60);
- $pdf->SetFillColor(224,224,224);
- $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
- $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("RemainderToPay"), $useborder, 'L', 1);
+ $pdf->SetTextColor(0, 0, 60);
+ $pdf->SetFillColor(224, 224, 224);
+ $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+ $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("RemainderToPay"), $useborder, 'L', 1);
- $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
- $pdf->MultiCell($largcol2, $tab2_hl, price($resteapayer, 0, $outputlangs), $useborder, 'R', 1);
+ $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+ $pdf->MultiCell($largcol2, $tab2_hl, price($resteapayer, 0, $outputlangs), $useborder, 'R', 1);
- $pdf->SetFont('','', $default_font_size - 1);
- $pdf->SetTextColor(0,0,0);
+ $pdf->SetFont('', '', $default_font_size - 1);
+ $pdf->SetTextColor(0, 0, 0);
}
- $index++;
- return ($tab2_top + ($tab2_hl * $index));
+ $index++;
+ return ($tab2_top + ($tab2_hl * $index));
}
/**
@@ -1210,96 +1199,88 @@ function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
* @param int $hidebottom Hide bottom bar of array
* @return void
*/
- function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop=0, $hidebottom=0)
+ public function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop=0, $hidebottom=0)
{
- global $conf;
+ global $conf;
// Force to disable hidetop and hidebottom
$hidebottom=0;
- if ($hidetop) $hidetop=-1;
+ if ($hidetop) {
+ $hidetop=-1;
+ }
- $default_font_size = pdf_getPDFFontSize($outputlangs);
+ $default_font_size = pdf_getPDFFontSize($outputlangs);
// Amount in (at tab_top - 1)
- $pdf->SetTextColor(0,0,0);
- $pdf->SetFont('','',$default_font_size - 2);
+ $pdf->SetTextColor(0, 0, 0);
+ $pdf->SetFont('', '', $default_font_size - 2);
- if (empty($hidetop))
- {
- $titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$conf->currency));
- $pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top-4);
- $pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
+ if (empty($hidetop)) {
+ $titre = $outputlangs->transnoentities("AmountInCurrency", $outputlangs->transnoentitiesnoconv("Currency".$conf->currency));
+ $pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top-4);
+ $pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
//$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR='230,230,230';
- if (! empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) $pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_droite-$this->marge_gauche, 5, 'F', null, explode(',',$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
- }
+ if (! empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) {
+ $pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_droite-$this->marge_gauche, 5, 'F', null, explode(',', $conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
+ }
+ }
- $pdf->SetDrawColor(128,128,128);
- $pdf->SetFont('','',$default_font_size - 1);
+ $pdf->SetDrawColor(128, 128, 128);
+ $pdf->SetFont('', '', $default_font_size - 1);
// Output Rect
- $this->printRect($pdf,$this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect prend une longueur en 3eme param et 4eme param
+ $this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect prend une longueur en 3eme param et 4eme param
- if (empty($hidetop))
- {
- $pdf->line($this->marge_gauche, $tab_top+5, $this->page_largeur-$this->marge_droite, $tab_top+5); // line prend une position y en 2eme param et 4eme param
+ if (empty($hidetop)) {
+ $pdf->line($this->marge_gauche, $tab_top+5, $this->page_largeur-$this->marge_droite, $tab_top+5); // line prend une position y en 2eme param et 4eme param
$pdf->SetXY($this->posxdesc-1, $tab_top+1);
- $pdf->MultiCell(108,2, $outputlangs->transnoentities("Designation"),'','L');
+ $pdf->MultiCell(108, 2, $outputlangs->transnoentities("Designation"), '', 'L');
}
- if (! empty($conf->global->MAIN_GENERATE_PROPOSALS_WITH_PICTURE))
- {
- $pdf->line($this->posxpicture-1, $tab_top, $this->posxpicture-1, $tab_top + $tab_height);
- if (empty($hidetop))
- {
- //$pdf->SetXY($this->posxpicture-1, $tab_top+1);
+ if (! empty($conf->global->MAIN_GENERATE_PROPOSALS_WITH_PICTURE)) {
+ $pdf->line($this->posxpicture-1, $tab_top, $this->posxpicture-1, $tab_top + $tab_height);
+ if (empty($hidetop)) {
+ //$pdf->SetXY($this->posxpicture-1, $tab_top+1);
//$pdf->MultiCell($this->posxtva-$this->posxpicture-1,2, $outputlangs->transnoentities("Photo"),'','C');
- }
- }
-
- if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
- {
- $pdf->line($this->posxtva-1, $tab_top, $this->posxtva-1, $tab_top + $tab_height);
- if (empty($hidetop))
- {
- $pdf->SetXY($this->posxtva-3, $tab_top+1);
- $pdf->MultiCell($this->posxup-$this->posxtva+3,2, $outputlangs->transnoentities("VAT"),'','C');
- }
- }
-
- $pdf->line($this->posxup-1, $tab_top, $this->posxup-1, $tab_top + $tab_height);
- if (empty($hidetop))
- {
- $pdf->SetXY($this->posxup-1, $tab_top+1);
- $pdf->MultiCell($this->posxqty-$this->posxup-1,2, $outputlangs->transnoentities("PriceUHT"),'','C');
- }
-
- $pdf->line($this->posxqty-1, $tab_top, $this->posxqty-1, $tab_top + $tab_height);
- if (empty($hidetop))
- {
- $pdf->SetXY($this->posxqty-1, $tab_top+1);
- $pdf->MultiCell($this->posxdiscount-$this->posxqty-1,2, $outputlangs->transnoentities("Qty"),'','C');
- }
-
- $pdf->line($this->posxdiscount-1, $tab_top, $this->posxdiscount-1, $tab_top + $tab_height);
- if (empty($hidetop))
- {
- if ($this->atleastonediscount)
- {
- $pdf->SetXY($this->posxdiscount-1, $tab_top+1);
- $pdf->MultiCell($this->postotalht-$this->posxdiscount+1,2, $outputlangs->transnoentities("ReductionShort"),'','C');
- }
- }
- if ($this->atleastonediscount)
- {
- $pdf->line($this->postotalht, $tab_top, $this->postotalht, $tab_top + $tab_height);
- }
- if (empty($hidetop))
- {
- $pdf->SetXY($this->postotalht-1, $tab_top+1);
- $pdf->MultiCell(30,2, $outputlangs->transnoentities("TotalHT"),'','C');
- }
+ }
+ }
+
+ if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) {
+ $pdf->line($this->posxtva-1, $tab_top, $this->posxtva-1, $tab_top + $tab_height);
+ if (empty($hidetop)) {
+ $pdf->SetXY($this->posxtva-3, $tab_top+1);
+ $pdf->MultiCell($this->posxup-$this->posxtva+3, 2, $outputlangs->transnoentities("VAT"), '', 'C');
+ }
+ }
+
+ $pdf->line($this->posxup-1, $tab_top, $this->posxup-1, $tab_top + $tab_height);
+ if (empty($hidetop)) {
+ $pdf->SetXY($this->posxup-1, $tab_top+1);
+ $pdf->MultiCell($this->posxqty-$this->posxup-1, 2, $outputlangs->transnoentities("PriceUHT"), '', 'C');
+ }
+
+ $pdf->line($this->posxqty-1, $tab_top, $this->posxqty-1, $tab_top + $tab_height);
+ if (empty($hidetop)) {
+ $pdf->SetXY($this->posxqty-1, $tab_top+1);
+ $pdf->MultiCell($this->posxdiscount-$this->posxqty-1, 2, $outputlangs->transnoentities("Qty"), '', 'C');
+ }
+
+ $pdf->line($this->posxdiscount-1, $tab_top, $this->posxdiscount-1, $tab_top + $tab_height);
+ if (empty($hidetop)) {
+ if ($this->atleastonediscount) {
+ $pdf->SetXY($this->posxdiscount-1, $tab_top+1);
+ $pdf->MultiCell($this->postotalht-$this->posxdiscount+1, 2, $outputlangs->transnoentities("ReductionShort"), '', 'C');
+ }
+ }
+ if ($this->atleastonediscount) {
+ $pdf->line($this->postotalht, $tab_top, $this->postotalht, $tab_top + $tab_height);
+ }
+ if (empty($hidetop)) {
+ $pdf->SetXY($this->postotalht-1, $tab_top+1);
+ $pdf->MultiCell(30, 2, $outputlangs->transnoentities("TotalHT"), '', 'C');
+ }
}
/**
@@ -1311,195 +1292,189 @@ function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop=0,
* @param Translate $outputlangs Object lang for output
* @return void
*/
- function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
+ public function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
{
- global $conf,$langs;
+ global $conf,$langs;
- $outputlangs->load("main");
- $outputlangs->load("bills");
- $outputlangs->load("propal");
- $outputlangs->load("companies");
+ $outputlangs->load("main");
+ $outputlangs->load("bills");
+ $outputlangs->load("propal");
+ $outputlangs->load("companies");
- $default_font_size = pdf_getPDFFontSize($outputlangs);
+ $default_font_size = pdf_getPDFFontSize($outputlangs);
- pdf_pagehead($pdf,$outputlangs,$this->page_hauteur);
+ pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
// Show Draft Watermark
- if($object->statut==0 && (! empty($conf->global->PROPALE_DRAFT_WATERMARK)) )
- {
- pdf_watermark($pdf,$outputlangs,$this->page_hauteur,$this->page_largeur,'mm',$conf->global->PROPALE_DRAFT_WATERMARK);
+ if ($object->statut==0 && (! empty($conf->global->PROPALE_DRAFT_WATERMARK))) {
+ pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->PROPALE_DRAFT_WATERMARK);
}
- $pdf->SetTextColor(0,0,60);
- $pdf->SetFont('','B', $default_font_size + 3);
+ $pdf->SetTextColor(0, 0, 60);
+ $pdf->SetFont('', 'B', $default_font_size + 3);
- $posy=$this->marge_haute;
- $posx=$this->page_largeur-$this->marge_droite-100;
+ $posy=$this->marge_haute;
+ $posx=$this->page_largeur-$this->marge_droite-100;
- $pdf->SetXY($this->marge_gauche,$posy);
+ $pdf->SetXY($this->marge_gauche, $posy);
// Logo
$logo=$conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
- if ($this->emetteur->logo)
- {
- if (is_readable($logo))
- {
- $height=pdf_getHeightForLogo($logo);
- $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
- }
- else
- {
- $pdf->SetTextColor(200,0,0);
- $pdf->SetFont('','B',$default_font_size - 2);
- $pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
- $pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
- }
- }
- else
- {
- $text=$this->emetteur->name;
- $pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
- }
-
- $pdf->SetFont('','B',$default_font_size + 3);
- $pdf->SetXY($posx,$posy);
- $pdf->SetTextColor(0,0,60);
- $title=$outputlangs->transnoentities("CommercialProposal");
- $pdf->MultiCell(100, 4, $title, '', 'R');
-
- $pdf->SetFont('','B',$default_font_size);
-
- $posy+=5;
- $pdf->SetXY($posx,$posy);
- $pdf->SetTextColor(0,0,60);
- $pdf->MultiCell(100, 4, $outputlangs->transnoentities("Ref")." : " . $outputlangs->convToOutputCharset($object->ref), '', 'R');
-
- $posy+=1;
- $pdf->SetFont('','', $default_font_size - 2);
-
- if ($object->ref_client)
- {
- $posy+=4;
- $pdf->SetXY($posx,$posy);
- $pdf->SetTextColor(0,0,60);
- $pdf->MultiCell(100, 3, $outputlangs->transnoentities("RefCustomer")." : " . $outputlangs->convToOutputCharset($object->ref_client), '', 'R');
- }
-
- $posy+=4;
- $pdf->SetXY($posx,$posy);
- $pdf->SetTextColor(0,0,60);
- $pdf->MultiCell(100, 3, $outputlangs->transnoentities("Date")." : " . dol_print_date($object->date,"day",false,$outputlangs,true), '', 'R');
-
- $posy+=4;
- $pdf->SetXY($posx,$posy);
- $pdf->SetTextColor(0,0,60);
- $pdf->MultiCell(100, 3, $outputlangs->transnoentities("DateEndPropal")." : " . dol_print_date($object->fin_validite,"day",false,$outputlangs,true), '', 'R');
-
- if ($object->client->code_client)
- {
- $posy+=4;
- $pdf->SetXY($posx,$posy);
- $pdf->SetTextColor(0,0,60);
- $pdf->MultiCell(100, 3, $outputlangs->transnoentities("CustomerCode")." : " . $outputlangs->transnoentities($object->client->code_client), '', 'R');
- }
-
- $posy+=2;
+ if ($this->emetteur->logo) {
+ if (is_readable($logo)) {
+ $height=pdf_getHeightForLogo($logo);
+ $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
+ } else {
+ $pdf->SetTextColor(200, 0, 0);
+ $pdf->SetFont('', 'B', $default_font_size - 2);
+ $pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
+ $pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
+ }
+ } else {
+ $text=$this->emetteur->name;
+ $pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
+ }
+
+ $pdf->SetFont('', 'B', $default_font_size + 3);
+ $pdf->SetXY($posx, $posy);
+ $pdf->SetTextColor(0, 0, 60);
+ $title=$outputlangs->transnoentities("CommercialProposal");
+ $pdf->MultiCell(100, 4, $title, '', 'R');
+
+ $pdf->SetFont('', 'B', $default_font_size);
+
+ $posy+=5;
+ $pdf->SetXY($posx, $posy);
+ $pdf->SetTextColor(0, 0, 60);
+ $pdf->MultiCell(100, 4, $outputlangs->transnoentities("Ref")." : " . $outputlangs->convToOutputCharset($object->ref), '', 'R');
+
+ $posy+=1;
+ $pdf->SetFont('', '', $default_font_size - 2);
+
+ if ($object->ref_client) {
+ $posy+=4;
+ $pdf->SetXY($posx, $posy);
+ $pdf->SetTextColor(0, 0, 60);
+ $pdf->MultiCell(100, 3, $outputlangs->transnoentities("RefCustomer")." : " . $outputlangs->convToOutputCharset($object->ref_client), '', 'R');
+ }
+
+ $posy+=4;
+ $pdf->SetXY($posx, $posy);
+ $pdf->SetTextColor(0, 0, 60);
+ $pdf->MultiCell(100, 3, $outputlangs->transnoentities("Date")." : " . dol_print_date($object->date, "day", false, $outputlangs, true), '', 'R');
+
+ $posy+=4;
+ $pdf->SetXY($posx, $posy);
+ $pdf->SetTextColor(0, 0, 60);
+ $pdf->MultiCell(100, 3, $outputlangs->transnoentities("DateEndPropal")." : " . dol_print_date($object->fin_validite, "day", false, $outputlangs, true), '', 'R');
+
+ if ($object->client->code_client) {
+ $posy+=4;
+ $pdf->SetXY($posx, $posy);
+ $pdf->SetTextColor(0, 0, 60);
+ $pdf->MultiCell(100, 3, $outputlangs->transnoentities("CustomerCode")." : " . $outputlangs->transnoentities($object->client->code_client), '', 'R');
+ }
+
+ $posy+=2;
// Show list of linked objects
$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'R', $default_font_size);
- if ($showaddress)
- {
- // Sender properties
+ if ($showaddress) {
+ // Sender properties
$carac_emetteur='';
// Add internal contact of proposal if defined
- $arrayidcontact=$object->getIdContact('internal','SALESREPFOLL');
- if (count($arrayidcontact) > 0)
- {
- $object->fetch_user($arrayidcontact[0]);
- $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->transnoentities("Name").": ".$outputlangs->convToOutputCharset($object->user->getFullName($outputlangs))."\n";
- }
+ $arrayidcontact=$object->getIdContact('internal', 'SALESREPFOLL');
+ if (count($arrayidcontact) > 0) {
+ $object->fetch_user($arrayidcontact[0]);
+ $carac_emetteur .= ($carac_emetteur ? "\n" : '').$outputlangs->transnoentities("Name").": ".$outputlangs->convToOutputCharset($object->user->getFullName($outputlangs))."\n";
+ }
- $carac_emetteur .= pdf_build_address($outputlangs, $this->emetteur, $object->client);
+ $carac_emetteur .= pdf_build_address($outputlangs, $this->emetteur, $object->client);
// Show sender
$posy=42;
- $posx=$this->marge_gauche;
- if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->page_largeur-$this->marge_droite-80;
- $hautcadre=40;
+ $posx=$this->marge_gauche;
+ if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+ $posx=$this->page_largeur-$this->marge_droite-80;
+ }
+ $hautcadre=40;
// Show sender frame
- $pdf->SetTextColor(0,0,0);
- $pdf->SetFont('','', $default_font_size - 2);
- $pdf->SetXY($posx,$posy-5);
- $pdf->MultiCell(66,5, $outputlangs->transnoentities("BillFrom").":", 0, 'L');
- $pdf->SetXY($posx,$posy);
- $pdf->SetFillColor(230,230,230);
- $pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1);
- $pdf->SetTextColor(0,0,60);
+ $pdf->SetTextColor(0, 0, 0);
+ $pdf->SetFont('', '', $default_font_size - 2);
+ $pdf->SetXY($posx, $posy-5);
+ $pdf->MultiCell(66, 5, $outputlangs->transnoentities("BillFrom").":", 0, 'L');
+ $pdf->SetXY($posx, $posy);
+ $pdf->SetFillColor(230, 230, 230);
+ $pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1);
+ $pdf->SetTextColor(0, 0, 60);
// Show sender name
- $pdf->SetXY($posx+2,$posy+3);
- $pdf->SetFont('','B', $default_font_size);
- $pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
- $posy=$pdf->getY();
+ $pdf->SetXY($posx+2, $posy+3);
+ $pdf->SetFont('', 'B', $default_font_size);
+ $pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
+ $posy=$pdf->getY();
// Show sender information
- $pdf->SetXY($posx+2,$posy);
- $pdf->SetFont('','', $default_font_size - 1);
- $pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L');
+ $pdf->SetXY($posx+2, $posy);
+ $pdf->SetFont('', '', $default_font_size - 1);
+ $pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L');
// If CUSTOMER contact defined, we use it
$usecontact=false;
- $arrayidcontact=$object->getIdContact('external','CUSTOMER');
- if (count($arrayidcontact) > 0)
- {
- $usecontact=true;
- $result=$object->fetch_contact($arrayidcontact[0]);
- }
+ $arrayidcontact=$object->getIdContact('external', 'CUSTOMER');
+ if (count($arrayidcontact) > 0) {
+ $usecontact=true;
+ $result=$object->fetch_contact($arrayidcontact[0]);
+ }
// Recipient name
- if (! empty($usecontact))
- {
- // On peut utiliser le nom de la societe du contact
- if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socname = $object->contact->socname;
- else $socname = $object->client->name;
- $carac_client_name=$outputlangs->convToOutputCharset($socname);
- }
- else
- {
- $carac_client_name=$outputlangs->convToOutputCharset($object->client->name);
+ if (! empty($usecontact)) {
+ // On peut utiliser le nom de la societe du contact
+ if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
+ $socname = $object->contact->socname;
+ } else {
+ $socname = $object->client->name;
+ }
+ $carac_client_name=$outputlangs->convToOutputCharset($socname);
+ } else {
+ $carac_client_name=$outputlangs->convToOutputCharset($object->client->name);
}
- $carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->client,($usecontact?$object->contact:''),$usecontact,'target');
+ $carac_client=pdf_build_address($outputlangs, $this->emetteur, $object->client, ($usecontact?$object->contact:''), $usecontact, 'target');
// Show recipient
$widthrecbox=100;
- if ($this->page_largeur < 210) $widthrecbox=84; // To work with US executive format
+ if ($this->page_largeur < 210) {
+ $widthrecbox=84;
+ } // To work with US executive format
$posy=42;
- $posx=$this->page_largeur-$this->marge_droite-$widthrecbox;
- if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->marge_gauche;
+ $posx=$this->page_largeur-$this->marge_droite-$widthrecbox;
+ if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+ $posx=$this->marge_gauche;
+ }
// Show recipient frame
- $pdf->SetTextColor(0,0,0);
- $pdf->SetFont('','', $default_font_size - 2);
- $pdf->SetXY($posx+2,$posy-5);
- $pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("BillTo").":", 0, 'L');
- $pdf->Rect($posx, $posy, $widthrecbox, $hautcadre);
+ $pdf->SetTextColor(0, 0, 0);
+ $pdf->SetFont('', '', $default_font_size - 2);
+ $pdf->SetXY($posx+2, $posy-5);
+ $pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("BillTo").":", 0, 'L');
+ $pdf->Rect($posx, $posy, $widthrecbox, $hautcadre);
// Show recipient name
- $pdf->SetXY($posx+2,$posy+3);
- $pdf->SetFont('','B', $default_font_size);
- $pdf->MultiCell($widthrecbox, 4, $carac_client_name, 0, 'L');
+ $pdf->SetXY($posx+2, $posy+3);
+ $pdf->SetFont('', 'B', $default_font_size);
+ $pdf->MultiCell($widthrecbox, 4, $carac_client_name, 0, 'L');
// Show recipient information
- $pdf->SetFont('','', $default_font_size - 1);
- $pdf->SetXY($posx+2,$posy+4+(dol_nboflines_bis($carac_client_name,50)*4));
- $pdf->MultiCell($widthrecbox, 4, $carac_client, 0, 'L');
- }
+ $pdf->SetFont('', '', $default_font_size - 1);
+ $pdf->SetXY($posx+2, $posy+4+(dol_nboflines_bis($carac_client_name, 50)*4));
+ $pdf->MultiCell($widthrecbox, 4, $carac_client, 0, 'L');
+ }
- $pdf->SetTextColor(0,0,0);
+ $pdf->SetTextColor(0, 0, 0);
}
/**
@@ -1511,11 +1486,9 @@ function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
* @param int $hidefreetext 1=Hide free text
* @return int Return height of bottom margin including footer text
*/
- function _pagefoot(&$pdf,$object,$outputlangs,$hidefreetext=0)
+ public function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext=0)
{
- $showdetails=0;
- return pdf_pagefoot($pdf,$outputlangs,'PROPALE_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
+ $showdetails=0;
+ return pdf_pagefoot($pdf, $outputlangs, 'PROPALE_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
}
-
}
-
diff --git a/core/triggers/interface_99_modSubtotal_subtotaltrigger.class.php b/core/triggers/interface_99_modSubtotal_subtotaltrigger.class.php
index 42290772..b3a980d2 100644
--- a/core/triggers/interface_99_modSubtotal_subtotaltrigger.class.php
+++ b/core/triggers/interface_99_modSubtotal_subtotaltrigger.class.php
@@ -89,12 +89,13 @@ public function getVersion()
if ($this->version == 'development') {
return $langs->trans("Development");
- } elseif ($this->version == 'experimental')
-
- return $langs->trans("Experimental");
- elseif ($this->version == 'dolibarr') return DOL_VERSION;
- elseif ($this->version) return $this->version;
- else {
+ } elseif ($this->version == 'experimental') {
+ return $langs->trans("Experimental");
+ } elseif ($this->version == 'dolibarr') {
+ return DOL_VERSION;
+ } elseif ($this->version) {
+ return $this->version;
+ } else {
return $langs->trans("Unknown");
}
}
@@ -390,8 +391,7 @@ public function run_trigger($action, $object, $user, $langs, $conf)
"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
);
} elseif ($action == 'LINEBILL_INSERT') {
-
- dol_syslog(
+ dol_syslog(
"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
);
} elseif ($action == 'LINEBILL_DELETE') {
@@ -569,4 +569,4 @@ public function run_trigger($action, $object, $user, $langs, $conf)
return 0;
}
-}
\ No newline at end of file
+}
diff --git a/htdocs_38/core/lib/pdf.lib.php b/htdocs_38/core/lib/pdf.lib.php
index 945146fa..0e48dad3 100644
--- a/htdocs_38/core/lib/pdf.lib.php
+++ b/htdocs_38/core/lib/pdf.lib.php
@@ -41,31 +41,31 @@
*/
function pdf_getFormat($outputlangs='')
{
- global $conf,$db;
+ global $conf,$db;
// Default value if setup was not done and/or entry into c_paper_format not defined
- $width=210; $height=297; $unit='mm';
-
- if (empty($conf->global->MAIN_PDF_FORMAT))
- {
- include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
- $pdfformat=dol_getDefaultFormat($outputlangs);
- }
- else $pdfformat=$conf->global->MAIN_PDF_FORMAT;
-
- $sql="SELECT code, label, width, height, unit FROM ".MAIN_DB_PREFIX."c_paper_format";
- $sql.=" WHERE code = '".$pdfformat."'";
- $resql=$db->query($sql);
- if ($resql)
- {
- $obj=$db->fetch_object($resql);
- if ($obj)
- {
- $width=(int) $obj->width;
- $height=(int) $obj->height;
- $unit=$obj->unit;
- }
- }
+ $width=210;
+ $height=297;
+ $unit='mm';
+
+ if (empty($conf->global->MAIN_PDF_FORMAT)) {
+ include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+ $pdfformat=dol_getDefaultFormat($outputlangs);
+ } else {
+ $pdfformat=$conf->global->MAIN_PDF_FORMAT;
+ }
+
+ $sql="SELECT code, label, width, height, unit FROM ".MAIN_DB_PREFIX."c_paper_format";
+ $sql.=" WHERE code = '".$pdfformat."'";
+ $resql=$db->query($sql);
+ if ($resql) {
+ $obj=$db->fetch_object($resql);
+ if ($obj) {
+ $width=(int) $obj->width;
+ $height=(int) $obj->height;
+ $unit=$obj->unit;
+ }
+ }
//print "pdfformat=".$pdfformat." width=".$width." height=".$height." unit=".$unit;
return array('width'=>$width,'height'=>$height,'unit'=>$unit);
@@ -79,65 +79,70 @@ function pdf_getFormat($outputlangs='')
* @param string $pagetype 'P' or 'l'
* @return TPDF PDF object
*/
-function pdf_getInstance($format='',$metric='mm',$pagetype='P')
+function pdf_getInstance($format='', $metric='mm', $pagetype='P')
{
- global $conf;
+ global $conf;
// Define constant for TCPDF
- if (! defined('K_TCPDF_EXTERNAL_CONFIG'))
- {
- define('K_TCPDF_EXTERNAL_CONFIG',1); // this avoid using tcpdf_config file
+ if (! defined('K_TCPDF_EXTERNAL_CONFIG')) {
+ define('K_TCPDF_EXTERNAL_CONFIG', 1); // this avoid using tcpdf_config file
define('K_PATH_CACHE', DOL_DATA_ROOT.'/admin/temp/');
- define('K_PATH_URL_CACHE', DOL_DATA_ROOT.'/admin/temp/');
- dol_mkdir(K_PATH_CACHE);
- define('K_BLANK_IMAGE', '_blank.png');
- define('PDF_PAGE_FORMAT', 'A4');
- define('PDF_PAGE_ORIENTATION', 'P');
- define('PDF_CREATOR', 'TCPDF');
- define('PDF_AUTHOR', 'TCPDF');
- define('PDF_HEADER_TITLE', 'TCPDF Example');
- define('PDF_HEADER_STRING', "by Dolibarr ERP CRM");
- define('PDF_UNIT', 'mm');
- define('PDF_MARGIN_HEADER', 5);
- define('PDF_MARGIN_FOOTER', 10);
- define('PDF_MARGIN_TOP', 27);
- define('PDF_MARGIN_BOTTOM', 25);
- define('PDF_MARGIN_LEFT', 15);
- define('PDF_MARGIN_RIGHT', 15);
- define('PDF_FONT_NAME_MAIN', 'helvetica');
- define('PDF_FONT_SIZE_MAIN', 10);
- define('PDF_FONT_NAME_DATA', 'helvetica');
- define('PDF_FONT_SIZE_DATA', 8);
- define('PDF_FONT_MONOSPACED', 'courier');
- define('PDF_IMAGE_SCALE_RATIO', 1.25);
- define('HEAD_MAGNIFICATION', 1.1);
- define('K_CELL_HEIGHT_RATIO', 1.25);
- define('K_TITLE_MAGNIFICATION', 1.3);
- define('K_SMALL_RATIO', 2/3);
- define('K_THAI_TOPCHARS', true);
- define('K_TCPDF_CALLS_IN_HTML', true);
- define('K_TCPDF_THROW_EXCEPTION_ERROR', false);
- }
-
- if (! empty($conf->global->MAIN_USE_FPDF) && ! empty($conf->global->MAIN_DISABLE_FPDI))
- return "Error MAIN_USE_FPDF and MAIN_DISABLE_FPDI can't be set together";
+ define('K_PATH_URL_CACHE', DOL_DATA_ROOT.'/admin/temp/');
+ dol_mkdir(K_PATH_CACHE);
+ define('K_BLANK_IMAGE', '_blank.png');
+ define('PDF_PAGE_FORMAT', 'A4');
+ define('PDF_PAGE_ORIENTATION', 'P');
+ define('PDF_CREATOR', 'TCPDF');
+ define('PDF_AUTHOR', 'TCPDF');
+ define('PDF_HEADER_TITLE', 'TCPDF Example');
+ define('PDF_HEADER_STRING', "by Dolibarr ERP CRM");
+ define('PDF_UNIT', 'mm');
+ define('PDF_MARGIN_HEADER', 5);
+ define('PDF_MARGIN_FOOTER', 10);
+ define('PDF_MARGIN_TOP', 27);
+ define('PDF_MARGIN_BOTTOM', 25);
+ define('PDF_MARGIN_LEFT', 15);
+ define('PDF_MARGIN_RIGHT', 15);
+ define('PDF_FONT_NAME_MAIN', 'helvetica');
+ define('PDF_FONT_SIZE_MAIN', 10);
+ define('PDF_FONT_NAME_DATA', 'helvetica');
+ define('PDF_FONT_SIZE_DATA', 8);
+ define('PDF_FONT_MONOSPACED', 'courier');
+ define('PDF_IMAGE_SCALE_RATIO', 1.25);
+ define('HEAD_MAGNIFICATION', 1.1);
+ define('K_CELL_HEIGHT_RATIO', 1.25);
+ define('K_TITLE_MAGNIFICATION', 1.3);
+ define('K_SMALL_RATIO', 2/3);
+ define('K_THAI_TOPCHARS', true);
+ define('K_TCPDF_CALLS_IN_HTML', true);
+ define('K_TCPDF_THROW_EXCEPTION_ERROR', false);
+ }
+
+ if (! empty($conf->global->MAIN_USE_FPDF) && ! empty($conf->global->MAIN_DISABLE_FPDI)) {
+ return "Error MAIN_USE_FPDF and MAIN_DISABLE_FPDI can't be set together";
+ }
// We use by default TCPDF else FPDF
- if (empty($conf->global->MAIN_USE_FPDF)) require_once TCPDF_PATH.'tcpdf.php';
- else require_once FPDF_PATH.'fpdf.php';
+ if (empty($conf->global->MAIN_USE_FPDF)) {
+ require_once TCPDF_PATH.'tcpdf.php';
+ } else {
+ require_once FPDF_PATH.'fpdf.php';
+ }
// We need to instantiate tcpdi or fpdi object (instead of tcpdf) to use merging features. But we can disable it (this will break all merge features).
- if (empty($conf->global->MAIN_DISABLE_TCPDI)) require_once TCPDI_PATH.'tcpdi.php';
- else if (empty($conf->global->MAIN_DISABLE_FPDI)) require_once FPDI_PATH.'fpdi.php';
+ if (empty($conf->global->MAIN_DISABLE_TCPDI)) {
+ require_once TCPDI_PATH.'tcpdi.php';
+ } elseif (empty($conf->global->MAIN_DISABLE_FPDI)) {
+ require_once FPDI_PATH.'fpdi.php';
+ }
//$arrayformat=pdf_getFormat();
//$format=array($arrayformat['width'],$arrayformat['height']);
//$metric=$arrayformat['unit'];
// Protection and encryption of pdf
- if (empty($conf->global->MAIN_USE_FPDF) && ! empty($conf->global->PDF_SECURITY_ENCRYPTION))
- {
- /* Permission supported by TCPDF
+ if (empty($conf->global->MAIN_USE_FPDF) && ! empty($conf->global->PDF_SECURITY_ENCRYPTION)) {
+ /* Permission supported by TCPDF
- print : Print the document;
- modify : Modify the contents of the document by operations other than those controlled by 'fill-forms', 'extract' and 'assemble';
- copy : Copy or otherwise extract text and graphics from the document;
@@ -148,33 +153,38 @@ function pdf_getInstance($format='',$metric='mm',$pagetype='P')
- print-high : Print the document to a representation from which a faithful digital copy of the PDF content could be generated. When this is not set, printing is limited to a low-level representation of the appearance, possibly of degraded quality.
- owner : (inverted logic - only for public-key) when set permits change of encryption and enables all other permissions.
*/
- if (class_exists('TCPDI')) $pdf = new TCPDI($pagetype,$metric,$format);
- else if (class_exists('FPDI')) $pdf = new FPDI($pagetype,$metric,$format);
- else $pdf = new TCPDF($pagetype,$metric,$format);
+ if (class_exists('TCPDI')) {
+ $pdf = new TCPDI($pagetype, $metric, $format);
+ } elseif (class_exists('FPDI')) {
+ $pdf = new FPDI($pagetype, $metric, $format);
+ } else {
+ $pdf = new TCPDF($pagetype, $metric, $format);
+ }
// For TCPDF, we specify permission we want to block
$pdfrights = array('modify','copy');
- $pdfuserpass = ''; // Password for the end user
- $pdfownerpass = NULL; // Password of the owner, created randomly if not defined
- $pdf->SetProtection($pdfrights,$pdfuserpass,$pdfownerpass);
- }
- else
- {
- if (class_exists('TCPDI')) $pdf = new TCPDI($pagetype,$metric,$format);
- else if (class_exists('FPDI')) $pdf = new FPDI($pagetype,$metric,$format);
- else $pdf = new TCPDF($pagetype,$metric,$format);
+ $pdfuserpass = ''; // Password for the end user
+ $pdfownerpass = null; // Password of the owner, created randomly if not defined
+ $pdf->SetProtection($pdfrights, $pdfuserpass, $pdfownerpass);
+ } else {
+ if (class_exists('TCPDI')) {
+ $pdf = new TCPDI($pagetype, $metric, $format);
+ } elseif (class_exists('FPDI')) {
+ $pdf = new FPDI($pagetype, $metric, $format);
+ } else {
+ $pdf = new TCPDF($pagetype, $metric, $format);
+ }
}
// If we use FPDF class, we may need to add method writeHTMLCell
- if (! empty($conf->global->MAIN_USE_FPDF) && ! method_exists($pdf, 'writeHTMLCell'))
- {
- // Declare here a class to overwrite FPDI to add method writeHTMLCell
+ if (! empty($conf->global->MAIN_USE_FPDF) && ! method_exists($pdf, 'writeHTMLCell')) {
+ // Declare here a class to overwrite FPDI to add method writeHTMLCell
/**
* This class is an enhanced FPDI class that support method writeHTMLCell
*/
class FPDI_DolExtended extends FPDI
{
- /**
+ /**
* __call
*
* @param string $method Method
@@ -183,10 +193,10 @@ class FPDI_DolExtended extends FPDI
*/
public function __call($method, $args)
{
- if (isset($this->$method)) {
- $func = $this->$method;
- $func($args);
- }
+ if (isset($this->$method)) {
+ $func = $this->$method;
+ $func($args);
+ }
}
/**
@@ -207,20 +217,20 @@ public function __call($method, $args)
*/
public function writeHTMLCell($w, $h, $x, $y, $html = '', $border = 0, $ln = 0, $fill = false, $reseth = true, $align = '', $autopadding = true)
{
- $this->SetXY($x,$y);
- $val=str_replace('