diff --git a/ChangeLog b/ChangeLog index e16f3a4bd0d..c19e957e820 100644 --- a/ChangeLog +++ b/ChangeLog @@ -90,8 +90,8 @@ Dolibarr better: - Changed the way parameters are provided to scripts sync_xxx_ldap2dolibarr.php - Some field into database wwere renamed from "libelle" to "label". - Table llx_c_pays were renamed into llx_c_country. -- Trigger PROJECT_BUILDDOC is removed. Building a doc is not a business event. For action after - creation of a pdf, hook "afterPDFCreation" must be used instead. +- Triggers *_BUILDDOC are removed. Building a doc is not a business event. For action after + creation of a pdf or odt, hook "afterPDFCreation" or "afterODTCreation" must be used instead. ***** ChangeLog for 3.6 compared to 3.5.* ***** diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql index 67d303b0b19..af5473ef3e2 100644 --- a/htdocs/core/menus/init_menu_auguria.sql +++ b/htdocs/core/menus/init_menu_auguria.sql @@ -11,8 +11,8 @@ delete from llx_menu where menu_handler=__HANDLER__ and entity=__ENTITY__; insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '1', 1__+MAX_llx_menu__, __HANDLER__, 'top', 'home', '', 0, '/index.php?mainmenu=home&leftmenu=', 'Home', -1, '', '', '', 2, 10, __ENTITY__); insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('societe|fournisseur', '( ! empty($conf->societe->enabled) && (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))) || ! empty($conf->fournisseur->enabled)', 2__+MAX_llx_menu__, __HANDLER__, 'top', 'companies', '', 0, '/societe/index.php?mainmenu=companies&leftmenu=', 'ThirdParties', -1, 'companies', '$user->rights->societe->lire || $user->rights->societe->contact->lire', '', 2, 20, __ENTITY__); insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('product|service', '$conf->product->enabled || $conf->service->enabled', 3__+MAX_llx_menu__, __HANDLER__, 'top', 'products', '', 0, '/product/index.php?mainmenu=products&leftmenu=', 'Products/Services', -1, 'products', '$user->rights->produit->lire||$user->rights->service->lire', '', 0, 30, __ENTITY__); -insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('propal|commande|fournisseur|contrat|ficheinter', '$conf->comptabilite->enabled || $conf->accounting->enabled || $conf->facture->enabled || $conf->deplacement->enabled || $conf->don->enabled || $conf->tax->enabled', 5__+MAX_llx_menu__, __HANDLER__, 'top', 'commercial', '', 0, '/comm/index.php?mainmenu=commercial&leftmenu=', 'Commercial', -1, 'commercial', '$user->rights->societe->lire || $user->rights->societe->contact->lire', '', 2, 40, __ENTITY__); -insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('comptabilite|accounting|facture|deplacement|don|tax', '$conf->comptabilite->enabled || $conf->accounting->enabled || $conf->facture->enabled || $conf->deplacement->enabled || $conf->don->enabled || $conf->tax->enabled', 6__+MAX_llx_menu__, __HANDLER__, 'top', 'accountancy', '', 0, '/compta/index.php?mainmenu=accountancy&leftmenu=', 'MenuFinancial', -1, 'compta', '$user->rights->compta->resultat->lire || $user->rights->accounting->plancompte->lire || $user->rights->facture->lire|| $user->rights->deplacement->lire || $user->rights->don->lire || $user->rights->tax->charges->lire', '', 2, 50, __ENTITY__); +insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('propal|commande|fournisseur|contrat|ficheinter', '$conf->comptabilite->enabled || $conf->accounting->enabled || $conf->facture->enabled || $conf->deplacement->enabled || $conf->don->enabled || $conf->tax->enabled', 5__+MAX_llx_menu__, __HANDLER__, 'top', 'commercial', '', 0, '/comm/index.php?mainmenu=commercial&leftmenu=', 'Commercial', -1, 'commercial', '$user->rights->societe->lire || $user->rights->societe->contact->lire', '', 2, 40, __ENTITY__); +insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('comptabilite|accounting|facture|deplacement|don|tax|salaries', '$conf->comptabilite->enabled || $conf->accounting->enabled || $conf->facture->enabled || $conf->deplacement->enabled || $conf->don->enabled || $conf->tax->enabled || $conf->salaries->enabled', 6__+MAX_llx_menu__, __HANDLER__, 'top', 'accountancy', '', 0, '/compta/index.php?mainmenu=accountancy&leftmenu=', 'MenuFinancial', -1, 'compta', '$user->rights->compta->resultat->lire || $user->rights->accounting->plancompte->lire || $user->rights->facture->lire|| $user->rights->deplacement->lire || $user->rights->don->lire || $user->rights->tax->charges->lire || $user->rights->salaries->read', '', 2, 50, __ENTITY__); insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('banque|prelevement', '$conf->banque->enabled || $conf->prelevement->enabled', 14__+MAX_llx_menu__, __HANDLER__, 'top', 'bank', '', 0, '/compta/bank/index.php?mainmenu=bank&leftmenu=bank', 'MenuBankCash', -1, 'banks', '$user->rights->banque->lire || $user->rights->prelevement->bons->lire', '', 0, 60, __ENTITY__); insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('projet', '$conf->projet->enabled', 7__+MAX_llx_menu__, __HANDLER__, 'top', 'project', '', 0, '/projet/index.php?mainmenu=project&leftmenu=', 'Projects', -1, 'projects', '$user->rights->projet->lire', '', 2, 70, __ENTITY__); insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('mailing|export|import|opensurvey', '$conf->mailing->enabled || $conf->export->enabled || $conf->import->enabled || $conf->opensurvey->enabled', 8__+MAX_llx_menu__, __HANDLER__, 'top', 'tools', '', 0, '/core/tools.php?mainmenu=tools&leftmenu=', 'Tools', -1, 'other', '$user->rights->mailing->lire || $user->rights->export->lire || $user->rights->import->run || $user->rights->opensurvey->read', '', 2, 90, __ENTITY__); diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index e331e604233..fba04593b5b 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -134,9 +134,9 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu,&$menu,$noout=0) } // Financial - $tmpentry=array('enabled'=>(! empty($conf->comptabilite->enabled) || ! empty($conf->accounting->enabled) || ! empty($conf->facture->enabled) || ! empty($conf->don->enabled) || ! empty($conf->tax->enabled)), - 'perms'=>(! empty($user->rights->compta->resultat->lire) || ! empty($user->rights->accounting->plancompte->lire) || ! empty($user->rights->facture->lire) || ! empty($user->rights->don->lire) || ! empty($user->rights->tax->charges->lire)), - 'module'=>'comptabilite|accounting|facture|don|tax'); + $tmpentry=array('enabled'=>(! empty($conf->comptabilite->enabled) || ! empty($conf->accounting->enabled) || ! empty($conf->facture->enabled) || ! empty($conf->don->enabled) || ! empty($conf->tax->enabled) || ! empty($conf->salaries->enabled)), + 'perms'=>(! empty($user->rights->compta->resultat->lire) || ! empty($user->rights->accounting->plancompte->lire) || ! empty($user->rights->facture->lire) || ! empty($user->rights->don->lire) || ! empty($user->rights->tax->charges->lire) || ! empty($user->rights->salaries->read)), + 'module'=>'comptabilite|accounting|facture|don|tax|salaries'); $showmode=dol_eldy_showmenu($type_user, $tmpentry, $listofmodulesforexternal); if ($showmode) { diff --git a/htdocs/core/modules/commande/modules_commande.php b/htdocs/core/modules/commande/modules_commande.php index 9116205d287..63806e4cb46 100644 --- a/htdocs/core/modules/commande/modules_commande.php +++ b/htdocs/core/modules/commande/modules_commande.php @@ -234,13 +234,6 @@ function commande_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0 // Success in building document. We build meta file. dol_meta_create($object); - // Appel des triggers - include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; - $interface=new Interfaces($db); - $result=$interface->run_triggers('ORDER_BUILDDOC',$object,$user,$langs,$conf); - if ($result < 0) { $error++; $obj->errors=$interface->errors; } - // Fin appel triggers - return 1; } else diff --git a/htdocs/core/modules/contract/modules_contract.php b/htdocs/core/modules/contract/modules_contract.php index 27a77733553..689509f2a59 100644 --- a/htdocs/core/modules/contract/modules_contract.php +++ b/htdocs/core/modules/contract/modules_contract.php @@ -224,17 +224,10 @@ function contract_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0 // We delete old preview require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; dol_delete_preview($object); - + // Success in building document. We build meta file. dol_meta_create($object); - // Appel des triggers - include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; - $interface=new Interfaces($db); - $result=$interface->run_triggers('CONTRACT_BUILDDOC',$object,$user,$langs,$conf); - if ($result < 0) { $error++; $obj->errors=$interface->errors; } - // Fin appel triggers - return 1; } else diff --git a/htdocs/core/modules/expedition/modules_expedition.php b/htdocs/core/modules/expedition/modules_expedition.php index a88ac3ff023..3f2938ef25f 100644 --- a/htdocs/core/modules/expedition/modules_expedition.php +++ b/htdocs/core/modules/expedition/modules_expedition.php @@ -191,7 +191,7 @@ function expedition_pdf_create($db, $object, $modele, $outputlangs) { $file = $prefix."_".$modele.".modules.php"; - // We check the model location + // We check the model location $file=dol_buildpath($reldir."core/modules/expedition/doc/".$file,0); if (file_exists($file)) { @@ -223,15 +223,6 @@ function expedition_pdf_create($db, $object, $modele, $outputlangs) //require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; //dol_delete_preview($object); - // Calls triggers - include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; - $interface=new Interfaces($db); - $result=$interface->run_triggers('SHIPPING_BUILDDOC',$object,$user,$langs,$conf); - if ($result < 0) { - $error++; $obj->errors=$interface->errors; - } - // End calls triggers - return 1; } else diff --git a/htdocs/core/modules/facture/modules_facture.php b/htdocs/core/modules/facture/modules_facture.php index 2077e7255dd..ae0d9f98cda 100644 --- a/htdocs/core/modules/facture/modules_facture.php +++ b/htdocs/core/modules/facture/modules_facture.php @@ -235,13 +235,6 @@ function facture_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0, // Success in building document. We build meta file. dol_meta_create($object); - // Appel des triggers - include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; - $interface=new Interfaces($db); - $result=$interface->run_triggers('BILL_BUILDDOC',$object,$user,$langs,$conf); - if ($result < 0) { $error++; $errors=$interface->errors; } - // Fin appel triggers - return 1; } else diff --git a/htdocs/core/modules/fichinter/modules_fichinter.php b/htdocs/core/modules/fichinter/modules_fichinter.php index 61f73eff366..dbcdab37530 100644 --- a/htdocs/core/modules/fichinter/modules_fichinter.php +++ b/htdocs/core/modules/fichinter/modules_fichinter.php @@ -224,13 +224,6 @@ function fichinter_create($db, $object, $modele, $outputlangs, $hidedetails=0, $ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; dol_delete_preview($object); - // Appel des triggers - include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; - $interface=new Interfaces($db); - $result=$interface->run_triggers('FICHINTER_BUILDDOC',$object,$user,$langs,$conf); - if ($result < 0) { $error++; $obj->errors=$interface->errors; } - // Fin appel triggers - return 1; } else diff --git a/htdocs/core/modules/livraison/modules_livraison.php b/htdocs/core/modules/livraison/modules_livraison.php index 4d6f888e9a5..fe8e4220281 100644 --- a/htdocs/core/modules/livraison/modules_livraison.php +++ b/htdocs/core/modules/livraison/modules_livraison.php @@ -226,15 +226,6 @@ function delivery_order_pdf_create($db, $object, $modele, $outputlangs='') require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; dol_delete_preview($object); - // Appel des triggers - include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; - $interface=new Interfaces($db); - $result=$interface->run_triggers('DELIVERY_BUILDDOC',$object,$user,$langs,$conf); - if ($result < 0) { - $error++; $obj->errors=$interface->errors; - } - // Fin appel triggers - return 1; } else diff --git a/htdocs/core/modules/project/task/modules_task.php b/htdocs/core/modules/project/task/modules_task.php index 8aacc535b7e..c72d221ead1 100644 --- a/htdocs/core/modules/project/task/modules_task.php +++ b/htdocs/core/modules/project/task/modules_task.php @@ -225,13 +225,6 @@ function task_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0, $h // Success in building document. We build meta file. dol_meta_create($object); - // Appel des triggers - /*include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; - $interface=new Interfaces($db); - $result=$interface->run_triggers('PROJECT_BUILDDOC',$object,$user,$langs,$conf); - if ($result < 0) { $error++; $this->errors=$interface->errors; }*/ - // Fin appel triggers - return 1; } else diff --git a/htdocs/core/modules/propale/modules_propale.php b/htdocs/core/modules/propale/modules_propale.php index 13b933b6ccf..04b75bae091 100644 --- a/htdocs/core/modules/propale/modules_propale.php +++ b/htdocs/core/modules/propale/modules_propale.php @@ -230,13 +230,6 @@ function propale_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0, // Success in building document. We build meta file. dol_meta_create($object); - // Appel des triggers - include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; - $interface=new Interfaces($db); - $result=$interface->run_triggers('PROPAL_BUILDDOC',$object,$user,$langs,$conf); - if ($result < 0) { $error++; $obj->errors=$interface->errors; } - // Fin appel triggers - return 1; } else diff --git a/htdocs/core/modules/societe/modules_societe.class.php b/htdocs/core/modules/societe/modules_societe.class.php index 0a7245fc629..9a117ac8435 100644 --- a/htdocs/core/modules/societe/modules_societe.class.php +++ b/htdocs/core/modules/societe/modules_societe.class.php @@ -422,15 +422,6 @@ function thirdparty_doc_create($db, $object, $message, $modele, $outputlangs) { $outputlangs->charset_output=$sav_charset_output; - // Appel des triggers - include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; - $interface=new Interfaces($db); - $result=$interface->run_triggers('COMPANY_BUILDDOC',$object,$user,$langs,$conf); - if ($result < 0) { - $error++; $obj->errors=$interface->errors; - } - // Fin appel triggers - return 1; } else diff --git a/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php b/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php index 1a761bab636..1d4e9f262f8 100644 --- a/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php +++ b/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php @@ -221,13 +221,6 @@ function supplier_invoice_pdf_create($db, $object, $modele, $outputlangs, $hided require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; dol_delete_preview($object); - // Calls triggers - include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; - $interface=new Interfaces($db); - $result=$interface->run_triggers('BILL_SUPPLIER_BUILDDOC',$object,$user,$langs,$conf); - if ($result < 0) { $error++; $obj->errors=$interface->errors; } - // End calls triggers - return 1; } else diff --git a/htdocs/core/modules/supplier_order/modules_commandefournisseur.php b/htdocs/core/modules/supplier_order/modules_commandefournisseur.php index a08eb7f7ce4..edf2f928ddb 100644 --- a/htdocs/core/modules/supplier_order/modules_commandefournisseur.php +++ b/htdocs/core/modules/supplier_order/modules_commandefournisseur.php @@ -120,7 +120,7 @@ abstract class ModeleNumRefSuppliersOrders return $langs->trans("NotAvailable"); } - /** Returns version of the numbering model + /** Returns version of the numbering model * * @return string Value */ @@ -196,7 +196,7 @@ function supplier_order_pdf_create($db, $object, $modele, $outputlangs, $hidedet { $file = $prefix."_".$modele.".modules.php"; - // We check the model location + // We check the model location $file=dol_buildpath($reldir."core/modules/supplier_order/pdf/".$file,0); if (file_exists($file)) { @@ -226,15 +226,6 @@ function supplier_order_pdf_create($db, $object, $modele, $outputlangs, $hidedet require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; dol_delete_preview($object); - // Calls triggers - include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; - $interface=new Interfaces($db); - $result=$interface->run_triggers('ORDER_SUPPLIER_BUILDDOC',$object,$user,$langs,$conf); - if ($result < 0) { - $error++; $obj->errors=$interface->errors; - } - // End calls triggers - return 1; } else diff --git a/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN b/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN index c5749a18459..96401c77251 100644 --- a/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN +++ b/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN @@ -1,7 +1,7 @@ - * Copyright (C) 2005-2014 Regis Houssin - * Copyright (C) 2014 Marcos García +/* Copyright (C) 2005-2014 Laurent Destailleur + * Copyright (C) 2005-2014 Regis Houssin + * Copyright (C) 2014 Marcos García * * 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 @@ -118,7 +118,6 @@ class InterfaceDemo extends DolibarrTriggers case 'ORDER_CLONE': case 'ORDER_VALIDATE': case 'ORDER_DELETE': - case 'ORDER_BUILDDOC': case 'ORDER_SENTBYMAIL': case 'ORDER_CLASSIFY_BILLED': case 'LINEORDER_INSERT': @@ -134,7 +133,6 @@ class InterfaceDemo extends DolibarrTriggers case 'ORDER_SUPPLIER_REFUSE': case 'ORDER_SUPPLIER_CANCEL': case 'ORDER_SUPPLIER_SENTBYMAIL': - case 'ORDER_SUPPLIER_BUILDDOC': case 'LINEORDER_SUPPLIER_DISPATCH': case 'LINEORDER_SUPPLIER_CREATE': case 'LINEORDER_SUPPLIER_UPDATE': @@ -144,7 +142,6 @@ class InterfaceDemo extends DolibarrTriggers case 'PROPAL_CLONE': case 'PROPAL_MODIFY': case 'PROPAL_VALIDATE': - case 'PROPAL_BUILDDOC': case 'PROPAL_SENTBYMAIL': case 'PROPAL_CLOSE_SIGNED': case 'PROPAL_CLOSE_REFUSED': @@ -169,7 +166,6 @@ class InterfaceDemo extends DolibarrTriggers case 'BILL_MODIFY': case 'BILL_VALIDATE': case 'BILL_UNVALIDATE': - case 'BILL_BUILDDOC': case 'BILL_SENTBYMAIL': case 'BILL_CANCEL': case 'BILL_DELETE': @@ -227,7 +223,6 @@ class InterfaceDemo extends DolibarrTriggers case 'PROJECT_CREATE': case 'PROJECT_MODIFY': case 'PROJECT_DELETE': - case 'PROJECT_BUILDDOC': // Project tasks case 'TASK_CREATE': @@ -245,7 +240,6 @@ class InterfaceDemo extends DolibarrTriggers case 'SHIPPING_VALIDATE': case 'SHIPPING_SENTBYMAIL': case 'SHIPPING_DELETE': - case 'SHIPPING_BUILDDOC': dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); break; diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index f4a7aa0f5c6..e4cf7ab08ce 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -133,7 +133,7 @@ Box=Box Boxes=Boxes MaxNbOfLinesForBoxes=Max number of lines for boxes PositionByDefault=Default order -Position=Order +Position=Position MenusDesc=Menus managers define content of the 2 menu bars (horizontal bar and vertical bar). MenusEditorDesc=The menu editor allow you to define personalized entries in menus. Use it carefully to avoid making dolibarr unstable and menu entries permanently unreachable.
Some modules add entries in the menus (in menu All in most cases). If you removed some of these entries by mistake, you can restore them by disabling and reenabling the module. MenuForUsers=Menu for users