[Dolibarr-cvs] dolibarr/htdocs commpropal.php compta/facture.php

[Regis Houssin]

CVSROOT:        /cvsroot/dolibarr
Module name:    dolibarr
Changes by:     Regis Houssin <hregis>  06/06/16 11:34:40

Modified files:
        htdocs/comm    : propal.php 
        htdocs/compta  : facture.php 

Log message:
        bugfix

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/dolibarr/htdocs/comm/propal.php?cvsroot=dolibarr&r1=1.234&r2=1.235
http://cvs.savannah.gnu.org/viewcvs/dolibarr/htdocs/compta/facture.php?cvsroot=dolibarr&r1=1.326&r2=1.327

Patches:
Index: comm/propal.php
===================================================================
RCS file: /cvsroot/dolibarr/dolibarr/htdocs/comm/propal.php,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -b -r1.234 -r1.235
--- comm/propal.php     16 Jun 2006 00:33:24 -0000      1.234
+++ comm/propal.php     16 Jun 2006 11:34:38 -0000      1.235
@@ -20,7 +20,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
- * $Id: propal.php,v 1.234 2006/06/16 00:33:24 eldy Exp $
+ * $Id: propal.php,v 1.235 2006/06/16 11:34:38 hregis Exp $
  * $Source: /cvsroot/dolibarr/dolibarr/htdocs/comm/propal.php,v $
  */
 
@@ -435,10 +435,12 @@
  */
 if ($_REQUEST['action'] == 'builddoc' && $user->rights->propale->creer)
 {
+    $outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
+    $outputlangs->setDefaultLang($_REQUEST['lang_id']);
     $propal = new Propal($db);
     $propal->fetch($_GET['propalid']);
     if ($_POST['model']) $propal->set_pdf_model($user, $_POST['model']);
-    propale_pdf_create($db, $_GET['propalid'], $propal->modelpdf);
+    propale_pdf_create($db, $_GET['propalid'], $propal->modelpdf, 
$outputlangs);
 }
 
 
@@ -1641,6 +1643,6 @@
 }
 $db->close();
 
-llxFooter('$Date: 2006/06/16 00:33:24 $ - $Revision: 1.234 $');
+llxFooter('$Date: 2006/06/16 11:34:38 $ - $Revision: 1.235 $');
 
 ?>

Index: compta/facture.php
===================================================================
RCS file: /cvsroot/dolibarr/dolibarr/htdocs/compta/facture.php,v
retrieving revision 1.326
retrieving revision 1.327
diff -u -b -r1.326 -r1.327
--- compta/facture.php  16 Jun 2006 00:34:59 -0000      1.326
+++ compta/facture.php  16 Jun 2006 11:34:40 -0000      1.327
@@ -20,7 +20,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
- * $Id: facture.php,v 1.326 2006/06/16 00:34:59 eldy Exp $
+ * $Id: facture.php,v 1.327 2006/06/16 11:34:40 hregis Exp $
  * $Source: /cvsroot/dolibarr/dolibarr/htdocs/compta/facture.php,v $
  */
 
@@ -28,7 +28,7 @@
                \file       htdocs/compta/facture.php
                \ingroup    facture
                \brief      Page de création d'une facture
-               \version    $Revision: 1.326 $
+               \version    $Revision: 1.327 $
 */
 
 require('./pre.inc.php');
@@ -666,8 +666,9 @@
        $outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
        $outputlangs->setDefaultLang($_REQUEST['lang_id']);
        $facture = new Facture($db, 0, $_GET['facid']);
-       $facture->set_pdf_model($user, $_POST['model']);
-       $result=facture_pdf_create($db, $_REQUEST['facid'], '', 
$_REQUEST['model'], $outputlangs);
+       $facture->fetch($_GET['facid']);
+       if ($_REQUEST['model']) $facture->set_pdf_model($user, 
$_REQUEST['model']);
+       $result=facture_pdf_create($db, $_REQUEST['facid'], '', 
$facture->modelpdf, $outputlangs);
     if ($result <= 0)
     {
        dolibarr_print_error($db,$result);
@@ -2555,5 +2556,5 @@
 
 $db->close();
 
-llxFooter('$Date: 2006/06/16 00:34:59 $ - $Revision: 1.326 $');
+llxFooter('$Date: 2006/06/16 11:34:40 $ - $Revision: 1.327 $');
 ?>