clean home
This commit is contained in:
parent
bca233fa37
commit
bd26902a9e
@ -6,7 +6,6 @@ class Configuration(ModelSingleton, ModelSQL, ModelView):
|
||||
'Equipment Configuration'
|
||||
__name__='optical_equipment.configuration'
|
||||
|
||||
|
||||
equipment_sequence = fields.Many2One('ir.sequence', "Equipment Sequence",
|
||||
domain=[('sequence_type', '=', Id('optical_equipment', 'sequence_type_equipment'))
|
||||
])
|
||||
|
@ -63,7 +63,6 @@ class Contract(Workflow, ModelSQL, ModelView):
|
||||
maintenance_services = fields.Many2Many('optical_equipment_maintenance.service-equipment.contract',
|
||||
'contract', 'maintenance_services', "Prorogues")
|
||||
equipments = fields.One2Many('optical_equipment.equipment', 'contract', "Equipments")
|
||||
#equipments = fields.Many2Many('optical_equipment.contract-optical_equipment.equipment', 'contract', 'equipment')
|
||||
price_contract = Monetary("Price Contract", digits=price_digits, currency='currency', required=True,
|
||||
states={'readonly': Eval('state') != 'draft'})
|
||||
state = fields.Selection([
|
||||
@ -138,13 +137,13 @@ class Contract(Workflow, ModelSQL, ModelView):
|
||||
pass
|
||||
|
||||
|
||||
|
||||
class ContractMaintenanceServices(ModelSQL):
|
||||
'Contract - Maintenance Services'
|
||||
__name__ = 'optical_equipment_maintenance.service-equipment.contract'
|
||||
|
||||
maintenance_services = fields.Many2One('optical_equipment_maintenance.service', "Maintenance Service", select=True)
|
||||
contract = fields.Many2One('optical_equipment.contract', "Contract")
|
||||
|
||||
|
||||
class ContractEquipment(ModelSQL):
|
||||
'Optical Equipment - Contract'
|
||||
|
41
contract.xml
41
contract.xml
@ -56,35 +56,6 @@
|
||||
<field name="domain"></field>
|
||||
<field name="act_window" ref="act_contract_form"/>
|
||||
</record>
|
||||
<!--
|
||||
<record model="ir.ui.view" id="create_contract_view_form">
|
||||
<field name="model">optical_equipment_contract.initial</field>
|
||||
<field name="type">form</field>
|
||||
<field name="name">create_subscription_form</field>
|
||||
</record>
|
||||
<record model="ir.action.wizard" id="act_create_contract">
|
||||
<field name="name">Initial Contract</field>
|
||||
<field name="wiz_name">sale.create.contract</field>
|
||||
</record>
|
||||
<record model="ir.ui.view" id="create_prorogue_view_form">
|
||||
<field name="model">optical_equipment_prorogue.next</field>
|
||||
<field name="type">form</field>
|
||||
<field name="name">create_prorogue_form</field>
|
||||
</record>
|
||||
<record model="ir.action.wizard" id="act_create_prorogue">
|
||||
<field name="name">Prorogue to Contract</field>
|
||||
<field name="wiz_name">optical_equipment.prorogue</field>
|
||||
</record>
|
||||
<record model="ir.model.button" id="run_prorrogation_button">
|
||||
<field name="name">run</field>
|
||||
<field name="model" search="[('model', '=', 'optical_equipment.contract')]"/>
|
||||
</record>
|
||||
<record model="ir.model.button" id="quotation_contract_button">
|
||||
<field name="name">quotation</field>
|
||||
<field name="string">Quotation</field>
|
||||
<field name="confirm">Are you sure you want to quote these subscription?</field>
|
||||
<field name="model" search="[('model', '=', 'optical_equipment.contract')]"/>
|
||||
</record> -->
|
||||
<record model="ir.model.button" id="contrac_running_button">
|
||||
<field name="name">running</field>
|
||||
<field name="string">Run</field>
|
||||
@ -137,18 +108,6 @@
|
||||
name="Contracts Management"
|
||||
sequence="50"
|
||||
id="menu_contracts"/>
|
||||
<!--
|
||||
<menuitem
|
||||
parent="menu_contracts"
|
||||
action="act_create_contract"
|
||||
sequence="10"
|
||||
id="menu_create_contract_initial"/>
|
||||
<menuitem
|
||||
parent="menu_contracts"
|
||||
action="act_create_prorogue"
|
||||
sequence="20"
|
||||
id="menu_create_prorogue"/>
|
||||
-->
|
||||
<menuitem
|
||||
parent="menu_contracts"
|
||||
action="act_contract_form"
|
||||
|
1
diary.py
1
diary.py
@ -11,7 +11,6 @@ class Diary(ModelSQL, ModelView):
|
||||
date_end = fields.DateTime("Date End")
|
||||
maintenance_service = fields.Many2One('optical_equipment_maintenance.service', 'Maintenance Service', required=True)
|
||||
technical = fields.Many2One('company.employee', "Technical", required=True)
|
||||
|
||||
state = fields.Selection([('draft', "Draft"),
|
||||
('agended', "Agended"),
|
||||
('in_progress', "In Progress"),
|
||||
|
@ -121,6 +121,7 @@ class OpticalEquipment(DeactivableMixin, Workflow, ModelSQL, ModelView):
|
||||
name = str(self.product.name) + '@' + str(self.serial) + '/' + str(self.code)
|
||||
|
||||
return name
|
||||
|
||||
@staticmethod
|
||||
def _get_shipment():
|
||||
'Return list of Model names for shipment Reference'
|
||||
|
@ -1,9 +1,9 @@
|
||||
# This file is part of Tryton. The COPYRIGHT file at the top level of
|
||||
# this repository contains the full copyright notices and license terms.
|
||||
|
||||
from trytond.exceptions import UserError
|
||||
from trytond.model.exceptions import ValidationError
|
||||
|
||||
|
||||
class InvalidNumberPurchases(UserError):
|
||||
pass
|
||||
|
||||
|
@ -380,8 +380,6 @@ class Maintenance(Workflow, ModelSQL, ModelView):
|
||||
|
||||
def get_create_graph(matrix, patterns):
|
||||
image = BytesIO()
|
||||
#fig_width = 16
|
||||
#fig_height = 16
|
||||
all_data = matrix
|
||||
labels = list(patterns)
|
||||
fig, ax1 = plt.subplots(nrows=1, ncols=1, figsize=(9, len(labels)+1))
|
||||
@ -425,7 +423,6 @@ class Maintenance(Workflow, ModelSQL, ModelView):
|
||||
@ModelView.button
|
||||
@Workflow.transition('finished')
|
||||
def finished(cls, maintenances):
|
||||
#raise UserError(str("Esto es una prueba"))
|
||||
for maintenance in maintenances:
|
||||
if maintenance.calibration_total == ():
|
||||
raise UserError("No puede finalizar este mantenimiento sin una calibración")
|
||||
@ -578,7 +575,6 @@ class CalibrationSample(sequence_ordered(), ModelView, ModelSQL):
|
||||
number_sample = fields.Float("Sample #", _digits)
|
||||
value_patterns = fields.Many2One('optical_equipment.product_pattern', "Value Pattern", required=True,
|
||||
ondelete='RESTRICT')
|
||||
#value_pattern = fields.Float("Value in Pattern")
|
||||
value_equipment = fields.Float("Value in Equipment", _digits, required=True,
|
||||
states={'readonly': Eval('value_patterns') == None})
|
||||
mistake = fields.Float("Mistake", _digits)
|
||||
|
@ -191,29 +191,6 @@
|
||||
<field name="type">form</field>
|
||||
<field name="name">calibration_total_form</field>
|
||||
</record>
|
||||
<!-- Vista de Calendario Inutilizada
|
||||
<record model="ir.ui.view" id="maintenance_diary_view_calendar">
|
||||
<field name="model">optical_equipment_maintenance.diary</field>
|
||||
<field name="type">calendar</field>
|
||||
<field name="name">maintenance_calendar</field>
|
||||
</record>
|
||||
<record model="ir.action.act_window" id="act_maintenance_diary_calendar">
|
||||
<field name="name">Calendar</field>
|
||||
<field name="res_model">optical_equipment_maintenance.diary</field>
|
||||
</record>
|
||||
<record model="ir.action.act_window.view"
|
||||
id="act_maintenance_calendar_view1">
|
||||
<field name="sequence" eval="10"/>
|
||||
<field name="view" ref="maintenance_diary_view_calendar"/>
|
||||
<field name="act_window" ref="act_maintenance_diary_calendar"/>
|
||||
</record>
|
||||
<record model="ir.action.act_window.view"
|
||||
id="act_maintenance_calendar_view2">
|
||||
<field name="sequence" eval="20"/>
|
||||
<field name="view" ref="optical_equipment.agended_list_view_form"/>
|
||||
<field name="act_window" ref="act_maintenance_diary_calendar"/>
|
||||
</record>
|
||||
-->
|
||||
<record model="ir.ui.view" id="assing_agended_view_form">
|
||||
<field name="model">optical_equipment_maintenance.agended</field>
|
||||
<field name="type">form</field>
|
||||
@ -283,12 +260,6 @@
|
||||
<field name="model">optical_equipment.maintenance,-1</field>
|
||||
<field name="action" ref="report_maintenance_service"/>
|
||||
</record>
|
||||
<!--
|
||||
<menuitem parent="menu_diary"
|
||||
action="act_maintenance_diary_calendar"
|
||||
sequence="10"
|
||||
id="menu_agenda_form"/>
|
||||
-->
|
||||
<menuitem parent="menu_equipment"
|
||||
action="act_maintenance_service_form"
|
||||
sequence="20"
|
||||
|
@ -1,11 +0,0 @@
|
||||
<?xml version="1.0"?>
|
||||
<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
|
||||
this repository contains the full copyright notices and license terms. -->
|
||||
<form>
|
||||
<label name="product"/>
|
||||
<field name="product"/>
|
||||
<label name="maintenance"/>
|
||||
<field name="maintenance"/>
|
||||
<label name="maintenance_activity"/>
|
||||
<field name="maintenance_activity"/>
|
||||
</form>
|
@ -1,8 +1,6 @@
|
||||
<?xml version="1.0"?>
|
||||
|
||||
<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
|
||||
this repository contains the full copyright notices and license terms. -->
|
||||
|
||||
<tryton>
|
||||
<data grouped="1">
|
||||
<record model="ir.message" id="msg_invalid_number_purchases">
|
||||
|
14
move.py
14
move.py
@ -19,7 +19,6 @@ class Move(metaclass=PoolMeta):
|
||||
states={'invisible': If(~Eval('product_equipment'), True),
|
||||
'readonly': (Eval('state').in_(['cancelled', 'done'])),},
|
||||
depends=['product_equipment'])
|
||||
|
||||
equipment_serial = fields.Function(fields.Char('Serial',
|
||||
states={'readonly': True,
|
||||
'invisible': If(~Eval('product_equipment'), True)},
|
||||
@ -48,7 +47,6 @@ class Move(metaclass=PoolMeta):
|
||||
or self.uom.category != self.product.default_uom.category):
|
||||
self.uom = self.product.default_uom
|
||||
|
||||
|
||||
@fields.depends(methods=['get_equipment_serial'])
|
||||
def on_change_equipment(self):
|
||||
if self.equipment:
|
||||
@ -58,7 +56,6 @@ class Move(metaclass=PoolMeta):
|
||||
self.equipment_serial = None
|
||||
|
||||
|
||||
|
||||
class ShipmentOut(metaclass=PoolMeta):
|
||||
"Customer Shipment"
|
||||
__name__ = 'stock.shipment.out'
|
||||
@ -99,7 +96,6 @@ class ShipmentOut(metaclass=PoolMeta):
|
||||
for move in shipment.inventory_moves:
|
||||
count = 0
|
||||
if move.equipment:
|
||||
#raise UserError(str((move.origin)))
|
||||
equipment = move.equipment
|
||||
Id = equipment.id
|
||||
equipment = Equipments.search(['id', '=',Id])[0]
|
||||
@ -187,12 +183,4 @@ class ShipmentInternal(metaclass=PoolMeta):
|
||||
|
||||
Move.do([m for s in shipments for m in s.incoming_moves])
|
||||
cls.write([s for s in shipments if not s.effective_date], {
|
||||
|
||||
'effective_date': Date.today(),
|
||||
|
||||
})
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
'effective_date': Date.today(),})
|
||||
|
5
move.xml
5
move.xml
@ -1,5 +1,6 @@
|
||||
<?xml version="1.0"?>
|
||||
<!--This file file is part of Tryton. The COPYRIGHT file at the top level of this repository contains the full copyright notices and license terms. -->
|
||||
<!--This file file is part of Tryton. The COPYRIGHT file at the top level of
|
||||
this repository contains the full copyright notices and license terms. -->
|
||||
<tryton>
|
||||
<record model="ir.ui.view" id="move_view_list_shipment">
|
||||
<field name="model">stock.move</field>
|
||||
@ -21,5 +22,5 @@
|
||||
<field name="keyword">form_print</field>
|
||||
<field name="model">stock.shipment.out,-1</field>
|
||||
<field name="action" ref="report_shipment_out_picking_list1"/>
|
||||
</record>
|
||||
</record>
|
||||
</tryton>
|
||||
|
@ -106,7 +106,6 @@ class Template(metaclass=PoolMeta):
|
||||
#These are measurements required for the equipments, are in this place
|
||||
# for manage of class 'product.template'
|
||||
|
||||
|
||||
temperature_min = fields.Float("Temp Min")
|
||||
temperature_max = fields.Float("Temp Max")
|
||||
temperature_uom = fields.Many2One('product.uom', 'Temperature UOM',
|
||||
@ -325,10 +324,12 @@ class Template(metaclass=PoolMeta):
|
||||
self.voltageAC = 0
|
||||
self.voltageDC = 0
|
||||
self.frequency = 0
|
||||
|
||||
|
||||
|
||||
class Product(metaclass=PoolMeta):
|
||||
__name__ = 'product.product'
|
||||
|
||||
|
||||
class Pattern(ModelSQL, ModelView):
|
||||
"Pattern K of equipment"
|
||||
__name__ = 'optical_equipment.product_pattern'
|
||||
|
1
sale.py
1
sale.py
@ -247,7 +247,6 @@ class SaleLine(metaclass=PoolMeta):
|
||||
move.to_location = self.to_location
|
||||
move.state = 'draft'
|
||||
move.company = self.sale.company
|
||||
#move.serial = self.equipment_serial
|
||||
|
||||
if move.on_change_with_unit_price_required():
|
||||
move.unit_price = self.unit_price
|
||||
|
Loading…
Reference in New Issue
Block a user