Browse Source

[MRG] Add all the bank statement improvements that we made. This is mostly based on :

account_statement_ext -> provide profile per bank statement, remove period, choose to use balance check or not,...
  account_statement_base_completion -> provide a completion rule system to fullfill the bank statement (partner, account,...)
  account_statement_base_import -> provide a base to create your own file parser for each bank/office and link it to a profile
  account_statement_transactionid_completion and account_statement_transactionid_import to use the transaction ID recorded in th SO
  account_advanced_reconcile -> An advanced way to setup reconciliation rules on every account
  account_financial_report_webkit -> some little fixes
(lp:c2c-addons/6.1  rev 63)
6.1
Joël Grand-Guillaume 12 years ago
parent
commit
bf7315decf
  1. 2
      account_financial_report_webkit/report/common_partner_reports.py
  2. 8
      account_financial_report_webkit/report/templates/account_report_general_ledger.mako
  3. 10
      account_financial_report_webkit/report/templates/account_report_partner_balance.mako

2
account_financial_report_webkit/report/common_partner_reports.py

@ -238,7 +238,7 @@ class CommonPartnersReportHeaderWebkit(CommonReportHeaderWebkit):
if existing_partner_ids:
# We may use orm here as the performance optimization is not that big
sql = ("SELECT name|| ' ' ||CASE WHEN ref IS NOT NULL THEN '('||ref||')' ELSE '' END, id, ref, name"
" FROM res_partner WHERE id IN %s ORDER BY name, ref")
" FROM res_partner WHERE id IN %s ORDER BY LOWER(name), ref")
self.cursor.execute(sql, (tuple(set(existing_partner_ids)),))
res = self.cursor.fetchall()

8
account_financial_report_webkit/report/templates/account_report_general_ledger.mako

@ -95,10 +95,12 @@
<div class="act_as_cell" style="width: 60px;">${_('Entry')}</div>
## journal
<div class="act_as_cell" style="width: 70px;">${_('Journal')}</div>
## account code
<div class="act_as_cell" style="width: 65px;">${_('Account')}</div>
## partner
<div class="act_as_cell" style="width: 120px;">${_('Partner')}</div>
## label
<div class="act_as_cell" style="width: 265px;">${_('Label')}</div>
<div class="act_as_cell" style="width: 200px;">${_('Label')}</div>
## counterpart
<div class="act_as_cell" style="width: 100px;">${_('Counter part')}</div>
## debit
@ -133,6 +135,8 @@
<div class="act_as_cell"></div>
## journal
<div class="act_as_cell"></div>
## account code
<div class="act_as_cell"></div>
## partner
<div class="act_as_cell"></div>
## label
@ -175,6 +179,8 @@
<div class="act_as_cell">${line.get('move_name') or ''}</div>
## journal
<div class="act_as_cell">${line.get('jcode') or ''}</div>
## account code
<div class="act_as_cell">${account.code}</div>
## partner
<div class="act_as_cell overflow_ellipsis">${line.get('partner_name') or ''}</div>
## label

10
account_financial_report_webkit/report/templates/account_report_partner_balance.mako

@ -132,10 +132,10 @@
<div class="act_as_thead">
<div class="act_as_row labels">
## code
<div class="act_as_cell first_column" style="width: 20px;">${_('Code / Ref')}</div>
## account name
<div class="act_as_cell" style="width: 80px;">${_('Account / Partner Name')}</div>
## code
<div class="act_as_cell first_column" style="width: 20px;">${_('Code / Ref')}</div>
%if comparison_mode == 'no_comparison':
%if initial_balance_mode:
## initial balance
@ -188,8 +188,8 @@
total_balance += partner.get('balance', 0.0)
%>
<div class="act_as_row lines">
<div class="act_as_cell first_column">${partner_ref if partner_ref else ''}</div>
<div class="act_as_cell">${partner_name if partner_name else _('Unallocated') }</div>
<div class="act_as_cell first_column">${partner_ref if partner_ref else ''}</div>
%if comparison_mode == 'no_comparison':
%if initial_balance_mode:
<div class="act_as_cell amount">${formatLang(partner.get('init_balance', 0.0)) | amount}</div>
@ -229,10 +229,10 @@
</div>
<div class="act_as_tfoot" style="margin-top:5px;">
<div class="act_as_row labels" style="font-weight: bold; font-size: 11x;">
## code
<div class="act_as_cell first_column">${current_account.code}</div>
## account name
<div class="act_as_cell">${current_account.name}</div>
## code
<div class="act_as_cell first_column">${current_account.code}</div>
%if comparison_mode == 'no_comparison':
%if initial_balance_mode:
## opening balance

Loading…
Cancel
Save