Merge lp:~therp-nl/ocb-addons/6.1_lp1172293 into lp:ocb-addons/6.1

[Holger Brunn (Therp)]

[Stefan Rijnhart (Opener) (stefan-opener)]

Is this the whole fix or do you still need to set the all_fiscalyear value in the context of the view?

review: Needs Fixing

[Holger Brunn (Therp) (hbrunn)]

Yes, we need to fix this in the payment order's form too. But this button gets replaced by account_banking, so I'll propose a fix for this one too

review: Needs Resubmitting

[Stefan Rijnhart (Opener) (stefan-opener)]

Thanks for the change!

review: Approve

=== modified file 'account_payment/account_move_line.py'
--- account_payment/account_move_line.py	2011-07-01 23:41:24 +0000
+++ account_payment/account_move_line.py	2013-04-25 08:11:26 +0000
@@ -51,7 +51,7 @@
         if not args:
             return []
         line_obj = self.pool.get('account.move.line')
-        query = line_obj._query_get(cr, uid, context={})
+        query = line_obj._query_get(cr, uid, context=context)
         where = ' and '.join(map(lambda x: '''(SELECT
         CASE WHEN l.amount_currency < 0
             THEN - l.amount_currency
@@ -117,4 +117,4 @@
 
 account_move_line()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'account_payment/account_payment_view.xml'
--- account_payment/account_payment_view.xml	2012-01-31 13:36:57 +0000
+++ account_payment/account_payment_view.xml	2013-04-25 08:11:26 +0000
@@ -107,7 +107,7 @@
                       <field name="user_id"/>
                       <field name="date_prefered"/>
                       <field name="date_scheduled" select="1" attrs="{'readonly':[('date_prefered','!=','fixed')]}" />
-                      <button colspan="2" name="%(action_create_payment_order)d" string="Select Invoices to Pay" type="action" attrs="{'invisible':[('state','=','done')]}" icon="gtk-find"/>
+                      <button colspan="2" name="%(action_create_payment_order)d" string="Select Invoices to Pay" type="action" attrs="{'invisible':[('state','=','done')]}" context="{'all_fiscalyear': True}" icon="gtk-find"/>
                       <field name="company_id" widget='selection' groups="base.group_multi_company"/>
                     </group>
                     <field name="line_ids" colspan="4" widget="one2many_list" nolabel="1" context="{'order_id': active_id or False}" >