From 5f835bed7ec7a7b9e46764f66b25213e3267f85c Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 21 May 2012 15:45:44 +0200 Subject: [PATCH 1/7] Fix: broken features --- htdocs/categories/categorie.php | 6 ++--- htdocs/categories/class/categorie.class.php | 26 ++++++++++++++------- htdocs/categories/edit.php | 14 ++++++----- 3 files changed, 28 insertions(+), 18 deletions(-) diff --git a/htdocs/categories/categorie.php b/htdocs/categories/categorie.php index 2a6e437c765..4a7ceaf36c3 100644 --- a/htdocs/categories/categorie.php +++ b/htdocs/categories/categorie.php @@ -39,6 +39,7 @@ $type = GETPOST('type'); $mesg = GETPOST('mesg'); $removecat = GETPOST('removecat','int'); +$catMere=GETPOST('catMere','int'); $dbtablename = ''; @@ -121,7 +122,7 @@ if ($removecat > 0) } // Add object into a category -if (isset($_REQUEST["catMere"]) && $_REQUEST["catMere"]>=0) +if ($catMere > 0) { if ($type==0 && ($user->rights->produit->creer || $user->rights->service->creer)) { @@ -150,7 +151,7 @@ if (isset($_REQUEST["catMere"]) && $_REQUEST["catMere"]>=0) $elementtype = 'member'; } $cat = new Categorie($db); - $result=$cat->fetch($_REQUEST["catMere"]); + $result=$cat->fetch($catMere); $result=$cat->add_type($object,$elementtype); if ($result >= 0) @@ -162,7 +163,6 @@ if (isset($_REQUEST["catMere"]) && $_REQUEST["catMere"]>=0) if ($cat->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') $mesg='
'.$langs->trans("ObjectAlreadyLinkedToCategory").'
'; else $mesg=$langs->trans("Error").' '.$cat->error; } - } diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php index ad11b066e8b..3a31f6b0e7f 100644 --- a/htdocs/categories/class/categorie.class.php +++ b/htdocs/categories/class/categorie.class.php @@ -579,7 +579,8 @@ class Categorie $cats = array (); while ($rec = $this->db->fetch_array($res)) { - $cat = new Categorie($this->db, $rec['fk_categorie_fille']); + $cat = new self($this->db); + $cat->fetch($rec['fk_categorie_fille']); $cats[] = $cat; } return $cats; @@ -826,9 +827,10 @@ class Categorie if ($res) { $cats = array (); - while ($record = $this->db->fetch_array($res)) + while ($rec = $this->db->fetch_array($res)) { - $cat = new Categorie($this->db, $record['rowid']); + $cat = new self($this->db); + $cat->fetch($rec['rowid']); $cats[$record['rowid']] = $cat; } return $cats; @@ -1059,9 +1061,11 @@ class Categorie if ($res) { - while ($cat = $this->db->fetch_array($res)) + while ($rec = $this->db->fetch_array($res)) { - $meres[] = new Categorie($this->db, $cat['fk_categorie_mere']); + $cat = new self($this->db); + $cat->fetch($rec['fk_categorie_mere']); + $meres[] = $cat; } return $meres; } @@ -1125,9 +1129,11 @@ class Categorie $res = $this->db->query($sql); if ($res) { - while ($cat = $this->db->fetch_array($res)) + while ($rec = $this->db->fetch_array($res)) { - $cats[] = new Categorie($this->db, $cat['fk_categorie']); + $cat = new self($this->db); + $cat->fetch($rec['fk_categorie']); + $cats[] = $cat; } return $cats; @@ -1174,9 +1180,11 @@ class Categorie $res = $this->db->query($sql); if ($res) { - while ($id = $this->db->fetch_array($res)) + while ($rec = $this->db->fetch_array($res)) { - $cats[] = new Categorie($this->db, $id['rowid']); + $cat = new self($this->db); + $cat->fetch($rec['rowid']); + $cats[] = $cat; } return $cats; diff --git a/htdocs/categories/edit.php b/htdocs/categories/edit.php index 015b964d452..76b38f29681 100644 --- a/htdocs/categories/edit.php +++ b/htdocs/categories/edit.php @@ -108,7 +108,9 @@ print_fiche_titre($langs->trans("ModifCat")); dol_htmloutput_errors($mesg); -$categorie = new Categorie($db, $id); +$object = new Categorie($db); +$object->fetch($id); + $form = new Form($db); print ''; @@ -119,7 +121,7 @@ print "\n"; print ''; print ''; print ''; -print ''; +print ''; print ''; print '
'; @@ -127,7 +129,7 @@ print '
'; // Ref print ''; -print ''; // Description @@ -135,13 +137,13 @@ print ''; print ''; print ''; // Parent category print ''; print '
'; print $langs->trans("Ref").''; +print ''; print '
'.$langs->trans("Description").''; require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); -$doleditor=new DolEditor('description',$categorie->description,'',200,'dolibarr_notes','',false,true,$conf->fckeditor->enabled,ROWS_6,50); +$doleditor=new DolEditor('description',$object->description,'',200,'dolibarr_notes','',false,true,$conf->fckeditor->enabled,ROWS_6,50); $doleditor->Create(); print '
'.$langs->trans("In").''; -print $form->select_all_categories($type,$categorie->id_mere,'catMere',64,$categorie->id); +print $form->select_all_categories($type,$object->id_mere,'catMere',64,$object->id); print '
'; @@ -154,7 +156,7 @@ print ''; print ''; -$db->close(); llxFooter(); +$db->close(); ?> From 63f6707a7bd4b838f2ef607947b83898d6fe2d4d Mon Sep 17 00:00:00 2001 From: FHenry Date: Mon, 21 May 2012 16:16:24 +0200 Subject: [PATCH 2/7] correct bug #410 Conflicts: htdocs/comm/mailing/cibles.php --- htdocs/comm/mailing/cibles.php | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php index 0b642de04ce..ff13527b06a 100644 --- a/htdocs/comm/mailing/cibles.php +++ b/htdocs/comm/mailing/cibles.php @@ -127,10 +127,26 @@ if ($action == 'delete') $sql="DELETE FROM ".MAIN_DB_PREFIX."mailing_cibles where rowid=".$id; $resql=$db->query($sql); if ($resql) - { - $classname = "MailingTargets"; - $obj = new $classname($db); - $obj->update_nb($id); + { //on récurpére l'id du mailing + $id = GETPOST('id','int'); + + if (!empty($id)) + { + $file = $dirmod."/modules_mailings.php"; + $classname = "MailingTargets"; + require_once($file); + + $obj = new $classname($db); + $obj->update_nb($id); + + Header("Location: cibles.php?id=".$id); + exit; + } + else + { + Header("Location: liste.php"); + exit; + } } else { From b2ad2decada7d0c5be6d487d408b5a21699e3a14 Mon Sep 17 00:00:00 2001 From: juanjo Date: Mon, 21 May 2012 16:20:19 +0200 Subject: [PATCH 3/7] [ task #407 ] Manage PDF hidden items --- htdocs/admin/pdf.php | 42 +++++++++++++++++++++++++++++++++++ htdocs/langs/ca_ES/admin.lang | 3 +++ htdocs/langs/en_US/admin.lang | 3 +++ htdocs/langs/es_ES/admin.lang | 3 +++ htdocs/langs/fr_FR/admin.lang | 3 +++ 5 files changed, 54 insertions(+) diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php index e3c698af0c5..c344c75c8b9 100755 --- a/htdocs/admin/pdf.php +++ b/htdocs/admin/pdf.php @@ -200,6 +200,27 @@ if ($action == 'edit') // Edit print ''.$langs->trans("HideAnyVATInformationOnPDF").''; print $form->selectyesno('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT',(! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))?$conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT:0,1); print ''; + + if ($conf->global->MAIN_FEATURES_LEVEL > 1) + { + //Desc + $var=!$var; + print ''.$langs->trans("HideDescOnPDF").''; + print $form->selectyesno('MAIN_GENERATE_DOCUMENTS_HIDE_DESC',(! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC))?$conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC:0,1); + print ''; + + //Ref + $var=!$var; + print ''.$langs->trans("HideRefOnPDF").''; + print $form->selectyesno('MAIN_GENERATE_DOCUMENTS_HIDE_REF',(! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF))?$conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF:0,1); + print ''; + + //Details + $var=!$var; + print ''.$langs->trans("HideDetailsOnPDF").''; + print $form->selectyesno('MAIN_GENERATE_DOCUMENTS_HIDE_REF',(! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS))?$conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS:0,1); + print ''; + } print ''; @@ -341,6 +362,27 @@ else // Show print ''.$langs->trans("HideAnyVATInformationOnPDF").''; print yn($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT,1); print ''; + + if ($conf->global->MAIN_FEATURES_LEVEL > 1) + { + //Desc + $var=!$var; + print ''.$langs->trans("HideDescOnPDF").''; + print yn($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC,1); + print ''; + + //Ref + $var=!$var; + print ''.$langs->trans("HideRefOnPDF").''; + print yn($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF,1); + print ''; + + //Details + $var=!$var; + print ''.$langs->trans("HideDetailsOnPDF").''; + print yn($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS,1); + print ''; + } print ''; diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang index 65f5d9bb2c9..36bd248dc94 100644 --- a/htdocs/langs/ca_ES/admin.lang +++ b/htdocs/langs/ca_ES/admin.lang @@ -321,6 +321,9 @@ PDF=PDF PDFDesc=Podeu definir aquí les opcions globals per a la generació dels PDF PDFAddressForging=Regles de visualització d'adreces HideAnyVATInformationOnPDF=Amagar tota la informació relacionada amb l'IVA en la generació dels PDF +HideDescOnPDF=Amagar descripció dels productes en la generació dels PDF +HideRefOnPDF=Amagar referència dels productes en la generació dels PDF +HideDetailsOnPDF=Amagar detalls de les línies de productes en la generació dels PDF UrlGenerationParameters=Seguretat de les URL SecurityTokenIsUnique=Fer servir un paràmetre securekey únic per a cada URL? EnterRefToBuildUrl=Introduïu la referència de l'objecte %s diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 0fa4d7677de..d9505beb391 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -320,6 +320,9 @@ PDF=PDF PDFDesc=You can set each global options related to the PDF generation PDFAddressForging=Rules to forge address boxes HideAnyVATInformationOnPDF=Hide all information related to VAT on generated PDF +HideDescOnPDF=Hide products description on generated PDF +HideRefOnPDF=Hide products ref. on generated PDF +HideDetailsOnPDF=Hide products lines details on generated PDF UrlGenerationParameters=Parameters to secure URLs SecurityTokenIsUnique=Use a unique securekey parameter for each URL EnterRefToBuildUrl=Enter reference for object %s diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang index 69c762db639..6558c66b19e 100644 --- a/htdocs/langs/es_ES/admin.lang +++ b/htdocs/langs/es_ES/admin.lang @@ -321,6 +321,9 @@ PDF=PDF PDFDesc=Puede definir aquí las opciones globales para la generación de los PDF PDFAddressForging=Reglas de visualización de direcciones HideAnyVATInformationOnPDF=Ocultar toda la información relacionada con el IVA en la generación de los PDF +HideDescOnPDF=Ocultar descripción de los productos en la generación de los PDF +HideRefOnPDF=Ocultar referencia de los productos en la generación de los PDF +HideDetailsOnPDF=Ocultar detalles de las líneas de productos en la generación de los PDF UrlGenerationParameters=Seguridad de las URLs SecurityTokenIsUnique=¿Usar un parámetro securekey único para cada URL? EnterRefToBuildUrl=Introduzca la referencia del objeto %s diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index eddd2abff01..06cad779355 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -321,6 +321,9 @@ PDF=PDF PDFDesc=Vous pouvez définir ici des options globales sur la génération des PDF PDFAddressForging=Règle de fabrication des zones adresses HideAnyVATInformationOnPDF=Cacher toutes les informations en rapport avec la TVA sur les PDF générés +HideDescOnPDF=Cacher la description des produits sur les PDF généres +HideRefOnPDF=Cacher la référence des produits sur les PDF généres +HideDetailsOnPDF=Cacher les détails des lignes de produits sur les PDF générés UrlGenerationParameters=Sécurisation des URLs SecurityTokenIsUnique=Utiliser un paramètre securekey unique pour chaque URL ? EnterRefToBuildUrl=Entrez la référence pour l'objet %s From 9b70ac1be3a30a62c3f3ee6e35a1707ef78ef7d3 Mon Sep 17 00:00:00 2001 From: juanjo Date: Mon, 21 May 2012 15:39:15 +0200 Subject: [PATCH 4/7] [ bug #399 ] Bad calculation of local taxes in update line products --- htdocs/fourn/facture/fiche.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php index 1840291be73..7a3224c87e8 100644 --- a/htdocs/fourn/facture/fiche.php +++ b/htdocs/fourn/facture/fiche.php @@ -402,6 +402,7 @@ elseif ($action == 'update_line') if ($_REQUEST['etat'] == '1' && ! $_REQUEST['cancel']) // si on valide la modification { $object->fetch($id); + $object->fetch_thirdparty(); if ($_POST['puht']) { From dbdd3f5e8a2fb61b1244ef4b4db987e6e0c4e232 Mon Sep 17 00:00:00 2001 From: juanjo Date: Mon, 21 May 2012 16:23:52 +0200 Subject: [PATCH 5/7] [ task #407 ] Manage PDF hidden items --- htdocs/admin/pdf.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php index c344c75c8b9..03106072f68 100755 --- a/htdocs/admin/pdf.php +++ b/htdocs/admin/pdf.php @@ -218,7 +218,7 @@ if ($action == 'edit') // Edit //Details $var=!$var; print ''.$langs->trans("HideDetailsOnPDF").''; - print $form->selectyesno('MAIN_GENERATE_DOCUMENTS_HIDE_REF',(! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS))?$conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS:0,1); + print $form->selectyesno('MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS',(! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS))?$conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS:0,1); print ''; } From a6b0242f8af12f595fce56d14df1c5b5b17f7333 Mon Sep 17 00:00:00 2001 From: juanjo Date: Mon, 21 May 2012 17:12:57 +0200 Subject: [PATCH 6/7] [ task #407 ] Manage PDF hidden items --- htdocs/admin/pdf.php | 10 ++++++++- htdocs/comm/propal.php | 36 +++++++++++++++++++++++---------- htdocs/commande/fiche.php | 36 +++++++++++++++++++++++---------- htdocs/compta/facture.php | 34 ++++++++++++++++++++++--------- htdocs/expedition/fiche.php | 16 ++++++++++++++- htdocs/fichinter/fiche.php | 16 ++++++++++++++- htdocs/fourn/commande/fiche.php | 20 ++++++++++++++---- htdocs/fourn/facture/fiche.php | 16 ++++++++++++++- 8 files changed, 144 insertions(+), 40 deletions(-) diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php index 03106072f68..84fcc06d462 100755 --- a/htdocs/admin/pdf.php +++ b/htdocs/admin/pdf.php @@ -2,6 +2,7 @@ /* Copyright (C) 2001-2005 Rodolphe Quiedeville * Copyright (C) 2004-2012 Laurent Destailleur * Copyright (C) 2005-2011 Regis Houssin + * Copyright (C) 2012 Juanjo Menent * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -54,7 +55,14 @@ if ($action == 'update') dolibarr_set_const($db, "MAIN_PROFID3_IN_ADDRESS", $_POST["MAIN_PROFID3_IN_ADDRESS"],'chaine',0,'',$conf->entity); dolibarr_set_const($db, "MAIN_PROFID4_IN_ADDRESS", $_POST["MAIN_PROFID4_IN_ADDRESS"],'chaine',0,'',$conf->entity); dolibarr_set_const($db, "MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT", $_POST["MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT"],'chaine',0,'',$conf->entity); - + + if ($conf->global->MAIN_FEATURES_LEVEL > 1) + { + dolibarr_set_const($db, "MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS", $_POST["MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS"],'chaine',0,'',$conf->entity); + dolibarr_set_const($db, "MAIN_GENERATE_DOCUMENTS_HIDE_DESC", $_POST["MAIN_GENERATE_DOCUMENTS_HIDE_DESC"],'chaine',0,'',$conf->entity); + dolibarr_set_const($db, "MAIN_GENERATE_DOCUMENTS_HIDE_REF", $_POST["MAIN_GENERATE_DOCUMENTS_HIDE_REF"],'chaine',0,'',$conf->entity); + } + Header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup"); exit; } diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index eedf29026dd..68b413a8d17 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -5,7 +5,7 @@ * Copyright (C) 2005 Marc Barilley / Ocebo * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2006 Andre Cianfarani - * Copyright (C) 2010-2011 Juanjo Menent + * Copyright (C) 2010-2012 Juanjo Menent * Copyright (C) 2010-2011 Philippe Grand * Copyright (C) 2012 Christophe Battarel * @@ -64,6 +64,20 @@ $mesg=(GETPOST("msg") ? GETPOST("msg") : GETPOST("mesg")); $year=GETPOST("year"); $month=GETPOST("month"); +//PDF +if ($conf->global->MAIN_FEATURES_LEVEL > 1) +{ + $hidedetails = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS)?0:1; + $hidedesc = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC)?0:1; + $hideref = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF)?0:1; +} +else +{ + $hidedetails= GETPOST('hidedetails'); + $hidedesc = GETPOST('hidedesc'); + $hideref = GETPOST('hideref'); +} + // Nombre de ligne pour choix de produit/service predefinis $NBLINES=4; @@ -172,7 +186,7 @@ else if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights-> if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) { $ret=$object->fetch($id); // Reload to get new records - propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager); + propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager); } Header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id); @@ -201,7 +215,7 @@ else if ($action == 'confirm_validate' && $confirm == 'yes' && $user->rights->pr if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) { $ret=$object->fetch($id); // Reload to get new records - propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager); + propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager); } } else @@ -383,7 +397,7 @@ else if ($action == 'add' && $user->rights->propale->creer) $outputlangs = new Translate("",$conf); $outputlangs->setDefaultLang($newlang); } - if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager); + if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager); Header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id); exit; @@ -652,7 +666,7 @@ if ($action == 'modif' && $user->rights->propale->creer) $outputlangs->setDefaultLang($newlang); } - if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager); + if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager); } else if ($action == "setabsolutediscount" && $user->rights->propale->creer) @@ -826,7 +840,7 @@ else if ($action == "addline" && $user->rights->propale->creer) if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) { $ret=$object->fetch($id); // Reload to get new records - propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager); + propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager); } unset($_POST['qty']); @@ -912,7 +926,7 @@ else if ($action == 'updateligne' && $user->rights->propale->creer && $_POST["sa if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) { $ret=$object->fetch($id); // Reload to get new records - propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager); + propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager); } } } @@ -938,7 +952,7 @@ else if ($action == 'builddoc' && $user->rights->propale->creer) $outputlangs = new Translate("",$conf); $outputlangs->setDefaultLang($newlang); } - $result=propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager); + $result=propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager); if ($result <= 0) { dol_print_error($db,$result); @@ -1018,7 +1032,7 @@ else if ($action == 'up' && $user->rights->propale->creer) $outputlangs = new Translate("",$conf); $outputlangs->setDefaultLang($newlang); } - if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager); + if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager); Header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id.'#'.GETPOST('rowid')); exit; @@ -1040,7 +1054,7 @@ else if ($action == 'down' && $user->rights->propale->creer) $outputlangs = new Translate("",$conf); $outputlangs->setDefaultLang($newlang); } - if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager); + if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager); Header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id.'#'.GETPOST('rowid')); exit; @@ -1782,7 +1796,7 @@ if ($action == 'presend') $outputlangs->setDefaultLang($newlang); } - $result=propale_pdf_create($db, $object, GETPOST('model')?GETPOST('model'):$object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager); + $result=propale_pdf_create($db, $object, GETPOST('model')?GETPOST('model'):$object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager); if ($result <= 0) { dol_print_error($db,$result); diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index 8dd59e31e15..2e8b723feb6 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -4,7 +4,7 @@ * Copyright (C) 2005 Marc Barilley / Ocebo * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2006 Andre Cianfarani - * Copyright (C) 2010-2011 Juanjo Menent + * Copyright (C) 2010-2012 Juanjo Menent * Copyright (C) 2011 Philippe Grand * Copyright (C) 2012 Christophe Battarel * @@ -58,6 +58,20 @@ $confirm = GETPOST('confirm'); $lineid = GETPOST('lineid'); $mesg = GETPOST('mesg'); +//PDF +if ($conf->global->MAIN_FEATURES_LEVEL > 1) +{ + $hidedetails = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS)?0:1; + $hidedesc = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC)?0:1; + $hideref = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF)?0:1; +} +else +{ + $hidedetails= GETPOST('hidedetails'); + $hidedesc = GETPOST('hidedesc'); + $hideref = GETPOST('hideref'); +} + // Security check if ($user->societe_id) $socid=$user->societe_id; $result=restrictedArea($user,'commande',$id,''); @@ -171,7 +185,7 @@ else if ($action == 'confirm_deleteline' && $confirm == 'yes') if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) { $ret=$object->fetch($id); // Reload to get new records - commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager); + commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager); } } else @@ -489,7 +503,7 @@ else if ($action == 'setconditions' && $user->rights->commande->creer) } $ret=$object->fetch($id); // Reload to get new records - commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager); + commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager); } } } @@ -684,7 +698,7 @@ else if ($action == 'addline' && $user->rights->commande->creer) } $ret=$object->fetch($id); // Reload to get new records - commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager); + commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager); } unset($_POST['qty']); @@ -797,7 +811,7 @@ else if ($action == 'updateligne' && $user->rights->commande->creer && $_POST['s if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) { $ret=$object->fetch($id); // Reload to get new records - commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager); + commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager); } } else @@ -847,7 +861,7 @@ else if ($action == 'confirm_validate' && $confirm == 'yes' && $user->rights->co $outputlangs = new Translate("",$conf); $outputlangs->setDefaultLang($newlang); } - if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager); + if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager); } } } @@ -889,7 +903,7 @@ else if ($action == 'confirm_modif' && $user->rights->commande->creer) if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) { $ret=$object->fetch($id); // Reload to get new records - commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager); + commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager); } } } @@ -949,7 +963,7 @@ else if ($action == 'up' && $user->rights->commande->creer) $outputlangs->setDefaultLang($newlang); } - if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager); + if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager); Header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id.'#'.$_GET['rowid']); exit; @@ -971,7 +985,7 @@ else if ($action == 'down' && $user->rights->commande->creer) $outputlangs = new Translate("",$conf); $outputlangs->setDefaultLang($newlang); } - if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager); + if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager); Header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id.'#'.$_GET['rowid']); exit; @@ -1003,7 +1017,7 @@ else if ($action == 'builddoc') // In get or post $outputlangs = new Translate("",$conf); $outputlangs->setDefaultLang($newlang); } - $result=commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager); + $result=commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager); if ($result <= 0) { dol_print_error($db,$result); @@ -2282,7 +2296,7 @@ else $outputlangs->setDefaultLang($newlang); } - $result=commande_pdf_create($db, $object, GETPOST('model')?GETPOST('model'):$object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager); + $result=commande_pdf_create($db, $object, GETPOST('model')?GETPOST('model'):$object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager); if ($result <= 0) { dol_print_error($db,$result); diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 5f3ee6d12f8..8f65b25edf8 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -5,7 +5,7 @@ * Copyright (C) 2005 Marc Barilley / Ocebo * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2006 Andre Cianfarani - * Copyright (C) 2010-2011 Juanjo Menent + * Copyright (C) 2010-2012 Juanjo Menent * Copyright (C) 2012 Christophe Battarel * * This program is free software; you can redistribute it and/or modify @@ -69,6 +69,20 @@ $search_societe=GETPOST('search_societe','alpha'); $search_montant_ht=GETPOST('search_montant_ht','alpha'); $search_montant_ttc=GETPOST('search_montant_ttc','alpha'); +//PDF +if ($conf->global->MAIN_FEATURES_LEVEL > 1) +{ + $hidedetails = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS)?0:1; + $hidedesc = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC)?0:1; + $hideref = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF)?0:1; +} +else +{ + $hidedetails= GETPOST('hidedetails'); + $hidedesc = GETPOST('hidedesc'); + $hideref = GETPOST('hideref'); +} + // Security check $fieldid = (! empty($ref)?'facnumber':'rowid'); if ($user->societe_id) $socid=$user->societe_id; @@ -185,7 +199,7 @@ else if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights-> if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) { $ret=$object->fetch($id); // Reload to get new records - $result=facture_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager); + $result=facture_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager); } if ($result >= 0) { @@ -374,7 +388,7 @@ else if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->factu if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) { $ret=$object->fetch($id); // Reload to get new records - facture_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager); + facture_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager); } } else @@ -451,7 +465,7 @@ else if ($action == 'confirm_modif' && ((empty($conf->global->MAIN_USE_ADVANCED_ if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) { $ret=$object->fetch($id); // Reload to get new records - facture_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager); + facture_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager); } } } @@ -1120,7 +1134,7 @@ else if (($action == 'addline' || $action == 'addline_predef') && $user->rights- if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) { $ret=$object->fetch($id); // Reload to get new records - facture_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager); + facture_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager); } unset($_POST['qty']); unset($_POST['type']); @@ -1222,7 +1236,7 @@ else if ($action == 'updateligne' && $user->rights->facture->creer && $_POST['sa if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) { $ret=$object->fetch($id); // Reload to get new records - facture_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager); + facture_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager); } } } @@ -1250,7 +1264,7 @@ else if ($action == 'up' && $user->rights->facture->creer) $outputlangs = new Translate("",$conf); $outputlangs->setDefaultLang($newlang); } - if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) facture_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager); + if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) facture_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager); Header('Location: '.$_SERVER["PHP_SELF"].'?facid='.$object->id.'#'.$_GET['rowid']); exit; @@ -1272,7 +1286,7 @@ else if ($action == 'down' && $user->rights->facture->creer) $outputlangs = new Translate("",$conf); $outputlangs->setDefaultLang($newlang); } - if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) facture_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager); + if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) facture_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager); Header('Location: '.$_SERVER["PHP_SELF"].'?facid='.$object->id.'#'.$_GET['rowid']); exit; @@ -1506,7 +1520,7 @@ else if ($action == 'builddoc') // En get ou en post $outputlangs = new Translate("",$conf); $outputlangs->setDefaultLang($newlang); } - $result=facture_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager); + $result=facture_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager); if ($result <= 0) { dol_print_error($db,$result); @@ -3210,7 +3224,7 @@ else $outputlangs->setDefaultLang($newlang); } - $result=facture_pdf_create($db, $object, GETPOST('model')?GETPOST('model'):$object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager); + $result=facture_pdf_create($db, $object, GETPOST('model')?GETPOST('model'):$object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager); if ($result <= 0) { dol_print_error($db,$result); diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php index 5d3903e5471..fd0ae55bf8e 100644 --- a/htdocs/expedition/fiche.php +++ b/htdocs/expedition/fiche.php @@ -60,6 +60,20 @@ $result=restrictedArea($user,$origin,$origin_id); $action = GETPOST('action','alpha'); $confirm = GETPOST('confirm','alpha'); +//PDF +if ($conf->global->MAIN_FEATURES_LEVEL > 1) +{ + $hidedetails = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS)?0:1; + $hidedesc = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC)?0:1; + $hideref = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF)?0:1; +} +else +{ + $hidedetails= GETPOST('hidedetails'); + $hidedesc = GETPOST('hidedesc'); + $hideref = GETPOST('hideref'); +} + $object = new Expedition($db); /* @@ -1379,7 +1393,7 @@ else $outputlangs->setDefaultLang($newlang); } - $result=expedition_pdf_create($db, $object, GETPOST('model')?GETPOST('model'):$object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager); + $result=expedition_pdf_create($db, $object, GETPOST('model')?GETPOST('model'):$object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager); if ($result <= 0) { dol_print_error($db,$result); diff --git a/htdocs/fichinter/fiche.php b/htdocs/fichinter/fiche.php index 22a0bdc4946..0825c5a7e44 100644 --- a/htdocs/fichinter/fiche.php +++ b/htdocs/fichinter/fiche.php @@ -50,6 +50,20 @@ $action = GETPOST('action','alpha'); $confirm = GETPOST('confirm','alpha'); $mesg = GETPOST('msg','alpha'); +//PDF +if ($conf->global->MAIN_FEATURES_LEVEL > 1) +{ + $hidedetails = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS)?0:1; + $hidedesc = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC)?0:1; + $hideref = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF)?0:1; +} +else +{ + $hidedetails= GETPOST('hidedetails'); + $hidedesc = GETPOST('hidedesc'); + $hideref = GETPOST('hideref'); +} + // Security check if ($user->societe_id) $socid=$user->societe_id; $result = restrictedArea($user, 'ficheinter', $id, 'fichinter'); @@ -1253,7 +1267,7 @@ else if ($id > 0 || ! empty($ref)) $outputlangs->setDefaultLang($newlang); } - $result=fichinter_create($db, $object, GETPOST('model')?GETPOST('model'):$object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager); + $result=fichinter_create($db, $object, GETPOST('model')?GETPOST('model'):$object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager); if ($result <= 0) { dol_print_error($db,$result); diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php index 5fc31efe69f..4f7b5fdd6b6 100644 --- a/htdocs/fourn/commande/fiche.php +++ b/htdocs/fourn/commande/fiche.php @@ -3,7 +3,7 @@ * Copyright (C) 2004-2012 Laurent Destailleur * Copyright (C) 2005 Eric Seigne * Copyright (C) 2005-2012 Regis Houssin - * Copyright (C) 2010-2011 Juanjo Menent + * Copyright (C) 2010-2012 Juanjo Menent * Copyright (C) 2011 Philippe Grand * * This program is free software; you can redistribute it and/or modify @@ -54,9 +54,21 @@ $confirm = GETPOST('confirm','alpha'); $comclientid = GETPOST('comid','int'); $socid = GETPOST('socid','int'); $projectid = GETPOST('projectid','int'); -$hidedetails = GETPOST('hidedetails','alpha'); -$hidedesc = GETPOST('hidedesc','alpha'); -$hideref = GETPOST('hideref','alpha'); + +//PDF +if ($conf->global->MAIN_FEATURES_LEVEL > 1) +{ + $hidedetails = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS)?0:1; + $hidedesc = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC)?0:1; + $hideref = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF)?0:1; +} +else +{ + $hidedetails = GETPOST('hidedetails','alpha'); + $hidedesc = GETPOST('hidedesc','alpha'); + $hideref = GETPOST('hideref','alpha'); +} + // Security check if ($user->societe_id) $socid=$user->societe_id; diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php index 7a3224c87e8..c59c7c933b0 100644 --- a/htdocs/fourn/facture/fiche.php +++ b/htdocs/fourn/facture/fiche.php @@ -46,6 +46,20 @@ $id = (GETPOST('facid','int') ? GETPOST('facid','int') : GETPOST('id','int')); $action = GETPOST("action"); $confirm = GETPOST("confirm"); +//PDF +if ($conf->global->MAIN_FEATURES_LEVEL > 1) +{ + $hidedetails = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS)?0:1; + $hidedesc = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC)?0:1; + $hideref = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF)?0:1; +} +else +{ + $hidedetails= GETPOST('hidedetails'); + $hidedesc = GETPOST('hidedesc'); + $hideref = GETPOST('hideref'); +} + // Security check if ($user->societe_id) $socid=$user->societe_id; $result = restrictedArea($user, 'fournisseur', $id, 'facture_fourn', 'facture'); @@ -1922,7 +1936,7 @@ else $outputlangs->setDefaultLang($newlang); } - $result=supplier_invoice_pdf_create($db, $object, GETPOST('model')?GETPOST('model'):$object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager); + $result=supplier_invoice_pdf_create($db, $object, GETPOST('model')?GETPOST('model'):$object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager); if ($result <= 0) { dol_print_error($db,$result); From 9cf2ea492cc7b782c7d84e4f143886dcbd2b5ab8 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 21 May 2012 18:44:09 +0200 Subject: [PATCH 7/7] Fix: broken features with external module --- htdocs/comm/propal.php | 15 +++------------ htdocs/commande/fiche.php | 15 +++------------ htdocs/compta/facture.php | 15 +++------------ htdocs/expedition/fiche.php | 15 +++------------ htdocs/fichinter/fiche.php | 15 +++------------ htdocs/fourn/commande/fiche.php | 15 +++------------ htdocs/fourn/facture/fiche.php | 15 +++------------ 7 files changed, 21 insertions(+), 84 deletions(-) diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 68b413a8d17..c6b4a607520 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -65,18 +65,9 @@ $year=GETPOST("year"); $month=GETPOST("month"); //PDF -if ($conf->global->MAIN_FEATURES_LEVEL > 1) -{ - $hidedetails = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS)?0:1; - $hidedesc = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC)?0:1; - $hideref = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF)?0:1; -} -else -{ - $hidedetails= GETPOST('hidedetails'); - $hidedesc = GETPOST('hidedesc'); - $hideref = GETPOST('hideref'); -} +$hidedetails = (GETPOST('hidedetails','int') ? GETPOST('hidedetails','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0)); +$hidedesc = (GETPOST('hidedesc','int') ? GETPOST('hidedesc','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ? 1 : 0)); +$hideref = (GETPOST('hideref','int') ? GETPOST('hideref','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0)); // Nombre de ligne pour choix de produit/service predefinis $NBLINES=4; diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index 2e8b723feb6..3008771d340 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -59,18 +59,9 @@ $lineid = GETPOST('lineid'); $mesg = GETPOST('mesg'); //PDF -if ($conf->global->MAIN_FEATURES_LEVEL > 1) -{ - $hidedetails = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS)?0:1; - $hidedesc = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC)?0:1; - $hideref = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF)?0:1; -} -else -{ - $hidedetails= GETPOST('hidedetails'); - $hidedesc = GETPOST('hidedesc'); - $hideref = GETPOST('hideref'); -} +$hidedetails = (GETPOST('hidedetails','int') ? GETPOST('hidedetails','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0)); +$hidedesc = (GETPOST('hidedesc','int') ? GETPOST('hidedesc','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ? 1 : 0)); +$hideref = (GETPOST('hideref','int') ? GETPOST('hideref','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0)); // Security check if ($user->societe_id) $socid=$user->societe_id; diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 8f65b25edf8..6d30f8c34d4 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -70,18 +70,9 @@ $search_montant_ht=GETPOST('search_montant_ht','alpha'); $search_montant_ttc=GETPOST('search_montant_ttc','alpha'); //PDF -if ($conf->global->MAIN_FEATURES_LEVEL > 1) -{ - $hidedetails = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS)?0:1; - $hidedesc = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC)?0:1; - $hideref = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF)?0:1; -} -else -{ - $hidedetails= GETPOST('hidedetails'); - $hidedesc = GETPOST('hidedesc'); - $hideref = GETPOST('hideref'); -} +$hidedetails = (GETPOST('hidedetails','int') ? GETPOST('hidedetails','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0)); +$hidedesc = (GETPOST('hidedesc','int') ? GETPOST('hidedesc','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ? 1 : 0)); +$hideref = (GETPOST('hideref','int') ? GETPOST('hideref','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0)); // Security check $fieldid = (! empty($ref)?'facnumber':'rowid'); diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php index fd0ae55bf8e..ac45f0db7f3 100644 --- a/htdocs/expedition/fiche.php +++ b/htdocs/expedition/fiche.php @@ -61,18 +61,9 @@ $action = GETPOST('action','alpha'); $confirm = GETPOST('confirm','alpha'); //PDF -if ($conf->global->MAIN_FEATURES_LEVEL > 1) -{ - $hidedetails = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS)?0:1; - $hidedesc = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC)?0:1; - $hideref = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF)?0:1; -} -else -{ - $hidedetails= GETPOST('hidedetails'); - $hidedesc = GETPOST('hidedesc'); - $hideref = GETPOST('hideref'); -} +$hidedetails = (GETPOST('hidedetails','int') ? GETPOST('hidedetails','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0)); +$hidedesc = (GETPOST('hidedesc','int') ? GETPOST('hidedesc','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ? 1 : 0)); +$hideref = (GETPOST('hideref','int') ? GETPOST('hideref','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0)); $object = new Expedition($db); diff --git a/htdocs/fichinter/fiche.php b/htdocs/fichinter/fiche.php index 0825c5a7e44..9d79d668638 100644 --- a/htdocs/fichinter/fiche.php +++ b/htdocs/fichinter/fiche.php @@ -51,18 +51,9 @@ $confirm = GETPOST('confirm','alpha'); $mesg = GETPOST('msg','alpha'); //PDF -if ($conf->global->MAIN_FEATURES_LEVEL > 1) -{ - $hidedetails = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS)?0:1; - $hidedesc = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC)?0:1; - $hideref = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF)?0:1; -} -else -{ - $hidedetails= GETPOST('hidedetails'); - $hidedesc = GETPOST('hidedesc'); - $hideref = GETPOST('hideref'); -} +$hidedetails = (GETPOST('hidedetails','int') ? GETPOST('hidedetails','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0)); +$hidedesc = (GETPOST('hidedesc','int') ? GETPOST('hidedesc','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ? 1 : 0)); +$hideref = (GETPOST('hideref','int') ? GETPOST('hideref','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0)); // Security check if ($user->societe_id) $socid=$user->societe_id; diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php index 4f7b5fdd6b6..e8fd1a83ef3 100644 --- a/htdocs/fourn/commande/fiche.php +++ b/htdocs/fourn/commande/fiche.php @@ -56,18 +56,9 @@ $socid = GETPOST('socid','int'); $projectid = GETPOST('projectid','int'); //PDF -if ($conf->global->MAIN_FEATURES_LEVEL > 1) -{ - $hidedetails = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS)?0:1; - $hidedesc = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC)?0:1; - $hideref = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF)?0:1; -} -else -{ - $hidedetails = GETPOST('hidedetails','alpha'); - $hidedesc = GETPOST('hidedesc','alpha'); - $hideref = GETPOST('hideref','alpha'); -} +$hidedetails = (GETPOST('hidedetails','int') ? GETPOST('hidedetails','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0)); +$hidedesc = (GETPOST('hidedesc','int') ? GETPOST('hidedesc','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ? 1 : 0)); +$hideref = (GETPOST('hideref','int') ? GETPOST('hideref','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0)); // Security check diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php index c59c7c933b0..be0b0acd31b 100644 --- a/htdocs/fourn/facture/fiche.php +++ b/htdocs/fourn/facture/fiche.php @@ -47,18 +47,9 @@ $action = GETPOST("action"); $confirm = GETPOST("confirm"); //PDF -if ($conf->global->MAIN_FEATURES_LEVEL > 1) -{ - $hidedetails = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS)?0:1; - $hidedesc = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC)?0:1; - $hideref = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF)?0:1; -} -else -{ - $hidedetails= GETPOST('hidedetails'); - $hidedesc = GETPOST('hidedesc'); - $hideref = GETPOST('hideref'); -} +$hidedetails = (GETPOST('hidedetails','int') ? GETPOST('hidedetails','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0)); +$hidedesc = (GETPOST('hidedesc','int') ? GETPOST('hidedesc','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ? 1 : 0)); +$hideref = (GETPOST('hideref','int') ? GETPOST('hideref','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0)); // Security check if ($user->societe_id) $socid=$user->societe_id;