lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Laurent Destailleur 2012-03-03 16:34:13 +01:00
commit 2772d1dfa2
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
View File

@ -110,7 +110,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
'object_ref_supplier'=>$object->ref_fournisseur, 'object_ref_supplier'=>$object->ref_fournisseur,
'object_source_invoice_ref'=>$invoice_source->ref, 'object_source_invoice_ref'=>$invoice_source->ref,
'object_date'=>dol_print_date($object->date,'day'), '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_creation'=>dol_print_date($object->date_creation,'day'),
'object_date_modification'=>dol_print_date($object->date_modification,'day'), 'object_date_modification'=>dol_print_date($object->date_modification,'day'),
'object_date_validation'=>dol_print_date($object->date_validation,'dayhour'), 'object_date_validation'=>dol_print_date($object->date_validation,'dayhour'),

4
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
View File

@ -226,7 +226,7 @@ class pdf_crabe extends ModelePDFFactures
$tab_top = 90; $tab_top = 90;
$tab_top_newpage = 50; $tab_top_newpage = 50;
$tab_height = 110; $tab_height = 130;
$tab_height_newpage = 150; $tab_height_newpage = 150;
// Affiche notes // Affiche notes
@ -356,7 +356,7 @@ class pdf_crabe extends ModelePDFFactures
{ {
if ($pagenb == 1) if ($pagenb == 1)
{ {
$this->_tableau($pdf, $tab_top, $tab_height + 20, $nexY, $outputlangs); $this->_tableau($pdf, $tab_top, $tab_height + 40, $nexY, $outputlangs);
} }
else else
{ {