Yaltik/flectra
2
0
Fork 0
Code Pull Requests Releases Activity

Merge branch 'master-multi-branch-hansa' into 'master'

Browse Source 
[FIX]:Expected singleton, Multiple partners created while creation of a company,…

See merge request flectra-hq/flectra!150
This commit is contained in:
Parthiv Patel 2018-10-18 12:04:51 +00:00
commit 89eea9a9d5
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
addons/base_branch_company/models/res_branch.py
View File

@ -21,7 +21,7 @@ class Company(models.Model):
_name = "res.company" _name = "res.company"
_inherit = ["res.company"] _inherit = ["res.company"]
branch_id = fields.Many2one('res.branch', 'Branch', ondelete="restrict") branch_id = fields.Many2one('res.branch', 'Branch', ondelete="cascade")
@api.model @api.model
def create(self, vals): def create(self, vals):
@ -66,9 +66,6 @@ class ResBranch(models.Model):
@api.model @api.model
def create(self, vals): def create(self, vals):
if not vals.get('partner_id', False):
partner_id = self.env['res.partner'].create({'name': vals['name']})
vals.update({'partner_id': partner_id.id})
res = super(ResBranch, self).create(vals) res = super(ResBranch, self).create(vals)
vals.pop("name", None) vals.pop("name", None)
vals.pop("code", None) vals.pop("code", None)
@ -86,7 +83,8 @@ class ResBranch(models.Model):
vals.pop("partner_id", None) vals.pop("partner_id", None)
ctx = self.env.context.copy() ctx = self.env.context.copy()
if 'branch' not in ctx: if 'branch' not in ctx:
self.partner_id.write(vals) for record in self:
record.partner_id.write(vals)
return res return res
@ -131,8 +129,9 @@ class Users(models.Model):
@api.onchange('company_id') @api.onchange('company_id')
def _onchange_company_id(self): def _onchange_company_id(self):
self.default_branch_id = self.company_id.branch_id.id if self.company_id.branch_id:
self.branch_ids = [(4, self.company_id.branch_id.id)] self.default_branch_id = self.company_id.branch_id.id
self.branch_ids = [(4, self.company_id.branch_id.id)]
# To do : Check with all base module test cases # To do : Check with all base module test cases
# @api.multi # @api.multi