diff --git a/htdocs/compta/sociales/document.php b/htdocs/compta/sociales/document.php index a6f4bc10daf..4d3f908e73c 100644 --- a/htdocs/compta/sociales/document.php +++ b/htdocs/compta/sociales/document.php @@ -99,7 +99,7 @@ if ($object->id) $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='
'; // Label of social contribution diff --git a/htdocs/compta/sociales/info.php b/htdocs/compta/sociales/info.php index ff905f1ee6c..7caa212be9e 100644 --- a/htdocs/compta/sociales/info.php +++ b/htdocs/compta/sociales/info.php @@ -62,7 +62,7 @@ $object->info($id); $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='
'; // Label of social contribution diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql index 6804576c9bd..d0accdda693 100644 --- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql +++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql @@ -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 ('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; diff --git a/htdocs/install/mysql/tables/llx_chargesociales.sql b/htdocs/install/mysql/tables/llx_chargesociales.sql index 5c07c9a74fc..519ceacc9e5 100644 --- a/htdocs/install/mysql/tables/llx_chargesociales.sql +++ b/htdocs/install/mysql/tables/llx_chargesociales.sql @@ -21,6 +21,7 @@ create table llx_chargesociales ( rowid integer AUTO_INCREMENT PRIMARY KEY, + ref varchar(16), -- "TX...." date_ech datetime NOT NULL, -- date echeance libelle varchar(80) NOT NULL, entity integer DEFAULT 1 NOT NULL, -- multi company id @@ -46,4 +47,4 @@ create table llx_chargesociales -- 1 : first company tax -- 2 : second company tax -- 3 : etc... --- \ No newline at end of file +-- diff --git a/htdocs/projet/document.php b/htdocs/projet/document.php index d61c9085f68..ab43a752d15 100644 --- a/htdocs/projet/document.php +++ b/htdocs/projet/document.php @@ -96,7 +96,7 @@ if ($object->id > 0) //print "userAccess=".$userAccess." userWrite=".$userWrite." userDelete=".$userDelete; $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 $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1); diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php index eec48b2a5bd..1efc4465d81 100644 --- a/htdocs/projet/element.php +++ b/htdocs/projet/element.php @@ -388,6 +388,19 @@ $listofreferent=array( 'buttonnew'=>'AddLoan', 'testnew'=>$user->rights->loan->write, '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( 'name'=>"TaskTimeValorised", 'title'=>"ListTaskTimeUserProject", @@ -409,19 +422,6 @@ $listofreferent=array( 'datefieldname'=>'datem', 'disableamount'=>0, '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" 'agenda'=>array( 'name'=>"Agenda", diff --git a/htdocs/projet/note.php b/htdocs/projet/note.php index b00eae5d54d..a6b6e3c93e2 100644 --- a/htdocs/projet/note.php +++ b/htdocs/projet/note.php @@ -77,7 +77,7 @@ if ($id > 0 || ! empty($ref)) //print "userAccess=".$userAccess." userWrite=".$userWrite." userDelete=".$userDelete; $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 diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php index 84dccbb93e7..2665b0b33b5 100644 --- a/htdocs/projet/tasks/task.php +++ b/htdocs/projet/tasks/task.php @@ -430,13 +430,14 @@ if ($id > 0 || ! empty($ref)) $param=($withproject?'&withproject=1':''); $linkback=$withproject?''.$langs->trans("BackToList").'':''; - 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') { print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$_GET["id"].'&withproject='.$withproject,$langs->trans("DeleteATask"),$langs->trans("ConfirmDeleteATask"),"confirm_delete"); } + print '
'; print ''; // Ref @@ -522,7 +523,8 @@ if ($id > 0 || ! empty($ref)) } print '
'; - + print '
'; + dol_fiche_end(); } diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 6197458fc74..a394eae4312 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -1061,7 +1061,7 @@ div.nopadding { width: 44px; } div.attacharea { - padding-top: 10px; + padding-top: 18px; padding-bottom: 10px; } diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 26c3f75b8e2..55741cdcffd 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -1112,7 +1112,7 @@ table.noborder tr.liste_titre td { width: 44px; } div.attacharea { - padding-top: 10px; + padding-top: 18px; padding-bottom: 10px; } div.arearef {