diff --git a/equipment.py b/equipment.py
index acb6bd4..db0eb95 100644
--- a/equipment.py
+++ b/equipment.py
@@ -9,8 +9,8 @@ class OpticalEquipment(ModelSQL, ModelView):
company = fields.Many2One('company.company', "Company")
location = fields.Many2One('stock.location', "Location")
- party = fields.Many2One('party.party', "Party")
- party_address = fields.Many2One('party.address', "Party Address")
+ propietary = fields.Many2One('party.party', "Propietary")
+ propietary_address = fields.Many2One('party.address', "Propietary Address", required=True)
product = fields.Many2One('product.product', "Product")
refurbish = fields.Boolean("Refurbish")
equipment_type = fields.Char('type')
diff --git a/purchase.py b/purchase.py
index 54babb2..3237c65 100644
--- a/purchase.py
+++ b/purchase.py
@@ -8,6 +8,8 @@ from trytond.i18n import gettext
from .exceptions import (
InvalidNumberPurchases)
+from trytond.transaction import Transaction
+
class Purchase(metaclass=PoolMeta):
__name__ = 'purchase.purchase'
@@ -27,8 +29,6 @@ class Purchase(metaclass=PoolMeta):
if len(purchases) == 1:
pool = Pool()
Equipment = pool.get('optical_equipment.equipment')
- Line = pool.get('purchase.line')
- lines = []
purchase = purchases[0]
for line in purchase.lines:
@@ -36,7 +36,7 @@ class Purchase(metaclass=PoolMeta):
equipment = Equipment(
company=line.company,
equipment_type=line.product.equipment_type,
- party_address=line.address_equipment,
+ propietary_address=line.address_equipment,
product=line.product,
risk=line.product.risk,
use=line.product.use,
@@ -59,14 +59,24 @@ class Purchase(metaclass=PoolMeta):
class Line(metaclass=PoolMeta):
__name__ = 'purchase.line'
- address_equipment = fields.Many2One('party.address', "Direccion")
+ address_equipment = fields.Many2One('party.address', "Direccion", required=True)
serial_equipment = fields.Char("Serial", size=None, required=True)
refurbish = fields.Boolean("Refurbish")
-
+
+ def default_address_equipment():
+ pool = Pool()
+ Company = pool.get('company.company')
+ company = Transaction().context.get('company')
+ if company:
+ company = Company(company)
+ return company.party.addresses[0].id
+
+ """
@classmethod
def view_attributes(cls):
return super(Line, cls).view_attributes() + [
('//page[@id="equipment"]', 'states', {
- 'invisible': ~Eval('line.product.equipment'),
+ 'invisible': Eval('product.equipment'),
})]
+ """
diff --git a/view/optical_equipment_form.xml b/view/optical_equipment_form.xml
index bd39686..39daa60 100644
--- a/view/optical_equipment_form.xml
+++ b/view/optical_equipment_form.xml
@@ -6,10 +6,10 @@
-
-
-
-
+
+
+
+
diff --git a/view/optical_equipment_tree.xml b/view/optical_equipment_tree.xml
index 90465df..46928a0 100644
--- a/view/optical_equipment_tree.xml
+++ b/view/optical_equipment_tree.xml
@@ -4,8 +4,8 @@
-
-
+
+
diff --git a/view/purchase_line_form.xml b/view/purchase_line_form.xml
index 601b56a..8f8c382 100644
--- a/view/purchase_line_form.xml
+++ b/view/purchase_line_form.xml
@@ -4,8 +4,12 @@
+
+
+
+