account-payment-team team mailing list archive

[Oihane Crucelaegui <oihanecruce@xxxxxxxxx>]

Oihane Crucelaegui has proposed merging lp:~oihanecruce/account-payment/7.0 into lp:account-payment/7.0.

Requested reviews:
  Account Payment (account-payment-team)

For more details, see:
https://code.launchpad.net/~oihanecruce/account-payment/7.0/+merge/157996

nan_account_bank_statement view error solved just added /sheet/ in required lines

BUG 1157608 FIXED - account_payment_extension/wizard/account_payment_order.py line 105 changed 'if amount:' to 'if amount > 0.0:'
-- 
https://code.launchpad.net/~oihanecruce/account-payment/7.0/+merge/157996
Your team Account Payment is requested to review the proposed merge of lp:~oihanecruce/account-payment/7.0 into lp:account-payment/7.0.

=== modified file 'account_payment_extension/wizard/account_payment_order.py'
--- account_payment_extension/wizard/account_payment_order.py	2012-11-01 21:49:33 +0000
+++ account_payment_extension/wizard/account_payment_order.py	2013-04-10 06:46:22 +0000
@@ -102,7 +102,7 @@
         line_ids = line_obj.search(cr, uid, domain, order='date_maturity', context=context)
 
         selected_ids = []
-        if amount:
+        if amount > 0.0:
             if payment.mode and payment.mode.require_bank_account:
                 line2bank = pool.get('account.move.line').line2bank(cr, uid, line_ids, payment.mode.id, context)
             else:

=== modified file 'nan_account_bank_statement/account_statement_view.xml'
--- nan_account_bank_statement/account_statement_view.xml	2012-01-20 10:41:21 +0000
+++ nan_account_bank_statement/account_statement_view.xml	2013-04-10 06:46:22 +0000
@@ -31,7 +31,7 @@
 		<field name="type">form</field>
 		<field name="inherit_id" ref="account.view_bank_statement_form"/>
 		<field name="arch" type="xml">
-			<xpath expr="/form/notebook/page[@name='statement_line_ids']/field[@name='line_ids']/form/field[@name='sequence']" position="after">
+			<xpath expr="/form/sheet/notebook/page[@name='statement_line_ids']/field[@name='line_ids']/form/group/field[@name='sequence']" position="after">
 				<field name="search_by"/>
 				<group colspan="2" col="2">
 					<button name="button_reconcile_search"  string="_Search" type="object" icon="gtk-find" attrs="{'invisible': [('voucher_id','!=',False)]}"/>
@@ -46,7 +46,7 @@
 		<field name="type">form</field>
 		<field name="inherit_id" ref="account.view_bank_statement_form"/>
 		<field name="arch" type="xml">
-			<xpath expr="/form/notebook/page[@name='statement_line_ids']/field[@name='line_ids']/tree/field[@name='amount']" position="after">
+			<xpath expr="/form/sheet/notebook/page[@name='statement_line_ids']/field[@name='line_ids']/tree/field[@name='amount']" position="after">
 				<button name="%(action_statement_line_split_wizard)d" string="Split" type="action" icon="terp-stock_effects-object-colorize"/>
 			</xpath>
 		</field>