Merge lp:~mileo/account-payment/7.0 into lp:~account-payment-team/account-payment/7.0

[Luis Felipe Miléo - http://www.kmee.com.br]

=== modified file 'account_payment_extension/account_move_line.py' (properties changed: -x to +x)
--- account_payment_extension/account_move_line.py	2012-11-01 21:49:33 +0000
+++ account_payment_extension/account_move_line.py	2013-01-02 17:55:31 +0000
@@ -170,22 +170,29 @@
                 return super(account_move_line, self).write(cr, uid, ids, vals, context, check, update_check)
         return super(account_move_line, self).write(cr, uid, ids, vals, context, check, update_check=False)
 
-    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context={}, toolbar=False, submenu=False):
-        menus = [
-            self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account_payment_extension', 'menu_action_invoice_payments'),
-            self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account_payment_extension', 'menu_action_done_payments'),
-        ]
-        menus = [m[1] for m in menus]
-        if 'active_id' in context and context['active_id'] in menus:
-            # Use standard views for account.move.line object
-            if view_type == 'search':
-                # Get a specific search view (bug in 6.0RC1, it does not give the search view defined in the action window)
-                view_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account_payment_extension', 'view_payments_filter')[1]
-            result = super(osv.osv, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
-        else:
-            # Use special views for account.move.line object (for ex. tree view contains user defined fields)
-            result = super(account_move_line, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
-        return result
+
+#the search filter view system changed in v7: you can now search by any field and there is no more select in widget, so further work would be
+# required to port the following logic to v7.
+#
+# In the meantime, as the feature loss isn't that huge and as workarounds are possible we simply commented the following code out.
+
+#    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context={}, toolbar=False, submenu=False):
+#        menus = [
+#            self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account_payment_extension', 'menu_action_invoice_payments'),
+#            self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account_payment_extension', 'menu_action_done_payments'),
+#        ]
+#
+#        menus = [m[1] for m in menus]
+#        if 1==1: # 'active_id' in context and context['active_id'] in menus:
+#            # Use standard views for account.move.line object
+#            if view_type == 'search':
+#                # Get a specific search view (bug in 6.0RC1, it does not give the search view defined in the action window)
+#                view_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account_payment_extension', 'view_payments_filter')[1]
+#            result = super(osv.osv, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
+#        else:
+#            # Use special views for account.move.line object (for ex. tree view contains user defined fields)
+#            result = super(account_move_line, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
+#        return result
 
 account_move_line()
 
 
=== modified file 'account_payment_extension/payment_view.xml'
--- account_payment_extension/payment_view.xml	2012-12-28 15:15:12 +0000
+++ account_payment_extension/payment_view.xml	2013-01-02 17:55:31 +0000
@@ -153,6 +153,7 @@
     =================================================================================================
     -->
     <!--Field partner_bank_id in client invoices has a strange domain: domain="[('partner_id.ref_companies', 'in', [company_id])]"-->
+    
     <record model="ir.ui.view" id="invoice_form3">
         <field name="name">account.invoice.form3.payment_type</field>
         <field name="model">account.invoice</field>
@@ -163,15 +164,15 @@
                 <field domain="[('partner_id', '=', partner_id)]" name="partner_bank_id" on_change="onchange_partner_bank(partner_bank_id)"/>
             </field>
         </field>
-    </record>
-
+    </record>   
+    
     <record model="ir.ui.view" id="invoice_form4">
         <field name="name">account.invoice.form4.payment_type</field>
         <field name="model">account.invoice</field>
         <field name="type">form</field>
         <field name="inherit_id" ref="account.invoice_form"/>
         <field name="arch" type="xml">
-            <field name="address_invoice_id" position="after">
+            <field name="fiscal_position" position="after">
                 <field domain="[('company_id', '=', company_id)]" name="payment_type" on_change="onchange_payment_type(payment_type, partner_id)" />
             </field>
         </field>
@@ -183,15 +184,14 @@
         <field name="type">form</field>
         <field name="inherit_id" ref="account.invoice_supplier_form"/>
         <field name="arch" type="xml">
-            <field name="address_invoice_id" position="after">
+            <field name="fiscal_position" position="after">
                 <field domain="[('company_id', '=', company_id)]" name="payment_type" on_change="onchange_payment_type(payment_type, partner_id)" />
             </field>
         </field>
     </record>
-
+   
 
     <!--************ account.move.line extension to show additional fields **********-->
-    <!--
     <record model="ir.ui.view" id="payments_move_line_tree">
         <field name="name">account.payments.move.line.tree</field>
         <field name="model">account.move.line</field>
@@ -214,17 +214,16 @@
         <field name="type">form</field>
         <field name="inherit_id" ref="account.view_move_line_form"/>
         <field name="arch" type="xml">
-            <separator string="Internal Note" position="before">
-                <group col="2" colspan="2">
-                    <separator colspan="2" string="Payment"/>
+            <field name="narration" position="before">
+        <!--        <group col="2" colspan="2">
+                    <separator colspan="2" string="Payment"/> -->
                     <field name="payment_type" select="1" widget="selection"/>
                     <field name="partner_bank_id" domain="[('partner_id','=',partner_id)]"/>
                     <field name="received_check"/>
-                </group>
-            </separator>
+        <!--        </group> -->
+            </field>
         </field>
     </record>
-	-->
 
     <!--
     ========================================================================================================
@@ -346,7 +345,7 @@
     =========================================================================================
      PAYMENTS
     =========================================================================================
-    
+    -->
     <record id="view_payments_tree" model="ir.ui.view">
         <field name="name">Payments</field>
         <field name="model">account.move.line</field>
@@ -380,35 +379,33 @@
         <field name="priority" eval="20"/>
         <field name="arch" type="xml">
             <search string="Search Invoice Payments">
-               <group col='10' colspan='4'>
                     <filter icon="terp-sale" string="Receive" domain="[('account_id.type','=','receivable')]" help="Receivable payments"/>
                     <filter icon="terp-purchase" string="Pay" domain="[('account_id.type','=','payable')]" help="Payable payments"/>
-                    <separator orientation="vertical"/>
+                    <separator/>
                     <filter icon="terp-dolar_ok!" string="Unreconciled" domain="[('reconcile_id','=',False)]" help="Unreconciled payments"/>
                     <field name="account_id"/>
                     <field name="partner_id"/>
                     <field name="invoice"/>
                     <field name="date_maturity"/>
-                    <newline/>
+                    <separator/>
                     <field name="amount_to_pay"/>
                     <field name="payment_type" widget="selection"/>
                     <field name="partner_bank_id"/>
                     <field name="received_check"/>
-                </group>
-                <newline/>
-                <group expand="0" string="Group By...">
-                    <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
-                    <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
-                    <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id'}"/>
-                    <filter string="Effective date" icon="terp-go-month" domain="[]" context="{'group_by':'date_maturity'}"/>
-                </group>
-           </search>
+                    <group expand="0" string="Group By...">
+                        <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <separator/>
+                        <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id'}"/>
+                        <filter string="Effective date" icon="terp-go-month" domain="[]" context="{'group_by':'date_maturity'}"/>
+                    </group>
+            </search>
         </field>
     </record>
-	-->
-    <!-- Invoice Payments
+
+    <!-- Invoice Payments -->
+
     <record model="ir.actions.act_window" id="action_invoice_payments">
         <field name="name">Invoice payments</field>
         <field name="res_model">account.move.line</field>
@@ -417,9 +414,10 @@
         <field name="search_view_id" ref="view_payments_filter"/>
         <field name="domain">[('account_id.type','in',['receivable','payable']),('invoice','&lt;&gt;',False)]</field>
     </record>
+
     <menuitem name="Invoice payments" parent="account_payment.menu_main_payment" action="action_invoice_payments" id="menu_action_invoice_payments" sequence="4"/>
-	-->
-    <!-- Done Payments
+-
+    <!-- Done Payments -->
     <record model="ir.actions.act_window" id="action_done_payments">
         <field name="name">Done payments</field>
         <field name="res_model">account.move.line</field>
@@ -428,7 +426,8 @@
         <field name="search_view_id" ref="view_payments_filter"/>
         <field name="domain">[('account_id.type','in',['receivable','payable']),('invoice','=',False)]</field>
     </record>
+
     <menuitem name="Done payments" parent="account_payment.menu_main_payment" action="action_done_payments" id="menu_action_done_payments" sequence="5"/>
-	-->
+
 </data>
 </openerp>
 \ No newline at end of file