diff --git a/ChangeLog b/ChangeLog index 82f764ad6b3..2a236b8c85a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,7 @@ Fix: Pb of records not correctly cleaned when module marge is uninstalled (conflict between 'margin' and 'margins'). Fix: [ bug #1341 ] Lastname not added by file or direct input in mass e-mailing Fix: [ bug #1357 ] Invoice creator state not printed in generated invoice documents +Fix: Suppliers invoice mask fails using {tttt} in numbering ***** ChangeLog for 3.5.2 compared to 3.5.1 ***** Fix: Can't add user for a task. diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php index 22930b4bd44..13047234834 100644 --- a/htdocs/core/lib/pdf.lib.php +++ b/htdocs/core/lib/pdf.lib.php @@ -843,8 +843,8 @@ function pdf_pagefoot(&$pdf,$outputlangs,$paramfreetext,$fromcompany,$marge_bass { $pdf->SetXY(-20,-$posy); //print 'xxx'.$pdf->PageNo().'-'.$pdf->getAliasNbPages().'-'.$pdf->getAliasNumPage();exit; - if (empty($conf->global->MAIN_USE_FPDF)) $pdf->MultiCell(11, 2, $pdf->PageNo().'/'.$pdf->getAliasNbPages(), 0, 'R', 0); - else $pdf->MultiCell(11, 2, $pdf->PageNo().'/{nb}', 0, 'R', 0); + if (empty($conf->global->MAIN_USE_FPDF)) $pdf->MultiCell(13, 2, $pdf->PageNo().'/'.$pdf->getAliasNbPages(), 0, 'R', 0); + else $pdf->MultiCell(13, 2, $pdf->PageNo().'/{nb}', 0, 'R', 0); } return $marginwithfooter; diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php index 5605ed2340f..6ca01ff56a4 100644 --- a/htdocs/fourn/facture/fiche.php +++ b/htdocs/fourn/facture/fiche.php @@ -4,7 +4,7 @@ * Copyright (C) 2004 Christophe Combelles * Copyright (C) 2005 Marc Barilley * Copyright (C) 2005-2013 Regis Houssin - * Copyright (C) 2010-2012 Juanjo Menent + * Copyright (C) 2010-2014 Juanjo Menent * Copyright (C) 2013 Philippe Grand * Copyright (C) 2013 Florian Henry * @@ -1454,7 +1454,7 @@ else //TODO: Possibly will have to control payment information into suppliers //$object->date_lim_reglement=$object->calculate_date_lim_reglement(); } - $numref = $object->getNextNumRef($soc); + $numref = $object->getNextNumRef($societe); } else {