openerp-dev-web team mailing list archive

["Somesh Khare\(OpenERP\)" <skh@xxxxxxxxxxx>]

Somesh Khare(OpenERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-bug-739562-skh into lp:openobject-addons.

Requested reviews:
  OpenERP Core Team (openerp)
Related bugs:
  Bug #739562 in OpenERP Addons: "payment mode - account must belong to company"
  https://bugs.launchpad.net/openobject-addons/+bug/739562

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-739562-skh/+merge/56343

Hello,

Fix : payment mode - account must belong to company

Thanks,
skh
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-739562-skh/+merge/56343
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-bug-739562-skh.

=== modified file 'account_payment/account_payment.py'
--- account_payment/account_payment.py	2011-02-28 06:09:22 +0000
+++ account_payment/account_payment.py	2011-04-05 12:44:29 +0000
@@ -33,7 +33,9 @@
             required=True,help='Bank Account for the Payment Mode'),
         'journal': fields.many2one('account.journal', 'Journal', required=True,
             domain=[('type', 'in', ('bank','cash'))], help='Bank or Cash Journal for the Payment Mode'),
-        'company_id': fields.many2one('res.company', 'Company', required=True),
+        'company_id': fields.many2one('res.company', 'Company',required=True),
+        'partner_id':fields.related('company_id','partner_id',type='many2one',relation='res.partner',string='Partner',store=True,),
+        
     }
     _defaults = {
         'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id
@@ -49,6 +51,13 @@
             JOIN payment_mode pm ON (pm.bank_id = pb.id)
             WHERE pm.id = %s """, [payment_code])
         return [x[0] for x in cr.fetchall()]
+    
+    def onchange_company_id (self,cr,uid,ids,company_id,context=None):
+        vals={}
+        if company_id:
+            partner = self.pool.get('res.company').read(cr, uid, [company_id], ['partner_id'])[0]['partner_id']
+        return {'value': {'partner_id': partner}}
+                
 
 payment_mode()
 

=== modified file 'account_payment/account_payment_view.xml'
--- account_payment/account_payment_view.xml	2011-02-24 11:45:37 +0000
+++ account_payment/account_payment_view.xml	2011-04-05 12:44:29 +0000
@@ -79,8 +79,9 @@
                 <form string="Payment Mode">
                     <field name="name" select="1"/>
                     <field name="journal" select="1"/>
-                    <field name="bank_id"/>
-                    <field name="company_id" select="1" widget='selection' groups="base.group_multi_company"/>
+                    <field name="bank_id" domain="[('partner_id','=',partner_id)]"  />
+                    <field name="company_id" select="1" widget='selection' groups="base.group_multi_company" on_change="onchange_company_id(company_id)"/>
+                    <field name="partner_id" select="1" widget='selection' invisible="1"/>
                 </form>
             </field>
         </record>