diff --git a/dev/translation/langAutoParser.class.php b/dev/translation/langAutoParser.class.php index 927b47c1574..2c9107441fe 100644 --- a/dev/translation/langAutoParser.class.php +++ b/dev/translation/langAutoParser.class.php @@ -256,7 +256,7 @@ class langAutoParser { curl_setopt($ch, CURLOPT_REFERER, "http://www.YOURWEBSITE.com"); $body = curl_exec($ch); curl_close($ch); - +sleep(6); // now, process the JSON string $json = json_decode($body, true); diff --git a/htdocs/includes/modules/modCashDesk.class.php b/htdocs/includes/modules/modCashDesk.class.php index f2a8d0b6a62..824b253a6be 100644 --- a/htdocs/includes/modules/modCashDesk.class.php +++ b/htdocs/includes/modules/modCashDesk.class.php @@ -82,6 +82,15 @@ class modCashDesk extends DolibarrModules // Permissions $this->rights = array(); + $this->rights_class = 'cashdesk'; + $r=0; + + $r++; + $this->rights[$r][0] = 50001; + $this->rights[$r][1] = 'Use cashdesk'; + $this->rights[$r][2] = 'a'; + $this->rights[$r][3] = 1; + $this->rights[$r][4] = 'use'; // Main menu entries $this->menus = array(); // List of menus to add @@ -97,7 +106,7 @@ class modCashDesk extends DolibarrModules 'langs'=>'cashdesk', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory. 'position'=>100, 'enabled'=>'$conf->cashdesk->enabled', - 'perms'=>1, // Use 'perms'=>'1' if you want your menu with no permission rules + 'perms'=>'$user->rights->cashdesk->use', // Use 'perms'=>'1' if you want your menu with no permission rules 'target'=>'pointofsale', 'user'=>0); // 0=Menu for internal users, 1=external users, 2=both diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql index 42f9f836471..3adb886fa31 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql @@ -1,6 +1,7 @@ -- ============================================================================ --- Copyright (C) 2003 Rodolphe Quiedeville --- Copyright (C) 2009 Laurent Destailleur +-- Copyright (C) 2003 Rodolphe Quiedeville +-- Copyright (C) 2009-2011 Laurent Destailleur +-- Copyright (C) 2009-2011 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 @@ -20,6 +21,7 @@ create table llx_product_fournisseur_price ( rowid integer AUTO_INCREMENT PRIMARY KEY, + entity integer DEFAULT 1 NOT NULL, -- multi company id datec datetime, tms timestamp, fk_product_fournisseur integer NOT NULL, -- deprecated @@ -30,6 +32,5 @@ create table llx_product_fournisseur_price price double(24,8) DEFAULT 0, quantity double, unitprice double(24,8) DEFAULT 0, - fk_user integer, - entity integer DEFAULT 1 NOT NULL, -- multi company id + fk_user integer )ENGINE=innodb; diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang index ac81dba9a25..56d3ab17c99 100644 --- a/htdocs/langs/ca_ES/admin.lang +++ b/htdocs/langs/ca_ES/admin.lang @@ -641,6 +641,7 @@ Permission2515=Configuració carpetes de documents Permission8555=Ús del mòdul Permission8556=Establir llocs ecommerce Permission8557=Importar dades +Permission50001=Utilitzar TPV Permission50201=Consultar les transaccions Permission50202=Importar les transaccions DictionnaryCompanyType=Tipus d'empresa diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 2af977d0d17..d0a67deb2db 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -635,6 +635,7 @@ Permission2501=Read/Download documents Permission2502=Download documents Permission2503=Submit or delete documents Permission2515=Setup documents directories +Permission50001=Use Point of sales Permission50201= Read transactions Permission50202= Import transactions DictionnaryCompanyType=Company types diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang index 3d1abf13eed..af55b925637 100644 --- a/htdocs/langs/es_ES/admin.lang +++ b/htdocs/langs/es_ES/admin.lang @@ -641,6 +641,7 @@ Permission2515=Configuración directorios de documentos Permission8555=Uso del módulo Permission8556=Establecer sitios e-commerce Permission8557=Importar datos +Permission50001=Usar TPV Permission50201=Consultar las transacciones Permission50202=Importar las transacciones DictionnaryCompanyType=Tipos de empresa diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index b0957345e4b..a44227fd787 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -642,6 +642,7 @@ Permission2515= Administrer les rubriques de documents Permission8555= Utilisation du module Permission8556= Définir les sites ecommerce Permission8557= Importer les données +Permission50001=Utiliser Point de vente Permission50201= Consulter les transactions Permission50202= Importer les transactions DictionnaryCompanyType= Types de sociétés diff --git a/htdocs/langs/nl_NL/errors.lang b/htdocs/langs/nl_NL/errors.lang index cc76f918707..90af4834008 100644 --- a/htdocs/langs/nl_NL/errors.lang +++ b/htdocs/langs/nl_NL/errors.lang @@ -1,4 +1,4 @@ -# Dolibarr language file - nl_NL - errors = +# Dolibarr language file - nl_NL - errors CHARSET = UTF-8 MenuManager = Menubeheer Error = Fout diff --git a/htdocs/langs/nl_NL/projects.lang b/htdocs/langs/nl_NL/projects.lang index 8cbc291864f..c0a18ef862e 100644 --- a/htdocs/langs/nl_NL/projects.lang +++ b/htdocs/langs/nl_NL/projects.lang @@ -1,4 +1,4 @@ -# Dolibarr language file - nl_NL - projects = +# Dolibarr language file - nl_NL - projects CHARSET = UTF-8 Project = Project Projects = Projecten diff --git a/htdocs/langs/nl_NL/users.lang b/htdocs/langs/nl_NL/users.lang index 0b010bea77b..a1b9ff9ae0e 100644 --- a/htdocs/langs/nl_NL/users.lang +++ b/htdocs/langs/nl_NL/users.lang @@ -1,4 +1,4 @@ -# Dolibarr language file - nl_NL - users = +# Dolibarr language file - nl_NL - users CHARSET = UTF-8 UserCard = Gebruikersdetails ContactCard = Contactdetails