Browse Source

[FIX] Bug Fixed

pull/124/head
Ajmalcybrosys 6 years ago
parent
commit
555f76094f
  1. 13
      mobile_service_shop/models/mobile_service.py
  2. 4
      mobile_service_shop/security/security.xml
  3. 1
      mobile_service_shop/views/mobile_service_views.xml

13
mobile_service_shop/models/mobile_service.py

@ -61,8 +61,9 @@ class MobileServiceShop(models.Model):
journal_type = fields.Many2one('account.journal', 'Journal', invisible=True, journal_type = fields.Many2one('account.journal', 'Journal', invisible=True,
default=lambda self: self.env['account.journal'].search([('code', '=', 'SERV')])) default=lambda self: self.env['account.journal'].search([('code', '=', 'SERV')]))
account_type = fields.Many2one('account.account', 'Account', invisible=True,
default=lambda self: self.env['account.account'].search([('code', '=', 200110)])) company_id = fields.Many2one('res.company', 'Company',
default=lambda self: self.env['res.company']._company_default_get('mobile.service'))
@api.model @api.model
def _default_picking_transfer(self): def _default_picking_transfer(self):
@ -178,7 +179,11 @@ class MobileServiceShop(models.Model):
@api.model @api.model
def create(self, vals): def create(self, vals):
vals['name'] = self.env['ir.sequence'].next_by_code('mobile.service') if 'company_id' in vals:
vals['name'] = self.env['ir.sequence'].with_context(force_company=vals['company_id']).next_by_code(
'mobile.service') or _('New')
else:
vals['name'] = self.env['ir.sequence'].next_by_code('mobile.service') or _('New')
vals['service_state'] = 'draft' vals['service_state'] = 'draft'
return super(MobileServiceShop, self).create(vals) return super(MobileServiceShop, self).create(vals)
@ -187,7 +192,7 @@ class MobileServiceShop(models.Model):
for i in self: for i in self:
if i.service_state != 'draft': if i.service_state != 'draft':
raise UserError(_('You cannot delete an assigned service request')) raise UserError(_('You cannot delete an assigned service request'))
return super(MobileServiceShop, i).unlink() return super(MobileServiceShop, self).unlink()
@api.multi @api.multi
def action_invoice_create_wizard(self): def action_invoice_create_wizard(self):

4
mobile_service_shop/security/security.xml

@ -22,14 +22,14 @@
<record id="mobile_service_tech_rules" model="ir.rule"> <record id="mobile_service_tech_rules" model="ir.rule">
<field name="name">Mobile Service rule</field> <field name="name">Mobile Service rule</field>
<field name="model_id" ref="model_mobile_service" /> <field name="model_id" ref="model_mobile_service" />
<field name="domain_force">[('technicion_name','=',user.id),('service_state','!=','draft')]</field> <field name="domain_force">[('technicion_name','=',user.id),('service_state','!=','draft'), ('company_id','=',user.company_id.id)]</field>
<field name="groups" eval="[(4,ref('mobile_service_group_executer'))]"/> <field name="groups" eval="[(4,ref('mobile_service_group_executer'))]"/>
</record> </record>
<record id="mobile_service_rule_manager" model="ir.rule"> <record id="mobile_service_rule_manager" model="ir.rule">
<field name="name">Mobile Service Manager rule</field> <field name="name">Mobile Service Manager rule</field>
<field name="model_id" ref="model_mobile_service" /> <field name="model_id" ref="model_mobile_service" />
<field name="domain_force">[]</field> <field name="domain_force">[('company_id','=',user.company_id.id)]</field>
<field name="groups" eval="[(4,ref('mobile_service_group_manager'))]"/> <field name="groups" eval="[(4,ref('mobile_service_group_manager'))]"/>
</record> </record>

1
mobile_service_shop/views/mobile_service_views.xml

@ -15,6 +15,7 @@
<field name="prefix">SERV/</field> <field name="prefix">SERV/</field>
<field eval="4" name="padding" /> <field eval="4" name="padding" />
<field eval="False" name="mobile_brand_models"/> <field eval="False" name="mobile_brand_models"/>
<field name="company_id" eval="False"/>
</record> </record>
<record id="mobile_service_request_search_view" model="ir.ui.view"> <record id="mobile_service_request_search_view" model="ir.ui.view">

Loading…
Cancel
Save