Techsystech
/
account-financial-reporting
mirror of https://github.com/OCA/account-financial-reporting.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MRG] from main branch 

(lp:c2c-addons/6.1  rev 80.1.8)
Guewen Baconnier @ Camptocamp 2012-09-11 15:23:34 +02:00
parent 099473ffc6
commit daa67f1df7
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
account_financial_report_webkit/report/common_partner_reports.py
View File

@ -34,7 +34,9 @@ class CommonPartnersReportHeaderWebkit(CommonReportHeaderWebkit):
####################Account move line retrieval helper ########################## ####################Account move line retrieval helper ##########################
def get_partners_move_lines_ids(self, account_id, main_filter, start, stop, target_move, def get_partners_move_lines_ids(self, account_id, main_filter, start, stop, target_move,
exclude_reconcile=False, partner_filter=False): exclude_reconcile=False,
partner_filter=False,
opening_mode='exclude_opening'):
filter_from = False filter_from = False
if main_filter in ('filter_period', 'filter_no'): if main_filter in ('filter_period', 'filter_no'):
filter_from = 'period' filter_from = 'period'
@ -46,6 +48,7 @@ class CommonPartnersReportHeaderWebkit(CommonReportHeaderWebkit):
start, start,
stop, stop,
target_move, target_move,
opening_mode=opening_mode,
exclude_reconcile=exclude_reconcile, exclude_reconcile=exclude_reconcile,
partner_filter=partner_filter) partner_filter=partner_filter)

6
account_financial_report_webkit/report/open_invoices.py
View File

@ -201,15 +201,15 @@ class PartnersOpenInvoicesWebkit(report_sxw.rml_parse, CommonPartnersReportHeade
for account_id in accounts_ids: for account_id in accounts_ids:
initial_move_lines_ids_per_partner = initial_move_lines_per_account.get(account_id, {}) initial_move_lines_ids_per_partner = initial_move_lines_per_account.get(account_id, {})
# We get the move line ids of the account depending of the # We get the move line ids of the account
# way the initial balance was created we include or not opening entries
move_line_ids_per_partner = self.get_partners_move_lines_ids(account_id, move_line_ids_per_partner = self.get_partners_move_lines_ids(account_id,
main_filter, main_filter,
start, start,
stop, stop,
target_move, target_move,
exclude_reconcile=True, exclude_reconcile=True,
partner_filter=partner_filter) partner_filter=partner_filter,
opening_mode='exclude_opening')
if not initial_move_lines_ids_per_partner and not move_line_ids_per_partner: if not initial_move_lines_ids_per_partner and not move_line_ids_per_partner:
continue continue

2
account_financial_report_webkit/report/partner_balance.py
View File

@ -71,7 +71,7 @@ class PartnerBalanceWebkit(report_sxw.rml_parse, CommonPartnerBalanceReportHeade
OpenERP in the opening period. OpenERP in the opening period.
OpenERP allows to reconcile move lines between different partners, OpenERP allows to reconcile move lines between different partners,
so the generated entries in the opening period are wrong. so the generated entries in the opening period are unreliable.
""" """
return 'initial_balance' return 'initial_balance'

5
account_financial_report_webkit/report/partners_ledger.py
View File

@ -72,7 +72,7 @@ class PartnersLedgerWebkit(report_sxw.rml_parse, CommonPartnersReportHeaderWebki
OpenERP in the opening period. OpenERP in the opening period.
OpenERP allows to reconcile move lines between different partners, OpenERP allows to reconcile move lines between different partners,
so the generated entries in the opening period are wrong. so the generated entries in the opening period are unreliable.
""" """
return 'initial_balance' return 'initial_balance'
@ -183,7 +183,8 @@ class PartnersLedgerWebkit(report_sxw.rml_parse, CommonPartnersReportHeaderWebki
stop, stop,
target_move, target_move,
exclude_reconcile=False, exclude_reconcile=False,
partner_filter=partner_filter) partner_filter=partner_filter,
opening_mode='exclude_opening')
if not move_line_ids: if not move_line_ids:
continue continue
for partner_id in move_line_ids: for partner_id in move_line_ids: