Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git …

…into develop
Dolibarr · Mar 3, 2012 · 2772d1d · 2772d1d
2 parents fb6aad1 + 5139c0a
commit 2772d1d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
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
@@ -110,7 +110,7 @@ function get_substitutionarray_object($object,$outputlangs)
             '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'),

diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -226,7 +226,7 @@ function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hid
 
 				$tab_top = 90;
 				$tab_top_newpage = 50;
-				$tab_height = 110;
+				$tab_height = 130;
 				$tab_height_newpage = 150;
 
 				// Affiche notes
@@ -356,7 +356,7 @@ function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hid
 					{
 					    if ($pagenb == 1)
 						{
-							$this->_tableau($pdf, $tab_top, $tab_height + 20, $nexY, $outputlangs);
+							$this->_tableau($pdf, $tab_top, $tab_height + 40, $nexY, $outputlangs);
 						}
 						else
 						{