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

Debug v15

Browse Source
This commit is contained in:
Laurent Destailleur 2022-02-28 12:13:06 +01:00
parent b9649632fa
commit 32f2eb8c94
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/install/mysql/migration/14.0.0-15.0.0.sql
View File

@ -503,3 +503,6 @@ INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) value
INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('HOLIDAY_APPROVE','Holiday aprouved','Executed when a holiday is aprouved','holiday',803);
INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('HOLIDAY_CANCEL','Holiday canceled','Executed when a holiday is canceled','holiday',802);
INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('HOLIDAY_DELETE','Holiday deleted','Executed when a holiday is deleted','holiday',804);
-- VMYSQL4.3 ALTER TABLE llx_user MODIFY COLUMN fk_soc integer NULL;
-- VPGSQL8.2 ALTER TABLE llx_user ALTER COLUMN fk_soc DROP NOT NULL;

2
htdocs/install/mysql/tables/llx_user.key.sql
View File

@ -21,7 +21,7 @@
ALTER TABLE llx_user ADD UNIQUE INDEX uk_user_login (login, entity);
ALTER TABLE llx_user ADD INDEX idx_user_fk_societe (fk_soc);
ALTER TABLE llx_user ADD INDEX idx_user_fk_societe (fk_soc);
ALTER TABLE llx_user ADD UNIQUE INDEX uk_user_fk_socpeople (fk_socpeople);
ALTER TABLE llx_user ADD UNIQUE INDEX uk_user_fk_member (fk_member);

12
htdocs/install/mysql/tables/llx_user.sql
View File

@ -64,12 +64,12 @@ create table llx_user
--module_comm smallint DEFAULT 1,
--module_compta smallint DEFAULT 1,
fk_soc integer, -- id thirdparty if user linked to a company (external user)
fk_socpeople integer, -- id contact origin if user linked to a contact
fk_member integer, -- if member if suer linked to a member
fk_user integer, -- Supervisor, hierarchic parent
fk_user_expense_validator integer,
fk_user_holiday_validator integer,
fk_soc integer NULL, -- id thirdparty if user linked to a company (external user)
fk_socpeople integer NULL, -- id contact origin if user linked to a contact
fk_member integer NULL, -- if member if suer linked to a member
fk_user integer NULL, -- Supervisor, hierarchic parent
fk_user_expense_validator integer NULL,
fk_user_holiday_validator integer NULL,
idpers1 varchar(128),
idpers2 varchar(128),

2
htdocs/user/card.php
View File

@ -915,7 +915,7 @@ if ($action == 'create' || $action == 'adduserldap') {
$defaultemployee = '1';
print '<tr>';
print '<td>'.$langs->trans('Employee').'</td><td>';
print '<input type="checkbox" name="employee" value="1"'.(GETPOST('employee') == '1' ? ' checked="checked"' : ($defaultemployee ? ' checked="checked"' : '')).'>';
print '<input type="checkbox" name="employee" value="1"'.(GETPOST('employee') == '1' ? ' checked="checked"' : (($defaultemployee && !GETPOSTISSET('login')) ? ' checked="checked"' : '')).'>';
//print $form->selectyesno("employee", (GETPOST('employee') != '' ?GETPOST('employee') : $defaultemployee), 1);
print '</td></tr>';