lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote branch 'upstream/develop' into charges

Browse Source 
Conflicts:
	htdocs/install/mysql/migration/4.0.0-5.0.0.sql
This commit is contained in:
frederic34 2016-07-15 10:41:56 +02:00
commit 2de3d4ec7b
4 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/core/lib/functions2.lib.php
View File

@ -1971,6 +1971,11 @@ function getElementProperties($element_type)
$module='resource';
$subelement='dolresource';
}
if ($element_type == 'propaldet') {
$classpath = 'comm/propal/class';
$module='propal';
$subelement='propaleligne';
}
$classfile = strtolower($subelement);
$classname = ucfirst($subelement);

9
htdocs/install/mysql/migration/4.0.0-5.0.0.sql
View File

@ -22,8 +22,15 @@
-- -- VMYSQL4.1 DELETE FROM llx_usergroup_user WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup);
ALTER TABLE llx_website ADD COLUMN virtualhost varchar(255) after fk_default_home;
ALTER TABLE llx_website ADD COLUMN virtualhost varchar(255) after fk_default_home;
ALTER TABLE llx_chargesociales ADD COLUMN fk_account integer after fk_type;
ALTER TABLE llx_chargesociales ADD COLUMN fk_mode_reglement integer after fk_account;
ALTER TABLE llx_ecm_files ADD COLUMN gen_or_uploaded varchar(12) after cover;
DROP TABLE llx_document_generator;
DROP TABLE llx_ecm_documents;

3
htdocs/install/mysql/tables/llx_ecm_files.sql
View File

@ -27,7 +27,8 @@ CREATE TABLE llx_ecm_files
description text,
keywords text, -- list of keywords, separated with comma
cover text, -- is this file a file to use for a cover
extraparams varchar(255), -- for stock other parameters with json format
gen_or_uploaded varchar(12), -- 'generated' or 'uploaded'
extraparams varchar(255), -- for stocking other parameters with json format
date_c datetime,
date_m timestamp,
fk_user_c integer,

2
htdocs/websites/index.php
View File

@ -519,7 +519,7 @@ if (count($object->records) > 0)
element: \'websites\',
table_element: \'website\',
fk_element: '.$object->id.',
value: encodeURIComponent(newurl),
value: newurl,
},
context: document.body
});