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

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

Browse Source 
Conflicts:
	htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
This commit is contained in:
Laurent Destailleur 2018-02-24 12:52:57 +01:00
commit c8078b54b5
5 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dev/initdemo/initdemo.sh
View File

@ -171,6 +171,7 @@ then
cp -pr $mydir/../../htdocs/install/doctemplates/* "$documentdir/doctemplates/" cp -pr $mydir/../../htdocs/install/doctemplates/* "$documentdir/doctemplates/"
mkdir -p "$documentdir/ecm/Administrative documents" mkdir -p "$documentdir/ecm/Administrative documents"
mkdir -p "$documentdir/ecm/Images" mkdir -p "$documentdir/ecm/Images"
rm -f "$documentdir/doctemplates/"*/index.html
echo cp -pr $mydir/../../doc/images/* "$documentdir/ecm/Images" echo cp -pr $mydir/../../doc/images/* "$documentdir/ecm/Images"
cp -pr $mydir/../../doc/images/* "$documentdir/ecm/Images" cp -pr $mydir/../../doc/images/* "$documentdir/ecm/Images"
else else

2
htdocs/core/class/commonobject.class.php
View File

@ -4534,7 +4534,7 @@ abstract class CommonObject
if ($key != 'rowid' && $key != 'tms' && $key != 'fk_member' && ! is_int($key)) if ($key != 'rowid' && $key != 'tms' && $key != 'fk_member' && ! is_int($key))
{ {
// we can add this attribute to object // we can add this attribute to object
if (in_array($extrafields->attributes[$this->table_element]['type'][$key], array('date','datetime'))) if (! empty($extrafields) && in_array($extrafields->attributes[$this->table_element]['type'][$key], array('date','datetime')))
{ {
//var_dump($extrafields->attributes[$this->table_element]['type'][$key]); //var_dump($extrafields->attributes[$this->table_element]['type'][$key]);
$this->array_options["options_".$key]=$this->db->jdate($value); $this->array_options["options_".$key]=$this->db->jdate($value);

2
htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
View File

@ -329,7 +329,7 @@ class doc_generic_contract_odt extends ModelePDFContract
$paramfreetext='contract_FREE_TEXT'; $paramfreetext='contract_FREE_TEXT';
if (! empty($conf->global->$paramfreetext)) if (! empty($conf->global->$paramfreetext))
{ {
$newfreetext=make_substitutions($conf->global->$paramfreetext,$substitutionarray); $newfreetext=make_substitutions($conf->global->$paramfreetext,$tmparray);
} }

2
htdocs/install/mysql/migration/6.0.0-7.0.0.sql
View File

@ -321,6 +321,8 @@ CREATE TABLE IF NOT EXISTS llx_expensereport_ik (
active integer DEFAULT 1 active integer DEFAULT 1
)ENGINE=innodb; )ENGINE=innodb;
ALTER TABLE llx_expensereport_ik ADD COLUMN ikoffset double DEFAULT 0 NOT NULL;
CREATE TABLE IF NOT EXISTS llx_c_exp_tax_cat ( CREATE TABLE IF NOT EXISTS llx_c_exp_tax_cat (
rowid integer AUTO_INCREMENT PRIMARY KEY, rowid integer AUTO_INCREMENT PRIMARY KEY,
label varchar(48) NOT NULL, label varchar(48) NOT NULL,