odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

wip 

bzr revid: nicolas.vanhoren@openerp.com-20120914153133-dghxbx2k8k7o98bu
This commit is contained in:
niv-openerp 2012-09-14 17:31:33 +02:00
parent 4c6e93473a
commit 4cc9269e4b
2 changed files with 12 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
addons/account/account_move_reconciliation.xml
View File

@ -1,38 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<!-- Extended View of Reconciliation Entry -->
<record id="view_account_move_reconciliation_form_view" model="ir.ui.view">
<field name="name">account.move.reconciliation.form</field>
<field name="model">account.move.reconciliation</field>
<field name="type">form</field>
<field eval="2" name="priority"/>
<field name="arch" type="xml">
<form string="Journal Item" layout="manual" version="7.0">
<group>
<h3>
<a type="button" class="oe_pager_button" data-pager-action="previous">Previous</a>
<a type="button" class="oe_pager_button" data-pager-action="next">Next</a>
<field name="partner_id"/>
(<span class="oe_pager_index_extend">0</span><span class="oe_pager_separator"> / </span><span class="oe_pager_count_extend">0</span>)
</h3>
<div>
<label for="last_reconciliation_date"/>
<field name="last_reconciliation_date" widget="date"/>
<label for="latest_date"/>
<field name="latest_date"/>
</div>
<div class="oe_reconcile_row">
<a type="button" class="oe_reconcile oe_reconcile_button" name="%(action_view_account_move_line_reconcile)d">Reconcile</a>
<a type="button" class="oe_nothing_to_reconcile oe_reconcile_button" name="skip_partner">Nothing to Reconcile</a>
<field name="reconciliation_progress" widget="progressbar"/>
</div>
<div name="grp_followup" class="oe_reconcile_row">
</div>
</group>
</form>
</field>
</record>
<!-- Menu and Action -->
<record id="action_account_receivable_manual_reconcile" model="ir.actions.act_window">
@ -40,7 +8,7 @@
<field name="res_model">account.move.line</field>
<field name="view_type">form</field>
<field name="view_mode">account_reconciliation_list,form</field>
<field eval="False" name="auto_search"/>
<field eval="True" name="auto_search"/>
<field name="context" eval="{'account_type':'receivable', 'search_default_unreconciled': 1}"></field>
</record>
@ -49,7 +17,7 @@
<field name="res_model">account.move.line</field>
<field name="view_type">form</field>
<field name="view_mode">account_reconciliation_list,form</field>
<field eval="False" name="auto_search"/>
<field eval="True" name="auto_search"/>
<field name="context" eval="{'account_type':'payable', 'search_default_unreconciled': 1}"></field>
</record>

10
addons/account/static/src/js/account_move_reconciliation.js
View File

@ -15,6 +15,16 @@ openerp.account = function (instance) {
this.$el.prepend(QWeb.render("AccountReconciliation"));
return tmp;
},
do_search: function(domain, context, group_by) {
var sup = this._super;
var mod = new instance.web.Model(this.model, context, domain);
return mod.query("partner_id").group_by(["partner_id"]).pipe(function(result) {
var vals = _.chain(result).pluck("attributes").pluck("value")
.filter(function(el) {return !!el;}).value();
debugger;
return sup(new instance.web.CompoundDomain(domain, [["partner_id", "in", _.pluck(vals, 0)]]), context, group_by);
});
},
});
/*instance.web.views.add('form_clone', 'instance.account.extend_form_view');