diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php
index 1409cc90417..7fbf2774e85 100644
--- a/htdocs/compta/bank/various_payment/card.php
+++ b/htdocs/compta/bank/various_payment/card.php
@@ -72,6 +72,8 @@ $object = new PaymentVarious($db);
// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
$hookmanager->initHooks(array('variouscard', 'globalcard'));
+$permissiontoadd = $user->hasRight('banque', 'modifier');
+
/**
* Actions
@@ -97,9 +99,9 @@ if (empty($reshook)) {
}
// Link to a project
- if ($action == 'classin' && $user->rights->banque->modifier) {
+ if ($action == 'classin' && $permissiontoadd) {
$object->fetch($id);
- $object->setProject(GETPOST('projectid'));
+ $object->setProject(GETPOST('projectid', 'int'));
}
if ($action == 'add') {
@@ -253,7 +255,7 @@ if ($action == 'confirm_clone' && $confirm != 'yes') {
$action = '';
}
-if ($action == 'confirm_clone' && $confirm == 'yes' && ($user->rights->banque->modifier)) {
+if ($action == 'confirm_clone' && $confirm == 'yes' && $permissiontoadd) {
$db->begin();
$originalId = $id;
@@ -577,32 +579,25 @@ if ($id) {
// Project
if (isModEnabled('project')) {
$langs->load("projects");
- $morehtmlref .= $langs->trans('Project').' ';
- if ($user->rights->banque->modifier) {
+ //$morehtmlref .= '
';
+ if ($permissiontoadd) {
+ $morehtmlref .= img_picto($langs->trans("Project"), 'project', 'class="pictofixedwidth"');
if ($action != 'classify') {
- $morehtmlref .= ''.img_edit($langs->transnoentitiesnoconv('SetProject')).' : ';
- }
- if ($action == 'classify') {
- //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
- $morehtmlref .= '
';
- } else {
- $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
+ $morehtmlref .= ''.img_edit($langs->transnoentitiesnoconv('SetProject')).' ';
}
+ $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
} else {
if (!empty($object->fk_project)) {
$proj = new Project($db);
$proj->fetch($object->fk_project);
$morehtmlref .= $proj->getNomUrl(1);
- } else {
- $morehtmlref .= '';
+ if ($proj->title) {
+ $morehtmlref .= ' - '.dol_escape_htmltag($proj->title).'';
+ }
}
}
}
+
$morehtmlref .= '';
$linkback = ''.$langs->trans("BackToList").'';
@@ -640,20 +635,6 @@ if ($id) {
print '| '.$langs->trans("Amount").' | '.price($object->amount, 0, $langs, 1, -1, -1, $conf->currency).' |
';
// Account of Chart of account
- /*
- print '| ';
- print $form->editfieldkey('AccountAccounting', 'account', $object->accountancy_code, $object, (!$alreadyaccounted && $user->rights->banque->modifier), 'string', '', 0);
- print ' | ';
- if ($action == 'editaccount') {
- if (isModEnabled('accounting')) {
- print $formaccounting->select_account($object->accountancy_code, 'accountancy_code', 1, null, 1, 1);
- } else { // For external software
- print '';
- }
- } else {
- include_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
- print length_accounta($object->accountancy_code);
- }*/
$editvalue = '';
if (isModEnabled('accounting')) {
$editvalue = $formaccounting->select_account($object->accountancy_code, 'accountancy_code', 1, null, 1, 1);
@@ -661,16 +642,16 @@ if ($id) {
print ' |
';
print '| ';
- print $form->editfieldkey('AccountAccounting', 'accountancy_code', $object->accountancy_code, $object, (!$alreadyaccounted && $user->rights->banque->modifier), 'string', '', 0);
+ print $form->editfieldkey('AccountAccounting', 'accountancy_code', $object->accountancy_code, $object, (!$alreadyaccounted && $permissiontoadd), 'string', '', 0);
print ' | ';
- print $form->editfieldval('AccountAccounting', 'accountancy_code', $object->accountancy_code, $object, (!$alreadyaccounted && $user->rights->banque->modifier), 'asis', $editvalue, 0, null, '', 1, 'lengthAccountg');
+ print $form->editfieldval('AccountAccounting', 'accountancy_code', $object->accountancy_code, $object, (!$alreadyaccounted && $permissiontoadd), 'asis', $editvalue, 0, null, '', 1, 'lengthAccountg');
print ' |
';
// Subledger account
print '| ';
- print $form->editfieldkey('SubledgerAccount', 'subledger_account', $object->subledger_account, $object, (!$alreadyaccounted && $user->rights->banque->modifier), 'string', '', 0);
+ print $form->editfieldkey('SubledgerAccount', 'subledger_account', $object->subledger_account, $object, (!$alreadyaccounted && $permissiontoadd), 'string', '', 0);
print ' | ';
- print $form->editfieldval('SubledgerAccount', 'subledger_account', $object->subledger_account, $object, (!$alreadyaccounted && $user->rights->banque->modifier), 'string', '', 0, null, '', 1, 'lengthAccounta');
+ print $form->editfieldval('SubledgerAccount', 'subledger_account', $object->subledger_account, $object, (!$alreadyaccounted && $permissiontoadd), 'string', '', 0, null, '', 1, 'lengthAccounta');
print ' |
';
$bankaccountnotfound = 0;
@@ -719,13 +700,13 @@ if ($id) {
// Add button modify
// Clone
- if ($user->rights->banque->modifier) {
+ if ($permissiontoadd) {
print '";
}
// Delete
if (empty($object->rappro) || $bankaccountnotfound) {
- if (!empty($user->rights->banque->modifier)) {
+ if ($permissiontoadd) {
if ($alreadyaccounted) {
print '';
} else {
diff --git a/htdocs/compta/bank/various_payment/document.php b/htdocs/compta/bank/various_payment/document.php
index 43259727917..58e4d3680b9 100644
--- a/htdocs/compta/bank/various_payment/document.php
+++ b/htdocs/compta/bank/various_payment/document.php
@@ -100,7 +100,6 @@ if ($object->id) {
// Project
if (isModEnabled('project')) {
$langs->load("projects");
- $morehtmlref .= $langs->trans('Project').' : ';
if ($user->rights->banque->modifier && 0) {
if ($action != 'classify') {
$morehtmlref .= ''.img_edit($langs->transnoentitiesnoconv('SetProject')).' : ';
diff --git a/htdocs/compta/bank/various_payment/info.php b/htdocs/compta/bank/various_payment/info.php
index ca31915d2f4..06f243a9847 100644
--- a/htdocs/compta/bank/various_payment/info.php
+++ b/htdocs/compta/bank/various_payment/info.php
@@ -60,7 +60,6 @@ $morehtmlref = '