Fix: Bugs en produccion
This commit is contained in:
parent
b6e3ff5bc1
commit
111e19a33d
@ -490,7 +490,8 @@ class MaintenanceServiceLine(Workflow, ModelSQL, ModelView):
|
|||||||
'invisible': (Eval('lines_calibration', [0])) | (
|
'invisible': (Eval('lines_calibration', [0])) | (
|
||||||
Eval('state').in_(['finished'])),
|
Eval('state').in_(['finished'])),
|
||||||
'depends': ['state'], },
|
'depends': ['state'], },
|
||||||
'finished': {},
|
'finished': {'invisible': (Eval('state').in_(['finished'])) |
|
||||||
|
((Eval('maintenance_type') == 'corrective') & (Eval('maintenance_lines') == ()))},
|
||||||
})
|
})
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
|
@ -112,7 +112,6 @@
|
|||||||
<record model="ir.ui.view" id= "maintenance_equipment_view_form">
|
<record model="ir.ui.view" id= "maintenance_equipment_view_form">
|
||||||
<field name="model">optical_equipment.maintenance-optical_equipment.equipment</field>
|
<field name="model">optical_equipment.maintenance-optical_equipment.equipment</field>
|
||||||
<field name="type">form</field>
|
<field name="type">form</field>
|
||||||
<!-- <field name="inherit" ref="maintenance_view_form"/> -->
|
|
||||||
<field name="name">maintenance_equipment_form</field>
|
<field name="name">maintenance_equipment_form</field>
|
||||||
</record>
|
</record>
|
||||||
<record model="ir.ui.view" id="maintenance_activity_view_form">
|
<record model="ir.ui.view" id="maintenance_activity_view_form">
|
||||||
|
27
sale.py
27
sale.py
@ -12,6 +12,7 @@ from trytond.wizard import (
|
|||||||
Button, StateAction, StateView, Wizard)
|
Button, StateAction, StateView, Wizard)
|
||||||
from trytond.i18n import gettext
|
from trytond.i18n import gettext
|
||||||
from trytond.modules.sale.exceptions import PartyLocationError
|
from trytond.modules.sale.exceptions import PartyLocationError
|
||||||
|
from datetime import datetime
|
||||||
|
|
||||||
|
|
||||||
class Sale(metaclass=PoolMeta):
|
class Sale(metaclass=PoolMeta):
|
||||||
@ -85,6 +86,14 @@ class Sale(metaclass=PoolMeta):
|
|||||||
('processing', 'draft')
|
('processing', 'draft')
|
||||||
))
|
))
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def default_agended(self):
|
||||||
|
return False
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def default_sale_date(cls):
|
||||||
|
return datetime.today().date()
|
||||||
|
|
||||||
@fields.depends('lines', 'sale_type', 'agended')
|
@fields.depends('lines', 'sale_type', 'agended')
|
||||||
def on_chage_sale_type(self):
|
def on_chage_sale_type(self):
|
||||||
self.lines = []
|
self.lines = []
|
||||||
@ -93,9 +102,6 @@ class Sale(metaclass=PoolMeta):
|
|||||||
elif self.sale_type == "maintenance":
|
elif self.sale_type == "maintenance":
|
||||||
self.invoice_method = 'order'
|
self.invoice_method = 'order'
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def default_agended(self):
|
|
||||||
return False
|
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def _get_origin_contract(cls):
|
def _get_origin_contract(cls):
|
||||||
@ -143,19 +149,8 @@ class Sale(metaclass=PoolMeta):
|
|||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def copy(cls, sales, default=None):
|
def copy(cls, sales, default=None):
|
||||||
if default is None:
|
default, = super(Sale, cls).copy(sales, default=default)
|
||||||
default = {}
|
default.setdefault('sale_date')
|
||||||
else:
|
|
||||||
default = default.copy()
|
|
||||||
|
|
||||||
default.setdefault('number', None)
|
|
||||||
default.setdefault('invoice_state', 'none')
|
|
||||||
default.setdefault('invoices_ignored', None)
|
|
||||||
default.setdefault('moves', None)
|
|
||||||
default.setdefault('shipment_state', 'none')
|
|
||||||
default.setdefault('quoted_by')
|
|
||||||
default.setdefault('confirmed_by')
|
|
||||||
|
|
||||||
return super(Sale, cls).copy(sales, default=default)
|
return super(Sale, cls).copy(sales, default=default)
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
|
Loading…
Reference in New Issue
Block a user