change in model optical.equipment to 'optical_equipment.equipment'
This commit is contained in:
parent
a5bbf72fa2
commit
fa2f1d9717
@ -5,7 +5,7 @@ from trytond.exceptions import UserError
|
|||||||
|
|
||||||
class OpticalEquipment(ModelSQL, ModelView):
|
class OpticalEquipment(ModelSQL, ModelView):
|
||||||
'Optical Equipment'
|
'Optical Equipment'
|
||||||
__name__ = "optical.equipment"
|
__name__ = "optical_equipment.equipment"
|
||||||
|
|
||||||
company = fields.Many2One('company.company', "Company")
|
company = fields.Many2One('company.company', "Company")
|
||||||
location = fields.Many2One('stock.location', "Location")
|
location = fields.Many2One('stock.location', "Location")
|
||||||
@ -30,7 +30,7 @@ class OpticalEquipment(ModelSQL, ModelView):
|
|||||||
serial = fields.Char("Serial", size=None)
|
serial = fields.Char("Serial", size=None)
|
||||||
health_register = fields.Char("Health Register", size=None)
|
health_register = fields.Char("Health Register", size=None)
|
||||||
|
|
||||||
subscription_history = fields.Many2Many('sale.subscription-optical.equipment', 'equipment', 'subscription', "Subscriptions")
|
subscription_history = fields.Many2Many('sale.subscription-optical_equipment.equipment', 'equipment', 'subscription', "Subscriptions")
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def get_origin():
|
def get_origin():
|
||||||
@ -43,9 +43,8 @@ class OpticalEquipment(ModelSQL, ModelView):
|
|||||||
for record in records:
|
for record in records:
|
||||||
ids.append(record.id)
|
ids.append(record.id)
|
||||||
|
|
||||||
Subscriptions = pool.get('sale.subscription-optical.equipment')
|
Subscriptions = pool.get('sale.subscription-optical_equipment.equipment')
|
||||||
subscriptions = Subscriptions.search([("equipment", 'in', ids)])
|
subscriptions = Subscriptions.search([("equipment", 'in', ids)])
|
||||||
#raise UserError(str(ids))
|
|
||||||
subscriptions_history_id = []
|
subscriptions_history_id = []
|
||||||
DICC = {}
|
DICC = {}
|
||||||
|
|
||||||
|
@ -9,15 +9,15 @@
|
|||||||
id="menu_equipment"/>
|
id="menu_equipment"/>
|
||||||
<record model="ir.action.act_window" id="act_optical_equipment">
|
<record model="ir.action.act_window" id="act_optical_equipment">
|
||||||
<field name="name">Equipments</field>
|
<field name="name">Equipments</field>
|
||||||
<field name="res_model">optical.equipment</field>
|
<field name="res_model">optical_equipment.equipment</field>
|
||||||
</record>
|
</record>
|
||||||
<record model="ir.ui.view" id="optical_equipment_view_tree">
|
<record model="ir.ui.view" id="optical_equipment_view_tree">
|
||||||
<field name="model">optical.equipment</field>
|
<field name="model">optical_equipment.equipment</field>
|
||||||
<field name="type">tree</field>
|
<field name="type">tree</field>
|
||||||
<field name="name">optical_equipment_tree</field>
|
<field name="name">optical_equipment_tree</field>
|
||||||
</record>
|
</record>
|
||||||
<record model="ir.ui.view" id="optical_equipment_view_form">
|
<record model="ir.ui.view" id="optical_equipment_view_form">
|
||||||
<field name="model">optical.equipment</field>
|
<field name="model">optical_equipment.equipment</field>
|
||||||
<field name="type">form</field>
|
<field name="type">form</field>
|
||||||
<field name="name">optical_equipment_form</field>
|
<field name="name">optical_equipment_form</field>
|
||||||
</record>
|
</record>
|
||||||
|
@ -11,7 +11,7 @@ class Purchase(metaclass=PoolMeta):
|
|||||||
@ModelView.button
|
@ModelView.button
|
||||||
def process(cls, purchases):
|
def process(cls, purchases):
|
||||||
pool = Pool()
|
pool = Pool()
|
||||||
Equipment = pool.get('optical.equipment')
|
Equipment = pool.get('optical_equipment.equipment')
|
||||||
#raise UserError(str(type(Equipment)))
|
#raise UserError(str(type(Equipment)))
|
||||||
Line = pool.get('purchase.line')
|
Line = pool.get('purchase.line')
|
||||||
lines = []
|
lines = []
|
||||||
|
@ -4,11 +4,11 @@ from trytond.model import ModelSQL, ModelView, fields
|
|||||||
class Subscription(metaclass=PoolMeta):
|
class Subscription(metaclass=PoolMeta):
|
||||||
__name__ = 'sale.subscription'
|
__name__ = 'sale.subscription'
|
||||||
|
|
||||||
equipments = fields.Many2Many('sale.subscription-optical.equipment', 'subscription', 'equipment', "Equipments")
|
equipments = fields.Many2Many('sale.subscription-optical_equipment.equipment', 'subscription', 'equipment', "Equipments")
|
||||||
|
|
||||||
class SubscriptionEquipment(ModelSQL):
|
class SubscriptionEquipment(ModelSQL):
|
||||||
'Optical Equipment - Subscription'
|
'Optical Equipment - Subscription'
|
||||||
__name__ = 'sale.subscription-optical.equipment'
|
__name__ = 'sale.subscription-optical_equipment.equipment'
|
||||||
|
|
||||||
subscription = fields.Many2One('sale.subscription', 'Subscription', select=True)
|
subscription = fields.Many2One('sale_subscription', 'Subscription', select=True)
|
||||||
equipment = fields.Many2One('optical.equipment', 'Equipment', select=True)
|
equipment = fields.Many2One('optical_equipment.equipment', 'Equipment', select=True)
|
||||||
|
@ -11,7 +11,6 @@ depends:
|
|||||||
stock
|
stock
|
||||||
country
|
country
|
||||||
sale_subscription
|
sale_subscription
|
||||||
|
|
||||||
xml:
|
xml:
|
||||||
party.xml
|
party.xml
|
||||||
product.xml
|
product.xml
|
||||||
|
Loading…
Reference in New Issue
Block a user