diff --git a/account_banking_make_deposit/report/deposit_ticket.mako b/account_banking_make_deposit/report/deposit_ticket.mako index 47e9f40cd..cf9914bac 100644 --- a/account_banking_make_deposit/report/deposit_ticket.mako +++ b/account_banking_make_deposit/report/deposit_ticket.mako @@ -1,134 +1,141 @@ -
- - - - <%page expression_filter="entity"/> - <% - def carriage_returns(text): - return text.replace('\n', '| ${_("Deposit From Account")} | -${_("Deposit To Account")} | -${_("Deposit Date")} | -${_("Journal")} | -${_("Force Period")} | -${_("Company ID")} | -
| ${deposit_ticket.deposit_from_account_id.name} | -${deposit_ticket.deposit_to_account_id.name} | -${formatLang(deposit_ticket.date, date=True)} | -${deposit_ticket.journal_id and deposit_ticket.journal_id.name} | -${deposit_ticket.period_id.name} | -${deposit_ticket.company_id and deposit_ticket.company_id.name or ''} | -
| ${_("Deposit Method")} | -${_("Deposit Bag No")} | -${_("Deposit Tracking No")} | -${_("Total Items")} | -${_("Amount")} | -${_("Memo")} | -
| ${deposit_ticket.deposit_method_id and deposit_ticket.deposit_method_id.name or ''} | -${deposit_ticket.deposit_bag_no or ''} | -${deposit_ticket.bank_tracking_no or ''} | -${formatLang(deposit_ticket.count_total)} | -${formatLang(deposit_ticket.amount)} | -${deposit_ticket.memo or ''} | -
| ${_("Prepared By")} | -${_("Verified By")} | -${_("Verified Date")} | -${_("State")} | -
| ${deposit_ticket.prepared_by_user_id and deposit_ticket.prepared_by_user_id.name or ''} | -${deposit_ticket.verified_by_user_id and deposit_ticket.verified_by_user_id.name or ''} | -${formatLang(deposit_ticket.verified_date or '',date=True)} | -${deposit_ticket.state or ''} | -
| ${_("Date")} | -${_("Name")} | -${_("Ref")} | -${_("Customer")} | -${_("Amount")} | -${_("Company ID")} | -
|---|---|---|---|---|---|
| ${formatLang(line.date, date=True)} | -${line.name} | -${line.ref or ''} | -${line.partner_id.name or ''} | -${formatLang(line.amount or '')} | -${line.company_id.name or ''} | -
| ${_("Deposit From Account")} | +${_("Deposit To Account")} | +${_("Deposit Date")} | +${_("Journal")} | +${_("Force Period")} | +${_("Company ID")} | +
| ${deposit_ticket.deposit_from_account_id.name} | +${deposit_ticket.deposit_to_account_id.name} | +${formatLang(deposit_ticket.date, date=True)} | +${deposit_ticket.journal_id and deposit_ticket.journal_id.name} | +${deposit_ticket.period_id.name} | +${deposit_ticket.company_id and deposit_ticket.company_id.name or ''} | +
| ${_("Deposit Method")} | +${_("Deposit Bag No")} | +${_("Deposit Tracking No")} | +${_("Total Items")} | +${_("Amount")} | +${_("Memo")} | +
| ${deposit_ticket.deposit_method_id and deposit_ticket.deposit_method_id.name or ''} | +${deposit_ticket.deposit_bag_no or ''} | +${deposit_ticket.bank_tracking_no or ''} | +${formatLang(deposit_ticket.count_total)} | +${formatLang(deposit_ticket.amount)} | +${deposit_ticket.memo or ''} | +
| ${_("Prepared By")} | +${_("Verified By")} | +${_("Verified Date")} | +${_("State")} | +
| ${deposit_ticket.prepared_by_user_id and deposit_ticket.prepared_by_user_id.name or ''} | +${deposit_ticket.verified_by_user_id and deposit_ticket.verified_by_user_id.name or ''} | +${formatLang(deposit_ticket.verified_date or '',date=True)} | +${deposit_ticket.state or ''} | +
| ${_("Date")} | +${_("Name")} | +${_("Ref")} | +${_("Customer")} | +${_("Amount")} | +${_("Company ID")} | +
|---|---|---|---|---|---|
| ${formatLang(line.date, date=True)} | +${line.name} | +${line.ref or ''} | +${line.partner_id.name or ''} | +${formatLang(line.amount or '')} | +${line.company_id.name or ''} | +