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

New: add dictionnary sharing (multicompany)

Browse Source
This commit is contained in:
Regis Houssin
2017-06-08 10:24:16 +02:00
parent 1820649175
commit 44dba391c1
7 changed files with 89 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/admin/dict.php
View File

@@ -2,7 +2,7 @@
/* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2015 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be>
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2005-2017 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2010-2016 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2011-2015 Philippe Grand <philippe.grand@atoo-net.com>
* Copyright (C) 2011 Remy Younes <ryounes@gmail.com>

18
htdocs/core/lib/functions.lib.php
View File

@@ -110,10 +110,13 @@ function getDoliDBInstance($type, $host, $user, $pass, $name, $port)
* 'commande', 'commande_fournisseur', 'expedition', 'intervention', 'survey',
* 'contract', 'tax', 'expensereport', 'holiday', 'multicurrency', 'project',
* 'email_template', 'event',
* @param int $shared 1=Return id of current entity + shared entities (default), 0=Return id of current entity only
* @param int $shared 0=Return id of current entity only,
* 1=Return id of current entity + shared entities (default),
* 2=Return id of current entity OR $forceentity value (eg. dictionnary share)
* @param int $forceentity Entity id
* @return mixed Entity id(s) to use
*/
function getEntity($element=false, $shared=1)
function getEntity($element=false, $shared=1, $forceentity=null)
{
global $conf, $mc;
@@ -124,14 +127,23 @@ function getEntity($element=false, $shared=1)
if (is_object($mc))
{
return $mc->getEntity($element, $shared);
return $mc->getEntity($element, $shared, $forceentity);
}
else
{
$out='';
if ($shared == 2)
{
$out.= $forceentity;
}
else
{
$addzero = array('user', 'usergroup', 'email_template', 'default_values');
if (in_array($element, $addzero)) $out.= '0,';
$out.= $conf->entity;
}
return $out;
}
}

8
htdocs/install/mysql/migration/5.0.0-6.0.0.sql
View File

@@ -381,3 +381,11 @@ create table llx_loan_schedule
)ENGINE=innodb;
ALTER TABLE llx_tva ADD COLUMN datec date AFTER tms;
ALTER TABLE llx_c_paiement ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER id;
ALTER TABLE llx_c_paiement DROP INDEX uk_c_paiement;
ALTER TABLE llx_c_paiement ADD UNIQUE INDEX uk_c_paiement(entity, code);
ALTER TABLE llx_c_payment_term ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER rowid;
ALTER TABLE llx_c_payment_term ADD UNIQUE INDEX uk_c_payment_term(entity, code);

3
htdocs/install/mysql/tables/llx_c_paiement.key.sql
View File

@@ -1,5 +1,6 @@
-- ========================================================================
-- Copyright (C) 2012 Florian Henry <florian.henry@open-concept.pro>
-- Copyright (C) 2017 Regis Houssin <regis.houssin@capnetworks.com>
--
-- 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
@@ -16,4 +17,4 @@
--
-- ========================================================================
ALTER TABLE llx_c_paiement ADD UNIQUE INDEX uk_c_paiement(code);
ALTER TABLE llx_c_paiement ADD UNIQUE INDEX uk_c_paiement(entity, code);

5
htdocs/install/mysql/tables/llx_c_paiement.sql
View File

@@ -2,6 +2,7 @@
-- Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
-- Copyright (C) 2004-2014 Laurent Destailleur <eldy@users.sourceforge.net>
-- Copyright (C) 2014 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
-- Copyright (C) 2017 Regis Houssin <regis.houssin@capnetworks.com>
--
-- 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
@@ -21,6 +22,7 @@
create table llx_c_paiement
(
id integer PRIMARY KEY,
entity integer DEFAULT 1 NOT NULL, -- multi company id
code varchar(6) NOT NULL,
libelle varchar(62),
type smallint, -- 0: input money, 1: output money, 2: input and output, 3: other
@@ -28,6 +30,3 @@ create table llx_c_paiement
accountancy_code varchar(32) NULL,
module varchar(32) NULL
)ENGINE=innodb;

20
htdocs/install/mysql/tables/llx_c_payment_term.key.sql Normal file
View File

@@ -0,0 +1,20 @@
-- ========================================================================
-- Copyright (C) 2012 Florian Henry <florian.henry@open-concept.pro>
-- Copyright (C) 2017 Regis Houssin <regis.houssin@capnetworks.com>
--
-- 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 <http://www.gnu.org/licenses/>.
--
-- ========================================================================
ALTER TABLE llx_c_payment_term ADD UNIQUE INDEX uk_c_payment_term(entity, code);

2
htdocs/install/mysql/tables/llx_c_payment_term.sql
View File

@@ -1,6 +1,7 @@
-- ============================================================================
-- Copyright (C) 2002-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
-- Copyright (C) 2016 Laurent Destailleur <eldy@users.sourceforge.net>
-- Copyright (C) 2017 Regis Houssin <regis.houssin@capnetworks.com>
--
-- 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_c_payment_term
(
rowid integer PRIMARY KEY,
entity integer DEFAULT 1 NOT NULL, -- multi company id
code varchar(16),
sortorder smallint,
active tinyint DEFAULT 1,