diff --git a/htdocs/comm/action/rapport/index.php b/htdocs/comm/action/rapport/index.php index 9459373f15b84acf7c3b068428209a839b444abe..127de0cbba236a83b0b508edae316cedac907262 100644 --- a/htdocs/comm/action/rapport/index.php +++ b/htdocs/comm/action/rapport/index.php @@ -54,7 +54,7 @@ $result = restrictedArea($user, 'agenda', $socid, '', 'myactions'); if ($_GET["action"] == 'builddoc') { $cat = new CommActionRapport($db, $_GET["month"], $_GET["year"]); - $result=$cat->generate($_GET["id"]); + $result=$cat->write_file(GETPOST("id")); if ($result < 0) { $mesg=$cat->error; diff --git a/htdocs/includes/modules/action/rapport.pdf.php b/htdocs/includes/modules/action/rapport.pdf.php index c88906aecfcab2fc145e8a5c1441ec4be39a5fea..91a6da57f84c032e0026ee12bd0f279fa77eed14 100644 --- a/htdocs/includes/modules/action/rapport.pdf.php +++ b/htdocs/includes/modules/action/rapport.pdf.php @@ -70,7 +70,14 @@ class CommActionRapport $this->subject=$langs->trans("ActionsReport").' '.$this->year."-".$this->month; } - function generate($socid = 0, $catid = 0, $outputlangs='') + /** + * Write the object to document file to disk + * @param socid + * @param catid + * @param outputlangs Lang object for output language + * @return int 1=OK, 0=KO + */ + function write_file($socid = 0, $catid = 0, $outputlangs='') { global $user,$conf,$langs; diff --git a/htdocs/includes/modules/cheque/pdf/pdf_blochet.class.php b/htdocs/includes/modules/cheque/pdf/pdf_blochet.class.php index 3b0a06cde2ec671a2921bdd579375b32e9c5ad65..948c47144c7493cf0a9ed4b2ffb723d29dadb1c3 100644 --- a/htdocs/includes/modules/cheque/pdf/pdf_blochet.class.php +++ b/htdocs/includes/modules/cheque/pdf/pdf_blochet.class.php @@ -77,11 +77,11 @@ class BordereauChequeBlochet extends ModeleChequeReceipts } /** - * \brief Fonction generant le rapport sur le disque - * \param _dir Directory - * \param number Number - * \param outputlangs Lang output object - * \return int 1=ok, 0=ko + * Fonction generant le rapport sur le disque + * @param _dir Directory + * @param number Number + * @param outputlangs Lang output object + * @return int 1=ok, 0=ko */ function write_file($_dir, $number, $outputlangs) { diff --git a/htdocs/includes/modules/dons/html_cerfafr.modules.php b/htdocs/includes/modules/dons/html_cerfafr.modules.php index 1f3053cded96aa8d52cf77bfef688c887ff38505..f6ba8039a873e51de4421a71f66a68939fc63f5e 100644 --- a/htdocs/includes/modules/dons/html_cerfafr.modules.php +++ b/htdocs/includes/modules/dons/html_cerfafr.modules.php @@ -61,10 +61,11 @@ class html_cerfafr extends ModeleDon /** - \brief Fonction generant le recu sur le disque - \param id Id du recu a generer - \return int >0 si ok, <0 si ko - */ + * Write the object to document file to disk + * @param don Donation object + * @param outputlangs Lang object for output language + * @return int >0 if OK, <0 if KO + */ function write_file($don,$outputlangs) { global $user,$conf,$langs,$mysoc; diff --git a/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php b/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php index cf14c01dbdd3370b9b9c70711b4b614a18babd47..d245ec692f37457feb18dbfd37fef748dbd6ccf8 100644 --- a/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php +++ b/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php @@ -68,7 +68,7 @@ Class pdf_expedition_merou extends ModelePdfExpedition /** * \brief Fonction generant le document sur le disque - * \param obj Objet expedition a generer (ou id si ancienne methode) + * \param object Objet expedition a generer (ou id si ancienne methode) * \param outputlangs Lang output object * \return int 1=ok, 0=ko */ diff --git a/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php b/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php index 72fd54f8ed1b4a8384ca13a970749897892ff98e..cf9501966e4bcb4dd4b2b6198b72231dc6267cac 100644 --- a/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php +++ b/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php @@ -210,7 +210,7 @@ Class pdf_expedition_rouget extends ModelePdfExpedition /** * \brief Fonction generant le document sur le disque - * \param obj Objet expedition a generer (ou id si ancienne methode) + * \param object Objet expedition a generer (ou id si ancienne methode) * \param outputlangs Lang output object * \return int 1=ok, 0=ko */ diff --git a/htdocs/includes/modules/facture/pdf_crabe.modules.php b/htdocs/includes/modules/facture/pdf_crabe.modules.php index 02c43bcb32ddcee74ee0f883443d97420d4519ae..e98ea95126f0d24f6baa37cfd931cebfb671a90e 100644 --- a/htdocs/includes/modules/facture/pdf_crabe.modules.php +++ b/htdocs/includes/modules/facture/pdf_crabe.modules.php @@ -103,7 +103,7 @@ class pdf_crabe extends ModelePDFFactures /** - * Write the invoice to disk + * Write the object to document file to disk * @param object Object invoice to build (or id if old method) * @param outputlangs Lang object for output language * @return int 1=OK, 0=KO diff --git a/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php b/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php index 8f968e617a4d4f970e7c0571eb797d1626c13a4f..1d850e7cebe4c30f4c3eebbeb2d58e5898e79547 100644 --- a/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php +++ b/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php @@ -74,10 +74,10 @@ class pdf_sirocco extends ModelePDFDeliveryOrder /** - * \brief Fonction generant le bon de livraison sur le disque - * \param delivery Object livraison a generer - * \param outputlangs Lang output object - * \return int 1 if OK, <=0 if KO + * Fonction generant le bon de livraison sur le disque + * @param object Object livraison a generer + * @param outputlangs Lang output object + * @return int 1 if OK, <=0 if KO */ function write_file($object,$outputlangs) { diff --git a/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php b/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php index 16ed5982f6912910198a4fac2c513721aefc0f47..c6d8fd2aaf75c428b7b1d458b82ea7757fd5196e 100644 --- a/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php +++ b/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php @@ -95,10 +95,10 @@ class pdf_typhon extends ModelePDFDeliveryOrder /** - * \brief Fonction generant le bon de livraison sur le disque - * \param delivery Object livraison a generer - * \param outputlangs Lang output object - * \return int 1 if OK, <=0 if KO + * Fonction generant le bon de livraison sur le disque + * @param object Object livraison a generer + * @param outputlangs Lang output object + * @return int 1 if OK, <=0 if KO */ function write_file($object,$outputlangs) { diff --git a/htdocs/includes/modules/project/pdf/pdf_baleine.modules.php b/htdocs/includes/modules/project/pdf/pdf_baleine.modules.php index d1674d99925c0624e5ebaf32ae631bd16503e391..ff36d09c948f3753c8793ce56572afcff894e717 100644 --- a/htdocs/includes/modules/project/pdf/pdf_baleine.modules.php +++ b/htdocs/includes/modules/project/pdf/pdf_baleine.modules.php @@ -85,7 +85,7 @@ class pdf_baleine extends ModelePDFProjects /** * \brief Fonction generant le projet sur le disque - * \param delivery Object project a generer + * \param object Object project a generer * \param outputlangs Lang output object * \return int 1 if OK, <=0 if KO */ diff --git a/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php b/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php index b59b9523029eec5af7ba2027c2f1e789fc86a997..5ceff0170f2536bd12e012aa4af2e6e1d1a21271 100644 --- a/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php +++ b/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php @@ -77,7 +77,7 @@ class pdf_propale_jaune extends ModelePDFPropales /** * \brief Fonction generant la propale sur le disque - * \param propale Objet propal + * \param object Objet propal * \param outputlangs Lang object for output language * \return int 1=ok, 0=ko */ diff --git a/htdocs/includes/modules/supplier_invoice/pdf/pdf_canelle.modules.php b/htdocs/includes/modules/supplier_invoice/pdf/pdf_canelle.modules.php index f00e05d0b1c9f22738703e6dbe35ae004ff721b9..9fc936e7c5e437f04313321c8afc6238341ee868 100755 --- a/htdocs/includes/modules/supplier_invoice/pdf/pdf_canelle.modules.php +++ b/htdocs/includes/modules/supplier_invoice/pdf/pdf_canelle.modules.php @@ -92,7 +92,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices /** - * Write the invoice to disk + * Write the invoice as a document onto disk * @param object Object invoice to build (or id if old method) * @param outputlangs Lang object for output language * @return int 1=OK, 0=KO diff --git a/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php b/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php index 09e9153f714bd4b8e9af64497ac4a355905932cd..a812f3ab1534a25e9e18720e403612827506d975 100644 --- a/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php +++ b/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php @@ -91,12 +91,12 @@ class pdf_muscadet extends ModelePDFSuppliersOrders } - /** - * \brief Fonction generant la commande sur le disque - * \param id Id de la commande a generer - * \param outputlangs Lang output object - * \return int 1=ok, 0=ko - */ + /** + * Write the order as a document onto disk + * @param object Object invoice to build (or id if old method) + * @param outputlangs Lang object for output language + * @return int 1=OK, 0=KO + */ function write_file($object,$outputlangs='') { global $user,$langs,$conf;