From 047edc69f941f38d82483acd42639a8f53969e12 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Sat, 3 Mar 2012 07:45:25 +0100 Subject: [PATCH 1/3] Fix: unit test warning --- htdocs/core/modules/commande/doc/pdf_edison.modules.php | 2 +- htdocs/core/modules/commande/doc/pdf_einstein.modules.php | 2 +- htdocs/core/modules/facture/doc/pdf_crabe.modules.php | 2 +- htdocs/core/modules/facture/doc/pdf_oursin.modules.php | 2 +- htdocs/core/modules/propale/doc/pdf_azur.modules.php | 2 +- htdocs/core/modules/propale/doc/pdf_jaune.modules.php | 2 +- .../core/modules/supplier_invoice/pdf/pdf_canelle.modules.php | 2 +- htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/htdocs/core/modules/commande/doc/pdf_edison.modules.php b/htdocs/core/modules/commande/doc/pdf_edison.modules.php index 438fe3307e3..9f80359e54e 100644 --- a/htdocs/core/modules/commande/doc/pdf_edison.modules.php +++ b/htdocs/core/modules/commande/doc/pdf_edison.modules.php @@ -298,7 +298,7 @@ class pdf_edison extends ModelePDFCommandes $pdf->Output($file,'F'); // Actions on extra fields (by external module or standard code) - if (is_object($hookmanager)) + if (! is_object($hookmanager)) { include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'); $hookmanager=new HookManager($this->db); diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php index 4ba7bd8ca31..9c934dfc2f9 100644 --- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php +++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php @@ -407,7 +407,7 @@ class pdf_einstein extends ModelePDFCommandes $pdf->Output($file,'F'); // Actions on extra fields (by external module or standard code) - if (is_object($hookmanager)) + if (! is_object($hookmanager)) { include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'); $hookmanager=new HookManager($this->db); diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php index 14a450e8491..fc16f446890 100755 --- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php +++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php @@ -412,7 +412,7 @@ class pdf_crabe extends ModelePDFFactures $pdf->Output($file,'F'); // Add pdfgeneration hook - if (is_object($hookmanager)) + if (! is_object($hookmanager)) { include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'); $hookmanager=new HookManager($this->db); diff --git a/htdocs/core/modules/facture/doc/pdf_oursin.modules.php b/htdocs/core/modules/facture/doc/pdf_oursin.modules.php index 07efe8f3a62..267607e8aa2 100755 --- a/htdocs/core/modules/facture/doc/pdf_oursin.modules.php +++ b/htdocs/core/modules/facture/doc/pdf_oursin.modules.php @@ -300,7 +300,7 @@ class pdf_oursin extends ModelePDFFactures $pdf->Output($file,'F'); // Actions on extra fields (by external module or standard code) - if (is_object($hookmanager)) + if (! is_object($hookmanager)) { include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'); $hookmanager=new HookManager($this->db); diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php index 0208eec114f..5e6c84bda97 100644 --- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php +++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php @@ -393,7 +393,7 @@ class pdf_azur extends ModelePDFPropales $pdf->Output($file,'F'); // Actions on extra fields (by external module or standard code) - if (is_object($hookmanager)) + if (! is_object($hookmanager)) { include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'); $hookmanager=new HookManager($this->db); diff --git a/htdocs/core/modules/propale/doc/pdf_jaune.modules.php b/htdocs/core/modules/propale/doc/pdf_jaune.modules.php index 74df21eb178..6f916f4a470 100644 --- a/htdocs/core/modules/propale/doc/pdf_jaune.modules.php +++ b/htdocs/core/modules/propale/doc/pdf_jaune.modules.php @@ -393,7 +393,7 @@ class pdf_jaune extends ModelePDFPropales $pdf->Output($file,'F'); // Actions on extra fields (by external module or standard code) - if (is_object($hookmanager)) + if (! is_object($hookmanager)) { include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'); $hookmanager=new HookManager($this->db); diff --git a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php index ee9599cfeaf..46f3bb96904 100755 --- a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php +++ b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php @@ -398,7 +398,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices $pdf->Output($file,'F'); // Actions on extra fields (by external module or standard code) - if (is_object($hookmanager)) + if (! is_object($hookmanager)) { include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'); $hookmanager=new HookManager($this->db); diff --git a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php index 5cd9ae7ad70..36632cde0bf 100644 --- a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php +++ b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php @@ -406,7 +406,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders // Add pdfgeneration hook - if (is_object($hookmanager)) + if (! is_object($hookmanager)) { include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'); $hookmanager=new HookManager($this->db); From b74e24ab4659e2cb83ef9c763fd690bb025ab36b Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Sat, 3 Mar 2012 09:06:26 +0100 Subject: [PATCH 2/3] Fix: increase size --- htdocs/core/modules/facture/doc/pdf_crabe.modules.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php index fc16f446890..f684ad21d0b 100755 --- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php +++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php @@ -226,7 +226,7 @@ class pdf_crabe extends ModelePDFFactures $tab_top = 90; $tab_top_newpage = 50; - $tab_height = 110; + $tab_height = 130; $tab_height_newpage = 150; // Affiche notes @@ -356,7 +356,7 @@ class pdf_crabe extends ModelePDFFactures { if ($pagenb == 1) { - $this->_tableau($pdf, $tab_top, $tab_height + 20, $nexY, $outputlangs); + $this->_tableau($pdf, $tab_top, $tab_height + 40, $nexY, $outputlangs); } else { From 5139c0a69eaa743219b4503acb8bd760dc9e5e5e Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Sat, 3 Mar 2012 11:38:45 +0100 Subject: [PATCH 3/3] Fix: time is not necessary --- .../modules/facture/doc/doc_generic_invoice_odt.modules.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php index 831df574b3d..0ed6bce810b 100644 --- a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php +++ b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php @@ -110,7 +110,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures 'object_ref_supplier'=>$object->ref_fournisseur, 'object_source_invoice_ref'=>$invoice_source->ref, 'object_date'=>dol_print_date($object->date,'day'), - 'object_date_limit'=>dol_print_date($object->date_lim_reglement,'dayhour'), + 'object_date_limit'=>dol_print_date($object->date_lim_reglement,'day'), 'object_date_creation'=>dol_print_date($object->date_creation,'day'), 'object_date_modification'=>dol_print_date($object->date_modification,'day'), 'object_date_validation'=>dol_print_date($object->date_validation,'dayhour'),