From 92b5f8d85e7ebd5dfacd05177bf59dd92913c21e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 29 Apr 2017 21:53:01 +0200 Subject: [PATCH] Move new feature inventory into module stock. --- htdocs/core/class/coreobject.class.php | 4 +- htdocs/core/menus/standard/eldy.lib.php | 9 + htdocs/core/modules/modInventory.class.php | 316 ------------------ htdocs/core/modules/modStock.class.php | 84 +++++ htdocs/langs/en_US/inventory.lang | 54 --- htdocs/langs/en_US/stocks.lang | 49 +++ .../inventory/ajax/ajax.inventory.php | 4 +- .../inventory/card.php} | 52 +-- .../inventory/class/inventory.class.php | 4 +- .../{ => product}/inventory/img/bt-save.png | Bin .../{ => product}/inventory/img/inventory.png | Bin htdocs/{ => product}/inventory/img/plus.png | Bin htdocs/{ => product}/inventory/img/plus16.png | Bin .../inventory/lib/inventory.lib.php | 6 +- htdocs/{ => product}/inventory/list.php | 12 +- .../inventory/tpl/inventory.tpl.php | 4 +- 16 files changed, 185 insertions(+), 413 deletions(-) delete mode 100644 htdocs/core/modules/modInventory.class.php delete mode 100644 htdocs/langs/en_US/inventory.lang rename htdocs/{ => product}/inventory/ajax/ajax.inventory.php (86%) rename htdocs/{inventory/inventory.php => product/inventory/card.php} (90%) rename htdocs/{ => product}/inventory/class/inventory.class.php (98%) rename htdocs/{ => product}/inventory/img/bt-save.png (100%) rename htdocs/{ => product}/inventory/img/inventory.png (100%) rename htdocs/{ => product}/inventory/img/plus.png (100%) rename htdocs/{ => product}/inventory/img/plus16.png (100%) rename htdocs/{ => product}/inventory/lib/inventory.lib.php (92%) rename htdocs/{ => product}/inventory/list.php (91%) rename htdocs/{ => product}/inventory/tpl/inventory.tpl.php (98%) diff --git a/htdocs/core/class/coreobject.class.php b/htdocs/core/class/coreobject.class.php index 396caf029cc..384374b1893 100644 --- a/htdocs/core/class/coreobject.class.php +++ b/htdocs/core/class/coreobject.class.php @@ -18,7 +18,7 @@ */ /** - * \file htdocs/core/class/coreobject.inventory.php + * \file htdocs/core/class/coreobject.class.php * \ingroup core * \brief File of class to manage all object. Might be replace or merge into commonobject */ @@ -663,7 +663,7 @@ class CoreObject extends CommonObject } else { - $this->{$key} = @stripslashes($value); + $this->{$key} = $value; } } diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index 360a93cf61b..10d1e53475b 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -1252,6 +1252,15 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu if ($conf->supplier_order->enabled) $newmenu->add("/product/stock/replenish.php", $langs->trans("Replenishment"), 1, $user->rights->stock->mouvement->creer && $user->rights->fournisseur->lire); } + // Inventory + if (! empty($conf->stock->enabled)) + { + $langs->load("stocks"); + $newmenu->add("/product/inventory/list.php?leftmenu=stock", $langs->trans("Inventory"), 0, $user->rights->stock->lire, '', $mainmenu, 'stock'); + $newmenu->add("/product/inventory/card.php?action=create", $langs->trans("NewInventory"), 1, $user->rights->stock->creer); + $newmenu->add("/product/inventory/list.php", $langs->trans("List"), 1, $user->rights->stock->lire); + } + // Expeditions if (! empty($conf->expedition->enabled)) { diff --git a/htdocs/core/modules/modInventory.class.php b/htdocs/core/modules/modInventory.class.php deleted file mode 100644 index 11b4c992e6a..00000000000 --- a/htdocs/core/modules/modInventory.class.php +++ /dev/null @@ -1,316 +0,0 @@ - - * Copyright (C) 2004-2012 Laurent Destailleur - * Copyright (C) 2005-2012 Regis Houssin - * - * 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 - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/** - * \defgroup inventory Module inventory - * \brief Example of a module descriptor. - * Such a file must be copied into htdocs/inventory/core/modules directory. - * \file htdocs/inventory/core/modules/modinventory.class.php - * \ingroup inventory - * \brief Description and activation file for module inventory - */ -include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php'; - - -/** - * Description and activation class for module inventory - */ -class modinventory extends DolibarrModules -{ - /** - * Constructor. Define names, constants, directories, boxes, permissions - * - * @param DoliDB $db Database handler - */ - function __construct($db) - { - global $langs,$conf; - - $this->db = $db; - - // Id for module (must be unique). - // Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id). - $this->numero = 104420; // 104000 to 104999 for ATM CONSULTING - // Key text used to identify module (for permissions, menus, etc...) - $this->rights_class = 'inventory'; - - // Family can be 'crm','financial','hr','projects','products','ecm','technic','other' - // It is used to group modules in module setup page - $this->family = "products"; - // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module) - $this->name = preg_replace('/^mod/i','',get_class($this)); - // Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module) - $this->description = "Description of module inventory"; - // Possible values for version are: 'development', 'experimental', 'dolibarr' or version - $this->version = 'dolibarr'; - // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase) - $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name); - // Where to store the module in setup page (0=common,1=interface,2=others,3=very specific) - $this->special = 0; - // Name of image file used for this module. - // If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue' - // If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module' - $this->picto='inventory'; - - // Defined all module parts (triggers, login, substitutions, menus, css, etc...) - // for default path (eg: /inventory/core/xxxxx) (0=disable, 1=enable) - // for specific path of parts (eg: /inventory/core/modules/barcode) - // for specific css file (eg: /inventory/css/inventory.css.php) - //$this->module_parts = array( - // 'triggers' => 0, // Set this to 1 if module has its own trigger directory (core/triggers) - // 'login' => 0, // Set this to 1 if module has its own login method directory (core/login) - // 'substitutions' => 0, // Set this to 1 if module has its own substitution function file (core/substitutions) - // 'menus' => 0, // Set this to 1 if module has its own menus handler directory (core/menus) - // 'theme' => 0, // Set this to 1 if module has its own theme directory (theme) - // 'tpl' => 0, // Set this to 1 if module overwrite template dir (core/tpl) - // 'barcode' => 0, // Set this to 1 if module has its own barcode directory (core/modules/barcode) - // 'models' => 0, // Set this to 1 if module has its own models directory (core/modules/xxx) - // 'css' => array('/inventory/css/inventory.css.php'), // Set this to relative path of css file if module has its own css file - // 'js' => array('/inventory/js/inventory.js'), // Set this to relative path of js file if module must load a js on all pages - // 'hooks' => array('hookcontext1','hookcontext2') // Set here all hooks context managed by module - // 'dir' => array('output' => 'othermodulename'), // To force the default directories names - // 'workflow' => array('WORKFLOW_MODULE1_YOURACTIONTYPE_MODULE2'=>array('enabled'=>'! empty($conf->module1->enabled) && ! empty($conf->module2->enabled)', 'picto'=>'yourpicto@inventory')) // Set here all workflow context managed by module - // ); - $this->module_parts = array(); - - // Data directories to create when module is enabled. - // Example: this->dirs = array("/inventory/temp"); - $this->dirs = array(); - - // Config pages. Put here list of php page, stored into inventory/admin directory, to use to setup module. - $this->config_page_url = array("inventory.php"); - - // Dependencies - $this->hidden = false; // A condition to hide module - $this->depends = array('modStock'); // List of modules id that must be enabled if this module is enabled - $this->requiredby = array(); // List of modules id to disable if this one is disabled - $this->conflictwith = array(); // List of modules id this module is in conflict with - $this->phpmin = array(5,0); // Minimum version of PHP required by module - $this->need_dolibarr_version = array(3,0); // Minimum version of Dolibarr required by module - $this->langfiles = array("inventory"); - - // Constants - // List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive) - // Example: $this->const=array(0=>array('MYMODULE_MYNEWCONST1','chaine','myvalue','This is a constant to add',1), - // 1=>array('MYMODULE_MYNEWCONST2','chaine','myvalue','This is another constant to add',0, 'current', 1) - // ); - $this->const = array(); - - // Array to add new pages in new tabs - // Example: $this->tabs = array('objecttype:+tabname1:Title1:mylangfile@inventory:$user->rights->inventory->read:/inventory/mynewtab1.php?id=__ID__', // To add a new tab identified by code tabname1 - // 'objecttype:+tabname2:Title2:mylangfile@inventory:$user->rights->othermodule->read:/inventory/mynewtab2.php?id=__ID__', // To add another new tab identified by code tabname2 - // 'objecttype:-tabname:NU:conditiontoremove'); // To remove an existing tab identified by code tabname - // where objecttype can be - // 'categories_x' to add a tab in category view (replace 'x' by type of category (0=product, 1=supplier, 2=customer, 3=member) - // 'contact' to add a tab in contact view - // 'contract' to add a tab in contract view - // 'group' to add a tab in group view - // 'intervention' to add a tab in intervention view - // 'invoice' to add a tab in customer invoice view - // 'invoice_supplier' to add a tab in supplier invoice view - // 'member' to add a tab in fundation member view - // 'opensurveypoll' to add a tab in opensurvey poll view - // 'order' to add a tab in customer order view - // 'order_supplier' to add a tab in supplier order view - // 'payment' to add a tab in payment view - // 'payment_supplier' to add a tab in supplier payment view - // 'product' to add a tab in product view - // 'propal' to add a tab in propal view - // 'project' to add a tab in project view - // 'stock' to add a tab in stock view - // 'thirdparty' to add a tab in third party view - // 'user' to add a tab in user view - $this->tabs = array(); - - // Dictionaries - if (! isset($conf->inventory->enabled)) - { - $conf->inventory=new stdClass(); - $conf->inventory->enabled=0; - } - $this->dictionaries=array(); - /* Example: - if (! isset($conf->inventory->enabled)) $conf->inventory->enabled=0; // This is to avoid warnings - $this->dictionaries=array( - 'langs'=>'mylangfile@inventory', - 'tabname'=>array(MAIN_DB_PREFIX."table1",MAIN_DB_PREFIX."table2",MAIN_DB_PREFIX."table3"), // List of tables we want to see into dictonnary editor - 'tablib'=>array("Table1","Table2","Table3"), // Label of tables - 'tabsql'=>array('SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table1 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table2 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table3 as f'), // Request to select fields - 'tabsqlsort'=>array("label ASC","label ASC","label ASC"), // Sort order - 'tabfield'=>array("code,label","code,label","code,label"), // List of fields (result of select to show dictionary) - 'tabfieldvalue'=>array("code,label","code,label","code,label"), // List of fields (list of fields to edit a record) - 'tabfieldinsert'=>array("code,label","code,label","code,label"), // List of fields (list of fields for insert) - 'tabrowid'=>array("rowid","rowid","rowid"), // Name of columns with primary key (try to always name it 'rowid') - 'tabcond'=>array($conf->inventory->enabled,$conf->inventory->enabled,$conf->inventory->enabled) // Condition to show each dictionary - ); - */ - - // Boxes - // Add here list of php file(s) stored in core/boxes that contains class to show a box. - $this->boxes = array(); // List of boxes - // Example: - //$this->boxes=array(array(0=>array('file'=>'myboxa.php','note'=>'','enabledbydefaulton'=>'Home'),1=>array('file'=>'myboxb.php','note'=>''),2=>array('file'=>'myboxc.php','note'=>''));); - - // Permissions - $this->rights = array(); // Permission array used by this module - $r=0; - - // Add here list of permission defined by an id, a label, a boolean and two constant strings. - // Example: - // $this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used) - // $this->rights[$r][1] = 'Permision label'; // Permission label - // $this->rights[$r][3] = 1; // Permission by default for new user (0/1) - // $this->rights[$r][4] = 'level1'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2) - // $this->rights[$r][5] = 'level2'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2) - // $r++; - - $this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used) - $this->rights[$r][1] = 'inventoryReadPermission'; // Permission label - $this->rights[$r][3] = 1; // Permission by default for new user (0/1) - $this->rights[$r][4] = 'read'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2) - $r++; - - $this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used) - $this->rights[$r][1] = 'inventoryCreatePermission'; // Permission label - $this->rights[$r][3] = 0; // Permission by default for new user (0/1) - $this->rights[$r][4] = 'create'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2) - $r++; - - $this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used) - $this->rights[$r][1] = 'inventoryWritePermission'; // Permission label - $this->rights[$r][3] = 0; // Permission by default for new user (0/1) - $this->rights[$r][4] = 'write'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2) - $r++; - - $this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used) - $this->rights[$r][1] = 'inventoryValidatePermission'; // Permission label - $this->rights[$r][3] = 0; // Permission by default for new user (0/1) - $this->rights[$r][4] = 'validate'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2) - $r++; - - $this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used) - $this->rights[$r][1] = 'inventoryChangePMPPermission'; // Permission label - $this->rights[$r][3] = 0; // Permission by default for new user (0/1) - $this->rights[$r][4] = 'changePMP'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2) - $r++; - - // Main menu entries - $this->menu = array(); // List of menus to add - $r=0; - - - $this->menu[$r]=array( - 'fk_menu'=>'fk_mainmenu=products', // Put 0 if this is a top menu - 'type'=>'left', // This is a Top menu entry - 'titre'=>'Inventory', - 'mainmenu'=>'products', - 'leftmenu'=>'inventory_left', - 'url'=>'/inventory/list.php', - 'langs'=>'inventory', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory. - 'position'=>100+$r, - 'enabled'=>'$conf->inventory->enabled', // Define condition to show or hide menu entry. Use '$conf->inventory->enabled' if entry must be visible if module is enabled. - 'perms'=>'$user->rights->inventory->read', // Use 'perms'=>'$user->rights->inventory->level1->level2' if you want your menu with a permission rules - 'target'=>'', - 'user'=>2 - ); // 0=Menu for internal users, 1=external users, 2=both - $r++; - - $this->menu[$r]=array( - 'fk_menu'=>'fk_mainmenu=products,fk_leftmenu=inventory_left', // Put 0 if this is a top menu - 'type'=>'left', // This is a Top menu entry - 'titre'=>'NewInventory', - 'mainmenu'=>'products', - 'leftmenu'=>'inventory_left_create', - 'url'=>'/inventory/inventory.php?action=create', - 'position'=>100+$r, - 'enabled'=>'$conf->inventory->enabled', // Define condition to show or hide menu entry. Use '$conf->inventory->enabled' if entry must be visible if module is enabled. - 'perms'=>'$user->rights->inventory->create', // Use 'perms'=>'$user->rights->inventory->level1->level2' if you want your menu with a permission rules - 'target'=>'', - 'user'=>2 - ); // 0=Menu for internal users, 1=external users, 2=both - $r++; - - $this->menu[$r]=array( - 'fk_menu'=>'fk_mainmenu=products,fk_leftmenu=inventory_left', // Put 0 if this is a top menu - 'type'=>'left', // This is a Top menu entry - 'titre'=>'ListInventory', - 'mainmenu'=>'products', - 'leftmenu'=>'inventory_left_list', - 'url'=>'/inventory/list.php', - 'langs'=>'inventory', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory. - 'position'=>100+$r, - 'enabled'=>'$conf->inventory->enabled', // Define condition to show or hide menu entry. Use '$conf->inventory->enabled' if entry must be visible if module is enabled. - 'perms'=>'$user->rights->inventory->read', // Use 'perms'=>'$user->rights->inventory->level1->level2' if you want your menu with a permission rules - 'target'=>'', - 'user'=>2 - ); // 0=Menu for internal users, 1=external users, 2=both - $r++; - - // Exports - $r=1; - - // Example: - // $this->export_code[$r]=$this->rights_class.'_'.$r; - // $this->export_label[$r]='CustomersInvoicesAndInvoiceLines'; // Translation key (used only if key ExportDataset_xxx_z not found) - // $this->export_enabled[$r]='1'; // Condition to show export in list (ie: '$user->id==3'). Set to 1 to always show when module is enabled. - // $this->export_permission[$r]=array(array("facture","facture","export")); - // $this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','s.fk_pays'=>'Country','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.code_compta'=>'CustomerAccountancyCode','s.code_compta_fournisseur'=>'SupplierAccountancyCode','f.rowid'=>"InvoiceId",'f.facnumber'=>"InvoiceRef",'f.datec'=>"InvoiceDateCreation",'f.datef'=>"DateInvoice",'f.total'=>"TotalHT",'f.total_ttc'=>"TotalTTC",'f.tva'=>"TotalVAT",'f.paye'=>"InvoicePaid",'f.fk_statut'=>'InvoiceStatus','f.note'=>"InvoiceNote",'fd.rowid'=>'LineId','fd.description'=>"LineDescription",'fd.price'=>"LineUnitPrice",'fd.tva_tx'=>"LineVATRate",'fd.qty'=>"LineQty",'fd.total_ht'=>"LineTotalHT",'fd.total_tva'=>"LineTotalTVA",'fd.total_ttc'=>"LineTotalTTC",'fd.date_start'=>"DateStart",'fd.date_end'=>"DateEnd",'fd.fk_product'=>'ProductId','p.ref'=>'ProductRef'); - // $this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','s.fk_pays'=>'company','s.phone'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.code_compta'=>'company','s.code_compta_fournisseur'=>'company','f.rowid'=>"invoice",'f.facnumber'=>"invoice",'f.datec'=>"invoice",'f.datef'=>"invoice",'f.total'=>"invoice",'f.total_ttc'=>"invoice",'f.tva'=>"invoice",'f.paye'=>"invoice",'f.fk_statut'=>'invoice','f.note'=>"invoice",'fd.rowid'=>'invoice_line','fd.description'=>"invoice_line",'fd.price'=>"invoice_line",'fd.total_ht'=>"invoice_line",'fd.total_tva'=>"invoice_line",'fd.total_ttc'=>"invoice_line",'fd.tva_tx'=>"invoice_line",'fd.qty'=>"invoice_line",'fd.date_start'=>"invoice_line",'fd.date_end'=>"invoice_line",'fd.fk_product'=>'product','p.ref'=>'product'); - // $this->export_sql_start[$r]='SELECT DISTINCT '; - // $this->export_sql_end[$r] =' FROM ('.MAIN_DB_PREFIX.'facture as f, '.MAIN_DB_PREFIX.'facturedet as fd, '.MAIN_DB_PREFIX.'societe as s)'; - // $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (fd.fk_product = p.rowid)'; - // $this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_facture'; - // $this->export_sql_order[$r] .=' ORDER BY s.nom'; - // $r++; - } - - /** - * Function called when module is enabled. - * The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database. - * It also creates data directories - * - * @param string $options Options when enabling module ('', 'noboxes') - * @return int 1 if OK, 0 if KO - */ - function init($options='') - { - $sql = array(); - define('INC_FROM_DOLIBARR', true); - dol_include_once('/inventory/config.php'); - dol_include_once("/inventory/script/create-maj-base.php"); - - return $this->_init($sql, $options); - } - - /** - * Function called when module is disabled. - * Remove from database constants, boxes and permissions from Dolibarr database. - * Data directories are not deleted - * - * @param string $options Options when enabling module ('', 'noboxes') - * @return int 1 if OK, 0 if KO - */ - function remove($options='') - { - $sql = array(); - - return $this->_remove($sql, $options); - } - -} diff --git a/htdocs/core/modules/modStock.class.php b/htdocs/core/modules/modStock.class.php index 8fe4eb52abe..cfdc6db298c 100644 --- a/htdocs/core/modules/modStock.class.php +++ b/htdocs/core/modules/modStock.class.php @@ -117,6 +117,90 @@ class modStock extends DolibarrModules $this->rights[4][4] = 'mouvement'; $this->rights[4][5] = 'creer'; + /* + $this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used) + $this->rights[$r][1] = 'inventoryReadPermission'; // Permission label + $this->rights[$r][3] = 1; // Permission by default for new user (0/1) + $this->rights[$r][4] = 'read'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2) + $r++; + + $this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used) + $this->rights[$r][1] = 'inventoryCreatePermission'; // Permission label + $this->rights[$r][3] = 0; // Permission by default for new user (0/1) + $this->rights[$r][4] = 'create'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2) + $r++; + + $this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used) + $this->rights[$r][1] = 'inventoryWritePermission'; // Permission label + $this->rights[$r][3] = 0; // Permission by default for new user (0/1) + $this->rights[$r][4] = 'write'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2) + $r++; + + $this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used) + $this->rights[$r][1] = 'inventoryValidatePermission'; // Permission label + $this->rights[$r][3] = 0; // Permission by default for new user (0/1) + $this->rights[$r][4] = 'validate'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2) + $r++; + + $this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used) + $this->rights[$r][1] = 'inventoryChangePMPPermission'; // Permission label + $this->rights[$r][3] = 0; // Permission by default for new user (0/1) + $this->rights[$r][4] = 'changePMP'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2) + $r++; + */ + + // Main menu entries + $this->menu = array(); // List of menus to add + $r=0; + + /* + $this->menu[$r]=array( + 'fk_menu'=>'fk_mainmenu=products', // Put 0 if this is a top menu + 'type'=>'left', // This is a Top menu entry + 'titre'=>'Inventory', + 'mainmenu'=>'products', + 'leftmenu'=>'inventory_left', + 'url'=>'/inventory/list.php', + 'langs'=>'inventory', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory. + 'position'=>100+$r, + 'enabled'=>'$conf->inventory->enabled', // Define condition to show or hide menu entry. Use '$conf->inventory->enabled' if entry must be visible if module is enabled. + 'perms'=>'$user->rights->inventory->read', // Use 'perms'=>'$user->rights->inventory->level1->level2' if you want your menu with a permission rules + 'target'=>'', + 'user'=>2 + ); // 0=Menu for internal users, 1=external users, 2=both + $r++; + + $this->menu[$r]=array( + 'fk_menu'=>'fk_mainmenu=products,fk_leftmenu=inventory_left', // Put 0 if this is a top menu + 'type'=>'left', // This is a Top menu entry + 'titre'=>'NewInventory', + 'mainmenu'=>'products', + 'leftmenu'=>'inventory_left_create', + 'url'=>'/inventory/inventory.php?action=create', + 'position'=>100+$r, + 'enabled'=>'$conf->inventory->enabled', // Define condition to show or hide menu entry. Use '$conf->inventory->enabled' if entry must be visible if module is enabled. + 'perms'=>'$user->rights->inventory->create', // Use 'perms'=>'$user->rights->inventory->level1->level2' if you want your menu with a permission rules + 'target'=>'', + 'user'=>2 + ); // 0=Menu for internal users, 1=external users, 2=both + $r++; + + $this->menu[$r]=array( + 'fk_menu'=>'fk_mainmenu=products,fk_leftmenu=inventory_left', // Put 0 if this is a top menu + 'type'=>'left', // This is a Top menu entry + 'titre'=>'ListInventory', + 'mainmenu'=>'products', + 'leftmenu'=>'inventory_left_list', + 'url'=>'/inventory/list.php', + 'langs'=>'inventory', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory. + 'position'=>100+$r, + 'enabled'=>'$conf->inventory->enabled', // Define condition to show or hide menu entry. Use '$conf->inventory->enabled' if entry must be visible if module is enabled. + 'perms'=>'$user->rights->inventory->read', // Use 'perms'=>'$user->rights->inventory->level1->level2' if you want your menu with a permission rules + 'target'=>'', + 'user'=>2 + ); // 0=Menu for internal users, 1=external users, 2=both + $r++; + */ // Menus //------- diff --git a/htdocs/langs/en_US/inventory.lang b/htdocs/langs/en_US/inventory.lang deleted file mode 100644 index db92cb9a14a..00000000000 --- a/htdocs/langs/en_US/inventory.lang +++ /dev/null @@ -1,54 +0,0 @@ -# Dolibarr language file - Source file is en_US - inventory - -Module104420Name = Inventory -Module104420Desc = Create and manage your inventory - -inventorySetup = Inventory Setup - -inventoryCreatePermission=Create new inventory -inventoryReadPermission=View inventories -inventoryWritePermission=Update inventories -inventoryValidatePermission=Validate inventory - -inventoryTitle=Inventory -inventoryListTitle=Inventories -inventoryListEmpty=No inventory in progress - -inventoryCreateDelete=Create/Delete inventory -inventoryCreate=Create new -inventoryEdit=Edit -inventoryValidate=Validated -inventoryDraft=Running -inventorySelectWarehouse=Warehouse choice -inventoryConfirmCreate=Create -inventoryOfWarehouse=Inventory for warehouse : %s -inventoryErrorQtyAdd=Error : one quantity is leaser than zero -inventoryMvtStock=By inventory -inventoryWarningProductAlreadyExists=This product is already into list -SelectCategory=Category filter -SelectFournisseur=Supplier filter -inventoryOnDate=Inventory -INVENTORY_DISABLE_VIRTUAL=Allow to not destock child product from a kit on inventory -INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found -INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Stock mouvment have date of inventory -inventoryChangePMPPermission=Allow to change PMP value for a product -ColumnNewPMP=New unit PMP -OnlyProdsInStock=Do not add product without stock -TheoricalQty=Theorique qty -TheoricalValue=Theorique qty -LastPA=Last BP -CurrentPA=Curent BP -RealQty=Real Qty -RealValue=Real Value -RegulatedQty=Regulated Qty -AddInventoryProduct=Add product to inventory -AddProduct=Add -ApplyPMP=Apply PMP -FlushInventory=Flush inventory -ConfirmFlushInventory=Do you confirm this action ? -InventoryFlushed=Inventory flushed -ExitEditMode=Exit edition -inventoryDeleteLine=Delete line -RegulateStock=Regulate Stock -ListInventory=List -NewInventory=New inventory \ No newline at end of file diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang index aeb83b925bd..943debdd14c 100644 --- a/htdocs/langs/en_US/stocks.lang +++ b/htdocs/langs/en_US/stocks.lang @@ -146,3 +146,52 @@ ProductStockWarehouseUpdated=Stock limit for alert and desired optimal stock cor ProductStockWarehouseDeleted=Stock limit for alert and desired optimal stock correctly deleted AddNewProductStockWarehouse=Set new limit for alert and desired optimal stock AddStockLocationLine=Decrease quantity then click to add another warehouse for this product + +Module104420Name = Inventory +Module104420Desc = Create and manage your inventory +NewInventory=New inventory +inventorySetup = Inventory Setup +inventoryCreatePermission=Create new inventory +inventoryReadPermission=View inventories +inventoryWritePermission=Update inventories +inventoryValidatePermission=Validate inventory +inventoryTitle=Inventory +inventoryListTitle=Inventories +inventoryListEmpty=No inventory in progress +inventoryCreateDelete=Create/Delete inventory +inventoryCreate=Create new +inventoryEdit=Edit +inventoryValidate=Validated +inventoryDraft=Running +inventorySelectWarehouse=Warehouse choice +inventoryConfirmCreate=Create +inventoryOfWarehouse=Inventory for warehouse : %s +inventoryErrorQtyAdd=Error : one quantity is leaser than zero +inventoryMvtStock=By inventory +inventoryWarningProductAlreadyExists=This product is already into list +SelectCategory=Category filter +SelectFournisseur=Supplier filter +inventoryOnDate=Inventory +INVENTORY_DISABLE_VIRTUAL=Allow to not destock child product from a kit on inventory +INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found +INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Stock mouvment have date of inventory +inventoryChangePMPPermission=Allow to change PMP value for a product +ColumnNewPMP=New unit PMP +OnlyProdsInStock=Do not add product without stock +TheoricalQty=Theorique qty +TheoricalValue=Theorique qty +LastPA=Last BP +CurrentPA=Curent BP +RealQty=Real Qty +RealValue=Real Value +RegulatedQty=Regulated Qty +AddInventoryProduct=Add product to inventory +AddProduct=Add +ApplyPMP=Apply PMP +FlushInventory=Flush inventory +ConfirmFlushInventory=Do you confirm this action ? +InventoryFlushed=Inventory flushed +ExitEditMode=Exit edition +inventoryDeleteLine=Delete line +RegulateStock=Regulate Stock +ListInventory=List diff --git a/htdocs/inventory/ajax/ajax.inventory.php b/htdocs/product/inventory/ajax/ajax.inventory.php similarity index 86% rename from htdocs/inventory/ajax/ajax.inventory.php rename to htdocs/product/inventory/ajax/ajax.inventory.php index c1f372806c8..0d0e7040d97 100644 --- a/htdocs/inventory/ajax/ajax.inventory.php +++ b/htdocs/product/inventory/ajax/ajax.inventory.php @@ -9,7 +9,7 @@ switch ($put) { case 'qty': - if (empty($user->rights->inventory->write)) { echo -1; exit; } + if (empty($user->rights->stock->write)) { echo -1; exit; } $fk_det_inventory = GETPOST('fk_det_inventory'); @@ -29,7 +29,7 @@ break; case 'pmp': - if (!$user->rights->inventory->write || !$user->rights->inventory->changePMP) { echo -1; exit; } + if (!$user->rights->stock->write || !$user->rights->stock->changePMP) { echo -1; exit; } $fk_det_inventory = GETPOST('fk_det_inventory'); diff --git a/htdocs/inventory/inventory.php b/htdocs/product/inventory/card.php similarity index 90% rename from htdocs/inventory/inventory.php rename to htdocs/product/inventory/card.php index c10cbd1ab20..eb1ad21a8a0 100644 --- a/htdocs/inventory/inventory.php +++ b/htdocs/product/inventory/card.php @@ -16,27 +16,27 @@ */ /** - * \file htdocs/inventory/inventory.php + * \file htdocs/inventory/card.php * \ingroup product * \brief File of class to manage inventory */ -require_once '../main.inc.php'; +require_once '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/listview.class.php'; -require_once DOL_DOCUMENT_ROOT.'/inventory/class/inventory.class.php'; -require_once DOL_DOCUMENT_ROOT.'/inventory/lib/inventory.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; include_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php'; require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php'; +require_once DOL_DOCUMENT_ROOT.'/product/inventory/class/inventory.class.php'; +require_once DOL_DOCUMENT_ROOT.'/product/inventory/lib/inventory.lib.php'; $langs->load('stock'); $langs->load('inventory'); -if(empty($user->rights->inventory->read)) accessforbidden(); +if(empty($user->rights->stock->read)) accessforbidden(); _action(); @@ -54,7 +54,7 @@ function _action() switch($action) { case 'create': - if (empty($user->rights->inventory->create)) accessforbidden(); + if (empty($user->rights->stock->create)) accessforbidden(); $inventory = new Inventory($db); @@ -63,7 +63,7 @@ function _action() break; case 'confirmCreate': - if (empty($user->rights->inventory->create)) accessforbidden(); + if (empty($user->rights->stock->create)) accessforbidden(); $inventory = new Inventory($db); $inventory->setValues($_POST); @@ -79,19 +79,19 @@ function _action() $inventory->addProductsFor($fk_warehouse,$fk_category,$fk_supplier,$only_prods_in_stock); $inventory->update($user); - header('Location: '.dol_buildpath('/inventory/inventory.php?id='.$inventory->id.'&action=edit', 1)); + header('Location: '.dol_buildpath('/product/inventory/card.php?id='.$inventory->id.'&action=edit', 1)); } else{ setEventMessage($inventory->error,'errors'); - header('Location: '.dol_buildpath('/inventory/inventory.php?action=create', 1)); + header('Location: '.dol_buildpath('/product/inventory/card.php?action=create', 1)); } break; case 'edit': - if (!$user->rights->inventory->write) accessforbidden(); + if (!$user->rights->stock->write) accessforbidden(); $inventory = new Inventory($db); @@ -102,7 +102,7 @@ function _action() break; case 'save': - if (!$user->rights->inventory->write) accessforbidden(); + if (!$user->rights->stock->write) accessforbidden(); $id = GETPOST('id'); @@ -120,13 +120,13 @@ function _action() else { $inventory->udpate($user); - header('Location: '.dol_buildpath('inventory/inventory.php?id='.$inventory->getId().'&action=view', 1)); + header('Location: '.dol_buildpath('/product/inventory/card.php?id='.$inventory->getId().'&action=view', 1)); } break; case 'confirm_regulate': - if (!$user->rights->inventory->write) accessforbidden(); + if (!$user->rights->stock->write) accessforbidden(); $id = GETPOST('id'); $inventory = new Inventory($db); @@ -160,7 +160,7 @@ function _action() break; case 'add_line': - if (!$user->rights->inventory->write) accessforbidden(); + if (!$user->rights->stock->write) accessforbidden(); $id = GETPOST('id'); $fk_warehouse = GETPOST('fk_warehouse'); @@ -212,7 +212,7 @@ function _action() break; case 'confirm_delete_line': - if (!$user->rights->inventory->write) accessforbidden(); + if (!$user->rights->stock->write) accessforbidden(); //Cette action devrais se faire uniquement si le status de l'inventaire est à 0 mais aucune vérif @@ -230,7 +230,7 @@ function _action() break; case 'confirm_flush': - if (!$user->rights->inventory->create) accessforbidden(); + if (!$user->rights->stock->create) accessforbidden(); $id = GETPOST('id'); @@ -247,7 +247,7 @@ function _action() break; case 'confirm_delete': - if (!$user->rights->inventory->create) accessforbidden(); + if (!$user->rights->stock->create) accessforbidden(); $id = GETPOST('id'); @@ -276,7 +276,7 @@ function _action() break; default: - if (!$user->rights->inventory->write) accessforbidden(); + if (!$user->rights->stock->write) accessforbidden(); $id = GETPOST('id'); @@ -395,13 +395,13 @@ function card(&$inventory, $action='edit') ); - $can_validate = !empty($user->rights->inventory->validate); - $view_url = dol_buildpath('/inventory/inventory.php', 1); + $can_validate = !empty($user->rights->stock->validate); + $view_url = dol_buildpath('/product/inventory/card.php', 1); $view = array( 'mode' => $action - ,'url' => dol_buildpath('/inventory/inventory.php', 1) - ,'can_validate' => (int) $user->rights->inventory->validate + ,'url' => dol_buildpath('/product/inventory/card.php', 1) + ,'can_validate' => (int) $user->rights->stock->validate ,'is_already_validate' => (int) $inventory->status ,'token'=>$_SESSION['newtoken'] ); @@ -446,10 +446,10 @@ function card_line(&$inventory, &$lines, $mode) 'qty_view' => ($Inventorydet->qty_view ? $Inventorydet->qty_view : 0), 'qty_stock' => $stock, 'qty_regulated' => ($Inventorydet->qty_regulated ? $Inventorydet->qty_regulated : 0), - 'action' => ($user->rights->inventory->write && $mode=='edit' ? ''.img_picto($langs->trans('inventoryDeleteLine'), 'delete').'' : ''), + 'action' => ($user->rights->stock->write && $mode=='edit' ? ''.img_picto($langs->trans('inventoryDeleteLine'), 'delete').'' : ''), 'pmp_stock'=>round($pmp_actual,2), 'pmp_actual'=> round($pmp * $Inventorydet->qty_view,2), - 'pmp_new'=>(!empty($user->rights->inventory->changePMP) && $mode == 'edit' ? ' '.img_picto($langs->trans('Save'), 'bt-save.png@inventory').'' : price($Inventorydet->new_pmp)), + 'pmp_new'=>(!empty($user->rights->stock->changePMP) && $mode == 'edit' ? ' '.img_picto($langs->trans('Save'), 'bt-save.png@inventory').'' : price($Inventorydet->new_pmp)), 'pa_stock'=>round($last_pa * $stock,2), 'pa_actual'=>round($last_pa * $Inventorydet->qty_view,2), 'current_pa_stock'=>round($current_pa * $stock,2), @@ -551,7 +551,7 @@ function _footerList($view,$total_pmp,$total_pmp_actual,$total_pa,$total_pa_actu   rights->inventory->changePMP)) { + if(!empty($user->rights->stock->changePMP)) { echo ' '; } ?> @@ -626,7 +626,7 @@ function _headerList($view) {   trans('PMP'); ?> rights->inventory->changePMP)) { + if(!empty($user->rights->stock->changePMP)) { echo ''.$langs->trans('ColumnNewPMP').''; } ?> diff --git a/htdocs/inventory/class/inventory.class.php b/htdocs/product/inventory/class/inventory.class.php similarity index 98% rename from htdocs/inventory/class/inventory.class.php rename to htdocs/product/inventory/class/inventory.class.php index 14230d90893..b652066d4a4 100644 --- a/htdocs/inventory/class/inventory.class.php +++ b/htdocs/product/inventory/class/inventory.class.php @@ -16,7 +16,7 @@ */ /** - * \file htdocs/inventory/class/product.inventory.php + * \file htdocs/inventory/class/product.class.php * \ingroup product * \brief File of class to manage predefined products stock */ @@ -434,7 +434,7 @@ class Inventory extends CoreObject */ public function getNomUrl($withpicto = 1) { - return ''.($withpicto ? img_picto('','object_list.png','',0).' ' : '').$this->getTitle().''; + return ''.($withpicto ? img_picto('','object_list.png','',0).' ' : '').$this->getTitle().''; } /** diff --git a/htdocs/inventory/img/bt-save.png b/htdocs/product/inventory/img/bt-save.png similarity index 100% rename from htdocs/inventory/img/bt-save.png rename to htdocs/product/inventory/img/bt-save.png diff --git a/htdocs/inventory/img/inventory.png b/htdocs/product/inventory/img/inventory.png similarity index 100% rename from htdocs/inventory/img/inventory.png rename to htdocs/product/inventory/img/inventory.png diff --git a/htdocs/inventory/img/plus.png b/htdocs/product/inventory/img/plus.png similarity index 100% rename from htdocs/inventory/img/plus.png rename to htdocs/product/inventory/img/plus.png diff --git a/htdocs/inventory/img/plus16.png b/htdocs/product/inventory/img/plus16.png similarity index 100% rename from htdocs/inventory/img/plus16.png rename to htdocs/product/inventory/img/plus16.png diff --git a/htdocs/inventory/lib/inventory.lib.php b/htdocs/product/inventory/lib/inventory.lib.php similarity index 92% rename from htdocs/inventory/lib/inventory.lib.php rename to htdocs/product/inventory/lib/inventory.lib.php index eb79ae67cc4..aa8c9c9677d 100644 --- a/htdocs/inventory/lib/inventory.lib.php +++ b/htdocs/product/inventory/lib/inventory.lib.php @@ -31,12 +31,12 @@ function inventoryAdminPrepareHead() { global $langs, $conf; - $langs->load("inventory@inventory"); + $langs->load("inventory"); $h = 0; $head = array(); - $head[$h][0] = dol_buildpath("/admin/inventory.php", 1); + $head[$h][0] = DOL_URL_ROOT."/admin/inventory.php"; $head[$h][1] = $langs->trans("Parameters"); $head[$h][2] = 'settings'; $h++; @@ -60,7 +60,7 @@ function inventoryPrepareHead(&$inventory, $title='Inventory', $get='') global $langs; return array( - array(dol_buildpath('/inventory/inventory.php?id='.$inventory->id.$get, 1), $langs->trans($title),'inventory') + array(dol_buildpath('/product/inventory/card.php?id='.$inventory->id.$get, 1), $langs->trans($title),'inventory') ); } diff --git a/htdocs/inventory/list.php b/htdocs/product/inventory/list.php similarity index 91% rename from htdocs/inventory/list.php rename to htdocs/product/inventory/list.php index d55996d0407..46c41637da0 100644 --- a/htdocs/inventory/list.php +++ b/htdocs/product/inventory/list.php @@ -16,27 +16,27 @@ */ /** - * \file htdocs/inventory/inventory.php + * \file htdocs/inventory/list.php * \ingroup product * \brief File of class to manage inventory */ -require_once '../main.inc.php'; +require_once '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/listview.class.php'; -require_once DOL_DOCUMENT_ROOT.'/inventory/class/inventory.class.php'; -require_once DOL_DOCUMENT_ROOT.'/inventory/lib/inventory.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; include_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php'; require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php'; +require_once DOL_DOCUMENT_ROOT.'/product/inventory/class/inventory.class.php'; +require_once DOL_DOCUMENT_ROOT.'/product/inventory/lib/inventory.lib.php'; $langs->load("stock"); $langs->load("inventory"); -if (empty($user->rights->inventory->read)) accessforbidden(); +if (empty($user->rights->stock->read)) accessforbidden(); llxHeader('',$langs->trans('inventoryListTitle'),'',''); @@ -91,7 +91,7 @@ echo $list->render(Inventory::getSQL('All'), array( )); -/*if (!empty($user->rights->inventory->create)) +/*if (!empty($user->rights->stock->create)) { print '
'; print ''.$langs->trans('inventoryCreate').''; diff --git a/htdocs/inventory/tpl/inventory.tpl.php b/htdocs/product/inventory/tpl/inventory.tpl.php similarity index 98% rename from htdocs/inventory/tpl/inventory.tpl.php rename to htdocs/product/inventory/tpl/inventory.tpl.php index e3fa8e5421d..d55454bd39a 100644 --- a/htdocs/inventory/tpl/inventory.tpl.php +++ b/htdocs/product/inventory/tpl/inventory.tpl.php @@ -136,7 +136,7 @@ rights->inventory->changePMP)) { + if(!empty($user->rights->stock->changePMP)) { echo ''.$row['pmp_new'].''; } ?> @@ -169,7 +169,7 @@ trans('ExportCSV') ?> trans('Modify') ?> rights->inventory->changePMP)) { + if(!empty($user->rights->stock->changePMP)) { echo ''.$langs->trans('ApplyPMP').''; }