diff --git a/ChangeLog b/ChangeLog index 5e5dd3fda73..7d94a664ce6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -39,6 +39,7 @@ For users: - New: Add manager name (ceo, director, president...) into main company information page. - New: Add field url as product properties. - New: More options to create a credit note (can be filled autatically according to remain to pay). +- New: Can define custom fields for catagories. - Fix: Project Task numbering customs rule works. - Fix: Add actions events not implemented diff --git a/htdocs/categories/admin/categorie.php b/htdocs/categories/admin/categorie.php index 085c5b7f5e1..53d1d55eddd 100644 --- a/htdocs/categories/admin/categorie.php +++ b/htdocs/categories/admin/categorie.php @@ -70,15 +70,17 @@ if (preg_match('/del_(.*)/',$action,$reg)) * View */ -llxHeader('',$langs->trans("CategoriesSetup")); - +$help_url='EN:Module Categories|FR:Module Catégories|ES:Módulo Categorías'; $linkback=''.$langs->trans("BackToModuleList").''; + +llxHeader('',$langs->trans("Categories"),$help_url); + print_fiche_titre($langs->trans("CategoriesSetup"),'','setup'); $head=categoriesadmin_prepare_head(); -dol_fiche_head($head, 'setup', $langs->trans("Security")); +dol_fiche_head($head, 'setup', $langs->trans("Categories"), 0, 'category'); print ''; diff --git a/htdocs/categories/admin/categorie_extrafields.php b/htdocs/categories/admin/categorie_extrafields.php index 7ff0c854dcf..49c7a5c36bc 100644 --- a/htdocs/categories/admin/categorie_extrafields.php +++ b/htdocs/categories/admin/categorie_extrafields.php @@ -58,8 +58,8 @@ require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php'; $textobject=$langs->transnoentitiesnoconv("Categories"); -$help_url='EN:Module Third Parties setup|FR:Paramétrage_du_module_Tiers'; -llxHeader('',$langs->trans("CompanySetup"),$help_url); +$help_url='EN:Module Categories|FR:Module Catégories|ES:Módulo Categorías'; +llxHeader('',$langs->trans("Categories"),$help_url); $linkback=''.$langs->trans("BackToModuleList").''; @@ -67,7 +67,7 @@ print_fiche_titre($langs->trans("CategoriesSetup"),$linkback,'setup'); $head = categoriesadmin_prepare_head(null); -dol_fiche_head($head, 'attributes_categories', $langs->trans("Categories"), 0, 'categoriesadmin'); +dol_fiche_head($head, 'attributes_categories', $langs->trans("Categories"), 0, 'category'); print $langs->trans("DefineHereComplementaryAttributes",$textobject).'
'."\n"; print '
'; diff --git a/htdocs/categories/categorie.php b/htdocs/categories/categorie.php index e3925ddb232..e34ecf9c336 100644 --- a/htdocs/categories/categorie.php +++ b/htdocs/categories/categorie.php @@ -2,7 +2,7 @@ /* Copyright (C) 2001-2007 Rodolphe Quiedeville * Copyright (C) 2005 Brice Davoleau * Copyright (C) 2005-2012 Regis Houssin - * Copyright (C) 2006-2013 Laurent Destailleur + * Copyright (C) 2006-2014 Laurent Destailleur * Copyright (C) 2007 Patrick Raguin * Copyright (C) 2010 Juanjo Menent * Copyright (C) 2013 Florian Henry diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index 3d6b9d323ac..cc45281f1af 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -1101,10 +1101,10 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu if (! empty($conf->deplacement->enabled)) { $langs->load("trips"); - $newmenu->add("/compta/deplacement/index.php?leftmenu=tripsandexpenses&mainmenu=accountancy", $langs->trans("TripsAndExpenses"), 0, $user->rights->deplacement->lire, '', $mainmenu, 'tripsandexpenses'); - $newmenu->add("/compta/deplacement/fiche.php?action=create&leftmenu=tripsandexpenses&mainmenu=accountancy", $langs->trans("New"), 1, $user->rights->deplacement->creer); - $newmenu->add("/compta/deplacement/list.php?leftmenu=tripsandexpenses&mainmenu=accountancy", $langs->trans("List"), 1, $user->rights->deplacement->lire); - $newmenu->add("/compta/deplacement/stats/index.php?leftmenu=tripsandexpenses&mainmenu=accountancy", $langs->trans("Statistics"), 1, $user->rights->deplacement->lire); + $newmenu->add("/compta/deplacement/index.php?leftmenu=tripsandexpenses&mainmenu=hrm", $langs->trans("TripsAndExpenses"), 0, $user->rights->deplacement->lire, '', $mainmenu, 'tripsandexpenses'); + $newmenu->add("/compta/deplacement/fiche.php?action=create&leftmenu=tripsandexpenses&mainmenu=hrm", $langs->trans("New"), 1, $user->rights->deplacement->creer); + $newmenu->add("/compta/deplacement/list.php?leftmenu=tripsandexpenses&mainmenu=hrm", $langs->trans("List"), 1, $user->rights->deplacement->lire); + $newmenu->add("/compta/deplacement/stats/index.php?leftmenu=tripsandexpenses&mainmenu=hrm", $langs->trans("Statistics"), 1, $user->rights->deplacement->lire); } } diff --git a/htdocs/core/modules/modCategorie.class.php b/htdocs/core/modules/modCategorie.class.php index 030b40a09f4..2cfe6bcb19e 100644 --- a/htdocs/core/modules/modCategorie.class.php +++ b/htdocs/core/modules/modCategorie.class.php @@ -1,6 +1,6 @@ - * Copyright (C) 2005-2012 Laurent Destailleur + * Copyright (C) 2005-2014 Laurent Destailleur * Copyright (C) 2012 Juanjo Menent * * This program is free software; you can redistribute it and/or modify @@ -63,7 +63,7 @@ class modCategorie extends DolibarrModules $this->depends = array(); // Config pages - $this->config_page_url = array('categorie_extrafields.php@categories'); + $this->config_page_url = array('/categories/admin/categorie.php'); $this->langfiles = array("products","companies","categories"); // Constantes