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

Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2019-05-18 01:13:34 +02:00
commit a44c454a18
16 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -174,6 +174,7 @@ Following changes may create regressions for some external modules, but were nec
* Removed deprecated use of string in dol_print_date(). Only date allowed.
* Deprecated property ->fk_departement is now ->state_id everywhere.
* Removed the method 4 of GETPOST (to get $_COOKIE). It was not used and not recommanded to use in Dolibarr.
* Column llx_facture.facnumber change to llx_facture.ref
***** ChangeLog for 9.0.3 compared to 9.0.2 *****

4
htdocs/core/modules/DolibarrModules.class.php
View File

@ -667,7 +667,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
array(
'doc/' => dol_buildpath(strtolower($this->name).'/doc/', 1),
'img/' => dol_buildpath(strtolower($this->name).'/img/', 1),
'images/' => dol_buildpath(strtolower($this->name).'/imgages/', 1),
'images/' => dol_buildpath(strtolower($this->name).'/images/', 1),
)
);
}
@ -746,7 +746,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
$filefound= false;
// Define path to file README.md.
// First check README-la_LA.md then README.md
// First check ChangeLog-la_LA.md then ChangeLog.md
$pathoffile = dol_buildpath(strtolower($this->name).'/ChangeLog-'.$langs->defaultlang.'.md', 0);
if (dol_is_file($pathoffile)) {
$filefound = true;

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

@ -26,7 +26,7 @@ CREATE TABLE llx_asset(
note_public text,
note_private text,
date_creation datetime NOT NULL,
tms timestamp NOT NULL,
tms timestamp,
fk_user_creat integer NOT NULL,
fk_user_modif integer,
import_key varchar(14),

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

@ -24,7 +24,7 @@ CREATE TABLE llx_bom_bom(
note_public text,
note_private text,
date_creation datetime NOT NULL,
tms timestamp NOT NULL,
tms timestamp,
date_valid datetime,
fk_user_creat integer NOT NULL,
fk_user_modif integer,

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

@ -34,7 +34,7 @@ CREATE TABLE llx_emailcollector_emailcollector(
note_public text,
note_private text,
date_creation datetime NOT NULL,
tms timestamp NOT NULL,
tms timestamp,
fk_user_creat integer NOT NULL,
fk_user_modif integer,
import_key varchar(14),

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

@ -21,7 +21,7 @@ CREATE TABLE llx_emailcollector_emailcollectoraction(
type varchar(128) NOT NULL,
actionparam varchar(255) NULL,
date_creation datetime NOT NULL,
tms timestamp NOT NULL,
tms timestamp,
fk_user_creat integer NOT NULL,
fk_user_modif integer,
position integer DEFAULT 0,

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

@ -21,7 +21,7 @@ CREATE TABLE llx_emailcollector_emailcollectorfilter(
type varchar(128) NOT NULL,
rulevalue varchar(128) NULL,
date_creation datetime NOT NULL,
tms timestamp NOT NULL,
tms timestamp,
fk_user_creat integer NOT NULL,
fk_user_modif integer,
import_key varchar(14),

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

@ -33,6 +33,6 @@ CREATE TABLE llx_pos_cash_fence(
posnumber VARCHAR(30),
fk_user_creat integer,
fk_user_valid integer,
tms TIMESTAMP NOT NULL,
tms TIMESTAMP,
import_key VARCHAR(14)
) ENGINE=innodb;

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

@ -32,7 +32,7 @@ CREATE TABLE llx_societe_account(
date_last_login datetime,
date_previous_login datetime,
date_creation datetime NOT NULL,
tms timestamp NOT NULL,
tms timestamp,
fk_user_creat integer NOT NULL,
fk_user_modif integer,
import_key varchar(14),

3
htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php
View File

@ -292,6 +292,9 @@ class InterfaceMyModuleTriggers extends DolibarrTriggers
//case 'TASK_TIMESPENT_CREATE':
//case 'TASK_TIMESPENT_MODIFY':
//case 'TASK_TIMESPENT_DELETE':
//case 'PROJECT_ADD_CONTACT':
//case 'PROJECT_DELETE_CONTACT':
//case 'PROJECT_DELETE_RESOURCE':
// Shipping
//case 'SHIPPING_CREATE':

2
htdocs/modulebuilder/template/myobject_card.php
View File

@ -127,7 +127,7 @@ if (empty($reshook))
$backurlforlist = dol_buildpath('/mymodule/myobject_list.php', 1);
if (empty($backtopage)) {
if (empty($id)) $backtopage = $backurlforlist;
else $backtopage = dol_buildpath('/mymodule/myobject_card.php', 1).($id > 0 ? $id : '__ID__');
else $backtopage = dol_buildpath('/mymodule/myobject_card.php', 1).'?id='.($id > 0 ? $id : '__ID__');
}
$triggermodname = 'MYMODULE_MYOBJECT_MODIFY'; // Name of trigger action code to execute when we modify record

2
htdocs/modulebuilder/template/sql/llx_mymodule_myobject.sql
View File

@ -22,7 +22,7 @@ CREATE TABLE llx_mymodule_myobject(
qty INTEGER,
status INTEGER,
date_creation DATETIME NOT NULL,
tms TIMESTAMP NOT NULL,
tms TIMESTAMP,
import_key VARCHAR(14)
-- END MODULEBUILDER FIELDS
) ENGINE=innodb;

2
htdocs/societe/card.php
View File

@ -1207,7 +1207,7 @@ else
{
// Supplier
print '<tr>';
print '<td>'.$form->editfieldkey('Supplier', 'fournisseur', '', $object, 0, 'string', '', 1).'</td><td>';
print '<td>'.$form->editfieldkey('Vendor', 'fournisseur', '', $object, 0, 'string', '', 1).'</td><td>';
$default = -1;
if (! empty($conf->global->THIRDPARTY_SUPPLIER_BY_DEFAULT)) $default=1;
print $form->selectyesno("fournisseur", (GETPOST('fournisseur', 'int')!=''?GETPOST('fournisseur', 'int'):(GETPOST("type", 'alpha') == '' ? $default : $object->fournisseur)), 1, 0, (GETPOST("type", 'alpha') == '' ? 1 : 0));

2
htdocs/takepos/pay.php
View File

@ -84,7 +84,7 @@ if ($resql) {
if ($paycode == 'CB') $paycode = 'CB';
if ($paycode == 'CHQ') $paycode = 'CHEQUE';
$accountname="CASHDESK_ID_BANKACCOUNT_".$paycode;
$accountname="CASHDESK_ID_BANKACCOUNT_".$paycode.$_SESSION["takeposterminal"];
if (! empty($conf->global->$accountname) && $conf->global->$accountname > 0) array_push($paiements, $obj);
}
}

2
htdocs/takepos/takepos.php
View File

@ -624,7 +624,7 @@ if ($resql){
if ($paycode == 'CB') $paycode = 'CARD';
if ($paycode == 'CHQ') $paycode = 'CHEQUE';
$accountname="CASHDESK_ID_BANKACCOUNT_".$paycode;
$accountname="CASHDESK_ID_BANKACCOUNT_".$paycode.$_SESSION["takeposterminal"];
if (! empty($conf->global->$accountname) && $conf->global->$accountname > 0) array_push($paiementsModes, $obj);
}
}

4
htdocs/user/perms.php
View File

@ -331,7 +331,9 @@ if ($result)
print '</td>';
}
print '<td></td>';
}
}else {
print '<td></td><td></td>';
}
print '<td></td>';
print '</tr>'."\n";
}