Pedro Manuel Baeza has proposed merging lp:~pedro.baeza/account-payment/6.1-account_payment_extension_improvements into lp:account-payment.
Requested reviews: Account Payment (account-payment-team) For more details, see: https://code.launchpad.net/~pedro.baeza/account-payment/6.1-account_payment_extension_improvements/+merge/151796 [FIX] account_payment_extension: comment conflictive fields_view_get in account_move_line.py. [IMP] account_payment_extension: Multi-company rule for payment type field. -- https://code.launchpad.net/~pedro.baeza/account-payment/6.1-account_payment_extension_improvements/+merge/151796 Your team Account Payment is requested to review the proposed merge of lp:~pedro.baeza/account-payment/6.1-account_payment_extension_improvements into lp:account-payment.
=== modified file 'account_payment_extension/__openerp__.py' --- account_payment_extension/__openerp__.py 2012-11-01 21:49:33 +0000 +++ account_payment_extension/__openerp__.py 2013-03-05 16:17:21 +0000 @@ -6,6 +6,8 @@ # Jordi Esteve <[email protected]> # AvanzOSC, Avanzed Open Source Consulting # Copyright (C) 2011-2012 Iker Coranti (www.avanzosc.com). All Rights Reserved +# Copyright (c) 2013 Serv. Tecnol. Avanzados (http://www.serviciosbaeza.com) All Rights Reserved. +# Pedro Manuel Baeza <[email protected]> # $Id$ # # This program is free software: you can redistribute it and/or modify @@ -25,7 +27,7 @@ { "name" : "Account Payment Extension", - "version" : "1.1", + "version" : "1.2", "author" : "Zikzakmedia SL", "category" : "Accounting & Finance", "website" : "www.zikzakmedia.com", @@ -52,6 +54,7 @@ "init_xml" : [], "demo_xml" : [], "update_xml" : [ + "security/account_payment_extension_security.xml", "security/ir.model.access.csv", "wizard/account_payment_order_view.xml", "payment_view.xml", === modified file 'account_payment_extension/account_move_line.py' --- account_payment_extension/account_move_line.py 2012-11-01 21:49:33 +0000 +++ account_payment_extension/account_move_line.py 2013-03-05 16:17:21 +0000 @@ -170,22 +170,22 @@ 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: + #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': + #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: + #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 + #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() === added file 'account_payment_extension/security/account_payment_extension_security.xml' --- account_payment_extension/security/account_payment_extension_security.xml 1970-01-01 00:00:00 +0000 +++ account_payment_extension/security/account_payment_extension_security.xml 2013-03-05 16:17:21 +0000 @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<openerp> + <data> + + <record id="account_fiscal_position_comp_rule" model="ir.rule"> + <field name="name">Payment type mapping company rule</field> + <field name="model_id" model="ir.model" ref="model_payment_type"/> + <field name="global" eval="True"/> + <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field> + </record> + + </data> +</openerp>
-- Mailing list: https://launchpad.net/~account-payment-team Post to : [email protected] Unsubscribe : https://launchpad.net/~account-payment-team More help : https://help.launchpad.net/ListHelp
