diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php index 07652ec2ac3..a62e4d82d9f 100644 --- a/htdocs/accountancy/bookkeeping/card.php +++ b/htdocs/accountancy/bookkeeping/card.php @@ -490,24 +490,8 @@ if ($action == 'create') { print ''; - /*print ''; - print ''; - print ''; - print '';*/ - print ''; - print ''; - print ''; - print ''; - - print ''; - print ''; + print ''; print ''; @@ -519,10 +503,22 @@ if ($action == 'create') { print ''; print ''; - print ''; + print ''; print ''; print ''; + // Piece number + print ''; + print ''; + print ''; + print ''; + /* print ''; print ''; @@ -564,7 +560,11 @@ if ($action == 'create') { print dol_get_fiche_head($head, 'transaction', '', -1); - $object->label = $object->doc_ref; + //$object->label = $object->doc_ref; + if ($mode == '_tmp') { + $object->context['mode'] = $mode; + } + $object->label = $object->ref; $morehtmlref = '
'; $morehtmlref .= '
'; @@ -581,13 +581,15 @@ if ($action == 'create') { print '
' . $langs->trans("NumPiece") . '' . $next_num_mvt . '
'.$langs->trans("Ref").''; - if ($numRefModel === 'mod_bookkeeping_neon') { - print ''; - } else { - print ''.$langs->trans("Automatic").''; - } - print '
'.$langs->trans("Docdate").''.$langs->trans("Docdate").''; print $form->selectDate('', 'doc_date', 0, 0, 0, "create_mvt", 1, 1); print '
'.$langs->trans("Piece").''.$form->textwithpicto($langs->trans("Piece"), $langs->trans("PieceDesc")).'
'.$form->textwithpicto($langs->trans("Ref"), $langs->trans("BankTransactionRef")).''; + if ($numRefModel === 'mod_bookkeeping_neon') { + print ''; + } else { + print ''.$langs->trans("Automatic").''; + } + print '
' . $langs->trans("Doctype") . '
'; // Account movement + /* print ''; - print ''; + print ''; print ''; print ''; + */ // Account movement ref. Edit allowed only for free ref num model. - print '
'.$langs->trans("NumMvts").''.$langs->trans("NumMvts").''.($mode == '_tmp' ? ''.$langs->trans("Draft").'' : $object->piece_num).'
'; + print '
'; print ''; @@ -611,7 +613,7 @@ if ($action == 'create') { print ''; print ''; print ''; - print ''; + print ''; print ''; } else { print $object->ref; @@ -622,7 +624,7 @@ if ($action == 'create') { // Ref document print '
'; print $langs->trans('Ref'); print '
'; print ''; if ($action != 'editdocref') { print '
'; - print $langs->trans('Piece'); + print $form->textwithpicto($langs->trans('Piece'), $langs->trans('PieceDesc')); print ''; @@ -644,7 +646,7 @@ if ($action == 'create') { print ''; print ''; print ''; - print ''; + print ''; print ''; } else { print $object->doc_ref; @@ -1041,11 +1043,11 @@ if ($action == 'create') { print '
'; print '
'; if (empty($total_debit) && empty($total_credit)) { - print ''; + print ''.dol_escape_htmltag($langs->trans("ValidTransaction")).''; } elseif ($total_debit == $total_credit) { print ''.$langs->trans("ValidTransaction").''; } else { - print ''; + print ''.dol_escape_htmltag($langs->trans("ValidTransaction")).''; } print '   '; diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index b4545ef62a4..4fbd46e434d 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -10497,7 +10497,7 @@ class Form } //if ($conf->browser->layout == 'phone') $ret.='
'; - $ret .= '
'; + $ret .= '
'; // For thirdparty, contact, user, member, the ref is the id, so we show something else if ($object->element == 'societe') { @@ -10553,6 +10553,8 @@ class Form $ret .= $object->label; } elseif ($object->element == 'ecm_directories') { $ret .= ''; + } elseif ($object->element == 'accountingbookkeeping' && !empty($object->context['mode']) && $object->context['mode'] == '_tmp') { + $ret .= $langs->trans("Draft"); } elseif ($fieldref != 'none') { $ret .= dol_htmlentities(!empty($object->$fieldref) ? $object->$fieldref : ""); } diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang index d0914238f12..24e06f1ef55 100644 --- a/htdocs/langs/en_US/accountancy.lang +++ b/htdocs/langs/en_US/accountancy.lang @@ -513,3 +513,5 @@ ClickToShowAlreadyExportedLines=Click to show already exported lines NAccounts=%s accounts ACCOUNTING_USE_TREASURY_Desc=This is the mode for treasury accountancy. We are using the payments only and their date for doing the accountancy. ACCOUNTING_USE_NON_TREASURY_Desc=This is the mode for real accountancy. We are using both the invoices and payments for doing the accountancy. +PieceDesc=The reference of the source document that generates this bank transaction (Invoice Ref, Expense report ref, ...) +BankTransactionRef=A reference for the bank transaction (Optional, an automatic ID is already generated) diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index 158f82dbc7b..ee4928c4a8a 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -1205,7 +1205,7 @@ td.wordbreak img, td.wordbreakimp img { cursor: move; } .cursornotallowed { - cursor: not-allowed; + cursor: not-allowed !important; } .cursorwait { cursor: wait; diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index bdb737f061f..aec153b2dcf 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -1371,7 +1371,7 @@ td.wordbreak img, td.wordbreakimp img { cursor: move; } .cursornotallowed { - cursor: not-allowed; + cursor: not-allowed !important; } .cursorwait { cursor: wait;