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

Fix: bad parameter

Browse Source
This commit is contained in:
Laurent Destailleur 2014-10-09 17:27:14 +02:00
parent 31a96aa4c6
commit e76b5a370d
5 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/comm/action/index.php
View File

@ -47,7 +47,7 @@ $usergroup = GETPOST("usergroup","int",3);
$showbirthday = empty($conf->use_javascript_ajax)?GETPOST("showbirthday","int"):1; $showbirthday = empty($conf->use_javascript_ajax)?GETPOST("showbirthday","int"):1;
// If not choice done on calendar owner, we filter on user. // If not choice done on calendar owner, we filter on user.
if (empty($filtert) && empty($conf->AGENDA_ALL_CALENDARS)) if (empty($filtert) && empty($conf->global->AGENDA_ALL_CALENDARS))
{ {
$filtert=$user->id; $filtert=$user->id;
} }

2
htdocs/comm/action/listactions.php
View File

@ -57,7 +57,7 @@ $usergroup = GETPOST("usergroup","int",3);
$showbirthday = empty($conf->use_javascript_ajax)?GETPOST("showbirthday","int"):1; $showbirthday = empty($conf->use_javascript_ajax)?GETPOST("showbirthday","int"):1;
// If not choice done on calendar owner, we filter on user. // If not choice done on calendar owner, we filter on user.
if (empty($filtert) && empty($conf->AGENDA_ALL_CALENDARS)) if (empty($filtert) && empty($conf->global->AGENDA_ALL_CALENDARS))
{ {
$filtert=$user->id; $filtert=$user->id;
} }

2
htdocs/comm/action/peruser.php
View File

@ -48,7 +48,7 @@ $usergroup = GETPOST("usergroup","int",3);
$showbirthday = 0; $showbirthday = 0;
// If not choice done on calendar owner, we filter on user. // If not choice done on calendar owner, we filter on user.
if (empty($filtert) && empty($conf->AGENDA_ALL_CALENDARS)) if (empty($filtert) && empty($conf->global->AGENDA_ALL_CALENDARS))
{ {
$filtert=$user->id; $filtert=$user->id;
} }

1
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
View File

@ -1011,6 +1011,7 @@ create table llx_c_email_templates
entity integer DEFAULT 1 NOT NULL, -- multi company id entity integer DEFAULT 1 NOT NULL, -- multi company id
module varchar(32), -- Nom du module en rapport avec le modele module varchar(32), -- Nom du module en rapport avec le modele
type_template varchar(32), -- template for which type of email (send invoice by email, send order, ...) type_template varchar(32), -- template for which type of email (send invoice by email, send order, ...)
lang varchar(32),
private smallint DEFAULT 0 NOT NULL, -- Template public or private private smallint DEFAULT 0 NOT NULL, -- Template public or private
fk_user integer, -- Id utilisateur si modele prive, sinon null fk_user integer, -- Id utilisateur si modele prive, sinon null
datec datetime, datec datetime,

1
htdocs/install/mysql/tables/llx_c_email_template.sql
View File

@ -23,6 +23,7 @@ create table llx_c_email_template
entity integer DEFAULT 1 NOT NULL, -- multi company id entity integer DEFAULT 1 NOT NULL, -- multi company id
module varchar(32), -- Nom du module en rapport avec le modele module varchar(32), -- Nom du module en rapport avec le modele
type_template varchar(32), -- template for which type of email (send invoice by email, send order, ...) type_template varchar(32), -- template for which type of email (send invoice by email, send order, ...)
lang varchar(6),
private smallint DEFAULT 0 NOT NULL, -- Template public or private private smallint DEFAULT 0 NOT NULL, -- Template public or private
fk_user integer, -- Id utilisateur si modele prive, sinon null fk_user integer, -- Id utilisateur si modele prive, sinon null
datec datetime, datec datetime,