Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git

Browse Source 
into develop

Conflicts:
	htdocs/langs/nl_NL/admin.lang
	htdocs/langs/nl_NL/donations.lang
	htdocs/langs/nl_NL/errors.lang
	htdocs/langs/nl_NL/install.lang
	htdocs/langs/nl_NL/members.lang
	htdocs/langs/nl_NL/paypal.lang
	htdocs/langs/nl_NL/projects.lang
	htdocs/langs/nl_NL/sendings.lang
	htdocs/langs/nl_NL/sms.lang
	htdocs/langs/nl_NL/users.lang
This commit is contained in:
eldy
2011-10-10 13:21:52 +02:00
parent f419df68a9 a4c3e26abf
commit 236c71f0f4
10 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dev/translation/langAutoParser.class.php
View File

@@ -256,7 +256,7 @@ class langAutoParser {
curl_setopt($ch, CURLOPT_REFERER, "http://www.YOURWEBSITE.com"); curl_setopt($ch, CURLOPT_REFERER, "http://www.YOURWEBSITE.com");
$body = curl_exec($ch); $body = curl_exec($ch);
curl_close($ch); curl_close($ch);
sleep(6);
// now, process the JSON string // now, process the JSON string
$json = json_decode($body, true); $json = json_decode($body, true);

11
htdocs/includes/modules/modCashDesk.class.php
View File

@@ -82,6 +82,15 @@ class modCashDesk extends DolibarrModules
// Permissions // Permissions
$this->rights = array(); $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 // Main menu entries
$this->menus = array(); // List of menus to add $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. 'langs'=>'cashdesk', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
'position'=>100, 'position'=>100,
'enabled'=>'$conf->cashdesk->enabled', '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', 'target'=>'pointofsale',
'user'=>0); // 0=Menu for internal users, 1=external users, 2=both 'user'=>0); // 0=Menu for internal users, 1=external users, 2=both

7
htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
View File

@@ -1,6 +1,7 @@
-- ============================================================================ -- ============================================================================
-- Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org> -- Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
-- Copyright (C) 2009 Laurent Destailleur <eldy@users.sourceforge.net> -- Copyright (C) 2009-2011 Laurent Destailleur <eldy@users.sourceforge.net>
-- Copyright (C) 2009-2011 Regis Houssin <regis@dolibarr.fr>
-- --
-- This program is free software; you can redistribute it and/or modify -- 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 -- it under the terms of the GNU General Public License as published by
@@ -20,6 +21,7 @@
create table llx_product_fournisseur_price create table llx_product_fournisseur_price
( (
rowid integer AUTO_INCREMENT PRIMARY KEY, rowid integer AUTO_INCREMENT PRIMARY KEY,
entity integer DEFAULT 1 NOT NULL, -- multi company id
datec datetime, datec datetime,
tms timestamp, tms timestamp,
fk_product_fournisseur integer NOT NULL, -- deprecated fk_product_fournisseur integer NOT NULL, -- deprecated
@@ -30,6 +32,5 @@ create table llx_product_fournisseur_price
price double(24,8) DEFAULT 0, price double(24,8) DEFAULT 0,
quantity double, quantity double,
unitprice double(24,8) DEFAULT 0, unitprice double(24,8) DEFAULT 0,
fk_user integer, fk_user integer
entity integer DEFAULT 1 NOT NULL, -- multi company id
)ENGINE=innodb; )ENGINE=innodb;

1
htdocs/langs/ca_ES/admin.lang
View File

@@ -641,6 +641,7 @@ Permission2515=Configuració carpetes de documents
Permission8555=Ús del mòdul Permission8555=Ús del mòdul
Permission8556=Establir llocs ecommerce Permission8556=Establir llocs ecommerce
Permission8557=Importar dades Permission8557=Importar dades
Permission50001=Utilitzar TPV
Permission50201=Consultar les transaccions Permission50201=Consultar les transaccions
Permission50202=Importar les transaccions Permission50202=Importar les transaccions
DictionnaryCompanyType=Tipus d'empresa DictionnaryCompanyType=Tipus d'empresa

1
htdocs/langs/en_US/admin.lang
View File

@@ -635,6 +635,7 @@ Permission2501=Read/Download documents
Permission2502=Download documents Permission2502=Download documents
Permission2503=Submit or delete documents Permission2503=Submit or delete documents
Permission2515=Setup documents directories Permission2515=Setup documents directories
Permission50001=Use Point of sales
Permission50201= Read transactions Permission50201= Read transactions
Permission50202= Import transactions Permission50202= Import transactions
DictionnaryCompanyType=Company types DictionnaryCompanyType=Company types

1
htdocs/langs/es_ES/admin.lang
View File

@@ -641,6 +641,7 @@ Permission2515=Configuración directorios de documentos
Permission8555=Uso del módulo Permission8555=Uso del módulo
Permission8556=Establecer sitios e-commerce Permission8556=Establecer sitios e-commerce
Permission8557=Importar datos Permission8557=Importar datos
Permission50001=Usar TPV
Permission50201=Consultar las transacciones Permission50201=Consultar las transacciones
Permission50202=Importar las transacciones Permission50202=Importar las transacciones
DictionnaryCompanyType=Tipos de empresa DictionnaryCompanyType=Tipos de empresa

1
htdocs/langs/fr_FR/admin.lang
View File

@@ -642,6 +642,7 @@ Permission2515= Administrer les rubriques de documents
Permission8555= Utilisation du module Permission8555= Utilisation du module
Permission8556= Définir les sites ecommerce Permission8556= Définir les sites ecommerce
Permission8557= Importer les données Permission8557= Importer les données
Permission50001=Utiliser Point de vente
Permission50201= Consulter les transactions Permission50201= Consulter les transactions
Permission50202= Importer les transactions Permission50202= Importer les transactions
DictionnaryCompanyType= Types de sociétés DictionnaryCompanyType= Types de sociétés

2
htdocs/langs/nl_NL/errors.lang
View File

@@ -1,4 +1,4 @@
# Dolibarr language file - nl_NL - errors = # Dolibarr language file - nl_NL - errors
CHARSET = UTF-8 CHARSET = UTF-8
MenuManager = Menubeheer MenuManager = Menubeheer
Error = Fout Error = Fout

2
htdocs/langs/nl_NL/projects.lang
View File

@@ -1,4 +1,4 @@
# Dolibarr language file - nl_NL - projects = # Dolibarr language file - nl_NL - projects
CHARSET = UTF-8 CHARSET = UTF-8
Project = Project Project = Project
Projects = Projecten Projects = Projecten

2
htdocs/langs/nl_NL/users.lang
View File

@@ -1,4 +1,4 @@
# Dolibarr language file - nl_NL - users = # Dolibarr language file - nl_NL - users
CHARSET = UTF-8 CHARSET = UTF-8
UserCard = Gebruikersdetails UserCard = Gebruikersdetails
ContactCard = Contactdetails ContactCard = Contactdetails