Uniformize code
This commit is contained in:
parent
22247271f6
commit
53a04703d6
@ -99,7 +99,7 @@ if ($object->id)
|
|||||||
|
|
||||||
$head=tax_prepare_head($object);
|
$head=tax_prepare_head($object);
|
||||||
|
|
||||||
dol_fiche_head($head, 'documents', $langs->trans("SocialContribution"), 0, 'bill');
|
dol_fiche_head($head, 'documents', $langs->trans("SocialContribution"), -1, 'bill');
|
||||||
|
|
||||||
$morehtmlref='<div class="refidno">';
|
$morehtmlref='<div class="refidno">';
|
||||||
// Label of social contribution
|
// Label of social contribution
|
||||||
|
|||||||
@ -62,7 +62,7 @@ $object->info($id);
|
|||||||
|
|
||||||
$head = tax_prepare_head($object);
|
$head = tax_prepare_head($object);
|
||||||
|
|
||||||
dol_fiche_head($head, 'info', $langs->trans("SocialContribution"), 0, 'bill');
|
dol_fiche_head($head, 'info', $langs->trans("SocialContribution"), -1, 'bill');
|
||||||
|
|
||||||
$morehtmlref='<div class="refidno">';
|
$morehtmlref='<div class="refidno">';
|
||||||
// Label of social contribution
|
// Label of social contribution
|
||||||
|
|||||||
@ -122,4 +122,5 @@ INSERT INTO llx_const (name, entity, value, type, visible, note) VALUES ('CONTRA
|
|||||||
INSERT INTO llx_const (name, entity, value, type, visible, note) VALUES ('USERGROUP_ADDON_PDF_ODT_PATH', 1, 'DOL_DATA_ROOT/doctemplates/usergroups', 'chaine', 0, '');
|
INSERT INTO llx_const (name, entity, value, type, visible, note) VALUES ('USERGROUP_ADDON_PDF_ODT_PATH', 1, 'DOL_DATA_ROOT/doctemplates/usergroups', 'chaine', 0, '');
|
||||||
INSERT INTO llx_const (name, entity, value, type, visible, note) VALUES ('USER_ADDON_PDF_ODT_PATH', 1, 'DOL_DATA_ROOT/doctemplates/users', 'chaine', 0, '');
|
INSERT INTO llx_const (name, entity, value, type, visible, note) VALUES ('USER_ADDON_PDF_ODT_PATH', 1, 'DOL_DATA_ROOT/doctemplates/users', 'chaine', 0, '');
|
||||||
|
|
||||||
|
ALTER TABLE llx_chargesociales ADD COLUMN ref varchar(16);
|
||||||
ALTER TABLE llx_chargesociales ADD COLUMN fk_projet integer DEFAULT NULL;
|
ALTER TABLE llx_chargesociales ADD COLUMN fk_projet integer DEFAULT NULL;
|
||||||
|
|||||||
@ -21,6 +21,7 @@
|
|||||||
create table llx_chargesociales
|
create table llx_chargesociales
|
||||||
(
|
(
|
||||||
rowid integer AUTO_INCREMENT PRIMARY KEY,
|
rowid integer AUTO_INCREMENT PRIMARY KEY,
|
||||||
|
ref varchar(16), -- "TX...."
|
||||||
date_ech datetime NOT NULL, -- date echeance
|
date_ech datetime NOT NULL, -- date echeance
|
||||||
libelle varchar(80) NOT NULL,
|
libelle varchar(80) NOT NULL,
|
||||||
entity integer DEFAULT 1 NOT NULL, -- multi company id
|
entity integer DEFAULT 1 NOT NULL, -- multi company id
|
||||||
@ -46,4 +47,4 @@ create table llx_chargesociales
|
|||||||
-- 1 : first company tax
|
-- 1 : first company tax
|
||||||
-- 2 : second company tax
|
-- 2 : second company tax
|
||||||
-- 3 : etc...
|
-- 3 : etc...
|
||||||
--
|
--
|
||||||
|
|||||||
@ -96,7 +96,7 @@ if ($object->id > 0)
|
|||||||
//print "userAccess=".$userAccess." userWrite=".$userWrite." userDelete=".$userDelete;
|
//print "userAccess=".$userAccess." userWrite=".$userWrite." userDelete=".$userDelete;
|
||||||
|
|
||||||
$head = project_prepare_head($object);
|
$head = project_prepare_head($object);
|
||||||
dol_fiche_head($head, 'document', $langs->trans("Project"), 0, ($object->public?'projectpub':'project'));
|
dol_fiche_head($head, 'document', $langs->trans("Project"), -1, ($object->public?'projectpub':'project'));
|
||||||
|
|
||||||
// Files list constructor
|
// Files list constructor
|
||||||
$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
|
$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
|
||||||
|
|||||||
@ -388,6 +388,19 @@ $listofreferent=array(
|
|||||||
'buttonnew'=>'AddLoan',
|
'buttonnew'=>'AddLoan',
|
||||||
'testnew'=>$user->rights->loan->write,
|
'testnew'=>$user->rights->loan->write,
|
||||||
'test'=>$conf->loan->enabled && $user->rights->loan->read),
|
'test'=>$conf->loan->enabled && $user->rights->loan->read),
|
||||||
|
'chargesociales'=>array(
|
||||||
|
'name'=>"SocialContribution",
|
||||||
|
'title'=>"ListSocialContributionAssociatedProject",
|
||||||
|
'class'=>'ChargeSociales',
|
||||||
|
'margin'=>'add',
|
||||||
|
'table'=>'chargesociales',
|
||||||
|
'datefieldname'=>'date_ech',
|
||||||
|
'disableamount'=>0,
|
||||||
|
'urlnew'=>DOL_URL_ROOT.'/compta/sociales/card.php?action=create&projectid='.$id,
|
||||||
|
'lang'=>'compta',
|
||||||
|
'buttonnew'=>'AddSocialContribution',
|
||||||
|
'testnew'=>$user->rights->tax->charges->lire,
|
||||||
|
'test'=>$conf->tax->enabled && $user->rights->tax->charges->lire),
|
||||||
'project_task'=>array(
|
'project_task'=>array(
|
||||||
'name'=>"TaskTimeValorised",
|
'name'=>"TaskTimeValorised",
|
||||||
'title'=>"ListTaskTimeUserProject",
|
'title'=>"ListTaskTimeUserProject",
|
||||||
@ -409,19 +422,6 @@ $listofreferent=array(
|
|||||||
'datefieldname'=>'datem',
|
'datefieldname'=>'datem',
|
||||||
'disableamount'=>0,
|
'disableamount'=>0,
|
||||||
'test'=>($conf->stock->enabled && $user->rights->stock->mouvement->lire && ! empty($conf->global->STOCK_MOVEMENT_INTO_PROJECT_OVERVIEW))),
|
'test'=>($conf->stock->enabled && $user->rights->stock->mouvement->lire && ! empty($conf->global->STOCK_MOVEMENT_INTO_PROJECT_OVERVIEW))),
|
||||||
'chargesociales'=>array(
|
|
||||||
'name'=>"SocialContribution",
|
|
||||||
'title'=>"ListSocialContributionAssociatedProject",
|
|
||||||
'class'=>'ChargeSociales',
|
|
||||||
'margin'=>'add',
|
|
||||||
'table'=>'chargesociales',
|
|
||||||
'datefieldname'=>'date_ech',
|
|
||||||
'disableamount'=>0,
|
|
||||||
'urlnew'=>DOL_URL_ROOT.'/compta/sociales/card.php?action=create&projectid='.$id,
|
|
||||||
'lang'=>'compta',
|
|
||||||
'buttonnew'=>'AddSocialContribution',
|
|
||||||
'testnew'=>$user->rights->tax->charges->lire,
|
|
||||||
'test'=>$conf->tax->enabled && $user->rights->tax->charges->lire)
|
|
||||||
/* No need for this, available on dedicated tab "Agenda/Events"
|
/* No need for this, available on dedicated tab "Agenda/Events"
|
||||||
'agenda'=>array(
|
'agenda'=>array(
|
||||||
'name'=>"Agenda",
|
'name'=>"Agenda",
|
||||||
|
|||||||
@ -77,7 +77,7 @@ if ($id > 0 || ! empty($ref))
|
|||||||
//print "userAccess=".$userAccess." userWrite=".$userWrite." userDelete=".$userDelete;
|
//print "userAccess=".$userAccess." userWrite=".$userWrite." userDelete=".$userDelete;
|
||||||
|
|
||||||
$head = project_prepare_head($object);
|
$head = project_prepare_head($object);
|
||||||
dol_fiche_head($head, 'notes', $langs->trans('Project'), 0, ($object->public?'projectpub':'project'));
|
dol_fiche_head($head, 'notes', $langs->trans('Project'), -1, ($object->public?'projectpub':'project'));
|
||||||
|
|
||||||
|
|
||||||
// Project card
|
// Project card
|
||||||
|
|||||||
@ -430,13 +430,14 @@ if ($id > 0 || ! empty($ref))
|
|||||||
$param=($withproject?'&withproject=1':'');
|
$param=($withproject?'&withproject=1':'');
|
||||||
$linkback=$withproject?'<a href="'.DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.'">'.$langs->trans("BackToList").'</a>':'';
|
$linkback=$withproject?'<a href="'.DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.'">'.$langs->trans("BackToList").'</a>':'';
|
||||||
|
|
||||||
dol_fiche_head($head, 'task_task', $langs->trans("Task"),0,'projecttask');
|
dol_fiche_head($head, 'task_task', $langs->trans("Task"), -1, 'projecttask');
|
||||||
|
|
||||||
if ($action == 'delete')
|
if ($action == 'delete')
|
||||||
{
|
{
|
||||||
print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$_GET["id"].'&withproject='.$withproject,$langs->trans("DeleteATask"),$langs->trans("ConfirmDeleteATask"),"confirm_delete");
|
print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$_GET["id"].'&withproject='.$withproject,$langs->trans("DeleteATask"),$langs->trans("ConfirmDeleteATask"),"confirm_delete");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
print '<div class="fichecenter">';
|
||||||
print '<table class="border" width="100%">';
|
print '<table class="border" width="100%">';
|
||||||
|
|
||||||
// Ref
|
// Ref
|
||||||
@ -522,7 +523,8 @@ if ($id > 0 || ! empty($ref))
|
|||||||
}
|
}
|
||||||
|
|
||||||
print '</table>';
|
print '</table>';
|
||||||
|
print '</div>';
|
||||||
|
|
||||||
dol_fiche_end();
|
dol_fiche_end();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1061,7 +1061,7 @@ div.nopadding {
|
|||||||
width: 44px;
|
width: 44px;
|
||||||
}
|
}
|
||||||
div.attacharea {
|
div.attacharea {
|
||||||
padding-top: 10px;
|
padding-top: 18px;
|
||||||
padding-bottom: 10px;
|
padding-bottom: 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1112,7 +1112,7 @@ table.noborder tr.liste_titre td {
|
|||||||
width: 44px;
|
width: 44px;
|
||||||
}
|
}
|
||||||
div.attacharea {
|
div.attacharea {
|
||||||
padding-top: 10px;
|
padding-top: 18px;
|
||||||
padding-bottom: 10px;
|
padding-bottom: 10px;
|
||||||
}
|
}
|
||||||
div.arearef {
|
div.arearef {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user