Nehal Panchal (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/6.0-bug-834091-nep into
lp:openobject-addons/6.0.
Requested reviews:
Raphael Collet (OpenERP) (rco-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-bug-834091-nep/+merge/76969
--
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-bug-834091-nep/+merge/76969
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/6.0-bug-834091-nep.
=== modified file 'account_payment/wizard/account_payment_create_order_view.xml'
--- account_payment/wizard/account_payment_create_order_view.xml 2011-01-14 00:11:01 +0000
+++ account_payment/wizard/account_payment_create_order_view.xml 2011-09-26 12:07:27 +0000
@@ -27,6 +27,7 @@
<field name="arch" type="xml">
<form string="Search Payment lines">
<group col="4" colspan="6">
+ <field name="entries"/>
</group>
<separator colspan="4"/>
<group col="2" colspan="4">
=== modified file 'account_payment/wizard/account_payment_order.py'
--- account_payment/wizard/account_payment_order.py 2011-01-14 00:11:01 +0000
+++ account_payment/wizard/account_payment_order.py 2011-09-26 12:07:27 +0000
@@ -29,7 +29,7 @@
Create a payment object with lines corresponding to the account move line
to pay according to the date and the mode provided by the user.
Hypothesis:
- - Small number of non-reconcilied move line, payment mode and bank account type,
+ - Small number of non-reconciled move line, payment mode and bank account type,
- Big number of partner and bank account.
If a type is given, unsuitable account Entry lines are ignored.
@@ -48,12 +48,11 @@
def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
res = super(payment_order_create, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=False)
if context and 'line_ids' in context:
- view_obj = etree.XML(res['arch'])
- child = view_obj.getchildren()[0]
- domain = '[("id", "in", '+ str(context['line_ids'])+')]'
- field = etree.Element('field', attrib={'domain': domain, 'name':'entries', 'colspan':'4', 'height':'300', 'width':'800', 'nolabel':"1"})
- child.addprevious(field)
- res['arch'] = etree.tostring(view_obj)
+ doc = etree.XML(res['arch'])
+ nodes = doc.xpath("//field[@name='entries']")
+ for node in nodes:
+ node.set('domain', '[("id", "in", '+ str(context['line_ids'])+')]')
+ res['arch'] = etree.tostring(doc)
return res
def create_payment(self, cr, uid, ids, context=None):
=== modified file 'account_payment/wizard/account_payment_populate_statement.py'
--- account_payment/wizard/account_payment_populate_statement.py 2011-07-12 08:36:54 +0000
+++ account_payment/wizard/account_payment_populate_statement.py 2011-09-26 12:07:27 +0000
@@ -79,7 +79,7 @@
if not line.move_line_id.id:
continue
context.update({'move_line_ids': [line.move_line_id.id]})
- result = voucher_obj.onchange_partner_id(cr, uid, [], partner_id=line.partner_id.id, journal_id=statement.journal_id.id, price=abs(amount), currency_id=statement.currency.id, ttype='payment', date=line.date, context=context)
+ result = voucher_obj.onchange_partner_id(cr, uid, [], partner_id=line.partner_id.id, journal_id=statement.journal_id.id, price=abs(amount), voucher_currency_id= statement.currency.id, ttype='payment', date=line.ml_maturity_date, context=context)
voucher_res = {
'type': 'payment',
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
