audrius/account-reconcile
1
0
Fork 1
mirror of https://github.com/OCA/account-reconcile.git synced 2025-01-20 12:27:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

[FIX] account_advanced_reconcile: improved view readability with less larger column

Browse Source 
count of reconciliations was incorrect for partial reconciliations
(lp:c2c-financial-addons/6.1 rev 24.1.34)
This commit is contained in:
Guewen Baconnier @ Camptocamp
2012-06-26 15:42:43 +02:00
parent ba75bff78c
commit 18e3f6cdef
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
account_advanced_reconcile/base_advanced_reconciliation.py
View File

@@ -263,11 +263,11 @@ class easy_reconcile_advanced(AbstractModel):
lines_by_id = dict([(l['id'], l) for l in credit_lines + debit_lines]) lines_by_id = dict([(l['id'], l) for l in credit_lines + debit_lines])
for reconcile_group_ids in reconcile_groups: for reconcile_group_ids in reconcile_groups:
group_lines = [lines_by_id[lid] for lid in reconcile_group_ids] group_lines = [lines_by_id[lid] for lid in reconcile_group_ids]
reconciled, partial = self._reconcile_lines( reconciled, full = self._reconcile_lines(
cr, uid, rec, group_lines, allow_partial=True, context=context) cr, uid, rec, group_lines, allow_partial=True, context=context)
if reconciled and partial: if reconciled and full:
reconciled_ids += reconcile_group_ids reconciled_ids += reconcile_group_ids
elif partial: elif reconciled:
partial_reconciled_ids += reconcile_group_ids partial_reconciled_ids += reconcile_group_ids
return reconciled_ids, partial_reconciled_ids return reconciled_ids, partial_reconciled_ids

6
account_advanced_reconcile/easy_reconcile_view.xml
View File

@@ -8,9 +8,11 @@
<field name="inherit_id" ref="account_easy_reconcile.account_easy_reconcile_form"/> <field name="inherit_id" ref="account_easy_reconcile.account_easy_reconcile_form"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<page name="information" position="inside"> <page name="information" position="inside">
<separator colspan="4" string="Advanced. Partner and Ref"/> <group colspan="2" col="2">
<label string="Match multiple debit vs multiple credit entries. Allow partial reconcilation. <separator colspan="4" string="Advanced. Partner and Ref"/>
<label string="Match multiple debit vs multiple credit entries. Allow partial reconcilation.
The lines should have the partner, the credit entry ref. is matched vs the debit entry ref. or name." colspan="4"/> The lines should have the partner, the credit entry ref. is matched vs the debit entry ref. or name." colspan="4"/>
</group>
</page> </page>
</field> </field>
</record> </record>