*removed ready to repair state (not needed)
bzr revid: qdp@tinyerp.com-20081202140015-e82y7e1r2e968qmp
This commit is contained in:
qdp
parent
6dd72363ae
commit
2340370caf
|
|
@ -77,7 +77,6 @@ class mrp_repair(osv.osv):
|
|||
'state': fields.selection([
|
||||
('draft','Quotation'),
|
||||
('confirmed','Confirmed'),
|
||||
('ready','Ready to Repair'),
|
||||
('under_repair','Under Repair'),
|
||||
('2binvoiced','To be Invoiced'),
|
||||
('invoice_except','Invoice Exception'),
|
||||
|
|
@ -259,8 +258,8 @@ class mrp_repair(osv.osv):
|
|||
invoices_group = {}
|
||||
for repair in self.browse(cr, uid, ids, context=context):
|
||||
res[repair.id]=False
|
||||
if repair.state in ('draft','cancel') or repair.invoice_id:
|
||||
continue
|
||||
if repair.state in ('draft','cancel') or repair.invoice_id:
|
||||
continue
|
||||
if not (repair.partner_id.id and repair.partner_invoice_id.id):
|
||||
raise osv.except_osv('No partner !','You have to select a partner in the repair form ! ')
|
||||
comment=repair.quotation_notes
|
||||
|
|
@ -337,10 +336,6 @@ class mrp_repair(osv.osv):
|
|||
self.write(cr, uid, ids, {'state':'invoice_except'})
|
||||
return True
|
||||
|
||||
def action_repair_ready(self, cr, uid, ids, context=None):
|
||||
self.write(cr, uid, ids, {'state':'ready'})
|
||||
return True
|
||||
|
||||
def action_repair_start(self, cr, uid, ids, context=None):
|
||||
self.write(cr, uid, ids, {'state':'under_repair'})
|
||||
return True
|
||||
|
|
@ -349,7 +344,7 @@ class mrp_repair(osv.osv):
|
|||
for order in self.browse(cr, uid, ids):
|
||||
val = {}
|
||||
if (order.invoice_method=='b4repair'):
|
||||
val['state'] = 'ready'
|
||||
val['state'] = 'under_repair'
|
||||
else:
|
||||
#val['state'] = 'done'
|
||||
pass
|
||||
|
|
@ -363,7 +358,7 @@ class mrp_repair(osv.osv):
|
|||
if (not order.invoiced and order.invoice_method=='after_repair'):
|
||||
val['state'] = '2binvoiced'
|
||||
elif (not order.invoiced and order.invoice_method=='b4repair'):
|
||||
val['state'] = 'ready'
|
||||
val['state'] = 'confirmed'
|
||||
else:
|
||||
#val['state'] = 'done'
|
||||
pass
|
||||
|
|
|
|||
|
|
@ -83,8 +83,7 @@
|
|||
<group col="13" colspan="4">
|
||||
<field name="state" select="2"/>
|
||||
<button name="repair_confirm" states="draft" string="Confirm Repair"/>
|
||||
<button name="repair_ready" states="confirmed" string="Ready to Repair"/>
|
||||
<button name="action_repair_start" states="ready" string="Start Repair"/>
|
||||
<button name="action_repair_start" states="confirmed" string="Start Repair"/>
|
||||
<button name="action_repair_end" states="under_repair" string="End Repair"/>
|
||||
<button name="invoice_recreate" states="invoice_except" string="Recreate Invoice"/>
|
||||
<button name="invoice_corrected" states="invoice_except" string="Invoice Corrected"/>
|
||||
|
|
@ -92,7 +91,7 @@
|
|||
<button name="%(action_cancel_repair)d" states="invoice_except" string="Cancel Repair" type="action"/>
|
||||
<button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
|
||||
<button name="cancel" states="draft" string="Cancel Repair"/>
|
||||
<button name="%(action_cancel_repair)d" states="confirmed,2binvoiced,ready,under_repair" string="Cancel Repair" type="action"/>
|
||||
<button name="%(action_cancel_repair)d" states="confirmed,2binvoiced,under_repair" string="Cancel Repair" type="action"/>
|
||||
</group>
|
||||
</page>
|
||||
<page string="Invoicing">
|
||||
|
|
|
|||
|
|
@ -51,15 +51,6 @@
|
|||
<field name="kind">function</field>
|
||||
<field name="action">action_repair_start()</field>
|
||||
</record>
|
||||
<record id="act_repair_ready" model="workflow.activity">
|
||||
<field name="wkf_id" ref="wkf_repair"/>
|
||||
<field name="name">Ready Repair</field>
|
||||
<field name="kind">function</field>
|
||||
<field name="action">action_repair_ready()</field>
|
||||
</record>
|
||||
|
||||
|
||||
|
||||
<record id="act_invoice_end" model="workflow.activity">
|
||||
<field name="wkf_id" ref="wkf_repair"/>
|
||||
<field name="name">invoice_end</field>
|
||||
|
|
@ -87,8 +78,6 @@
|
|||
<field name="action">action_invoice_cancel()</field>
|
||||
</record> -->
|
||||
|
||||
|
||||
|
||||
<record id="act_cancel" model="workflow.activity">
|
||||
<field name="wkf_id" ref="wkf_repair"/>
|
||||
<field name="name">cancel</field>
|
||||
|
|
@ -103,14 +92,8 @@
|
|||
<field name="kind">stopall</field>
|
||||
<field name="action">action_cancel()</field>
|
||||
</record>
|
||||
<record id="act_cancel3" model="workflow.activity">
|
||||
<field name="wkf_id" ref="wkf_repair"/>
|
||||
<field name="name">cancel3</field>
|
||||
<field name="flow_stop">True</field>
|
||||
<field name="kind">stopall</field>
|
||||
<field name="action">action_cancel()</field>
|
||||
</record>
|
||||
|
||||
|
||||
|
||||
<!-- Transistion -->
|
||||
|
||||
|
||||
|
|
@ -148,12 +131,13 @@
|
|||
<field name="act_from" ref="act_wait_invoice"/>
|
||||
<field name="act_to" ref="act_invoice_end"/>
|
||||
<field name="signal">action_invoice_create</field>
|
||||
</record>
|
||||
</record>
|
||||
|
||||
<record id="trans_invoice_start_repair" model="workflow.transition">
|
||||
<field name="act_from" ref="act_invoice_end"/>
|
||||
<field name="act_to" ref="act_repair_ready"/>
|
||||
<field name="act_to" ref="act_repair_start"/>
|
||||
<field name="condition">invoice_method=='b4repair'</field>
|
||||
</record>
|
||||
</record>
|
||||
|
||||
<record id="trans_wait_invoice_cancel2" model="workflow.transition">
|
||||
<field name="act_from" ref="act_wait_invoice"/>
|
||||
|
|
@ -161,55 +145,36 @@
|
|||
<field name="signal">cancel</field>
|
||||
</record>
|
||||
|
||||
|
||||
|
||||
<record id="trans_invoice_end_done" model="workflow.transition">
|
||||
<field name="act_from" ref="act_invoice_end"/>
|
||||
<field name="act_to" ref="act_done"/>
|
||||
<field name="condition">invoice_method=='after_repair'</field>
|
||||
</record>
|
||||
|
||||
|
||||
|
||||
|
||||
<record id="trans_wait_repair_ready" model="workflow.transition">
|
||||
<field name="act_from" ref="act_wait_repair"/>
|
||||
<field name="act_to" ref="act_repair_ready"/>
|
||||
<field name="act_to" ref="act_repair_start"/>
|
||||
<field name="signal">repair_ready</field>
|
||||
</record>
|
||||
<record id="trans_ready_repair_start" model="workflow.transition">
|
||||
<field name="act_from" ref="act_repair_ready"/>
|
||||
<field name="act_to" ref="act_repair_start"/>
|
||||
<field name="signal">action_repair_start</field>
|
||||
</record>
|
||||
|
||||
<record id="trans_repair_repair_end" model="workflow.transition">
|
||||
<field name="act_from" ref="act_repair_start"/>
|
||||
<field name="act_to" ref="act_repair_end"/>
|
||||
<field name="signal">action_repair_end</field>
|
||||
</record>
|
||||
|
||||
<record id="trans_reapir_end_done" model="workflow.transition">
|
||||
<field name="act_from" ref="act_repair_end"/>
|
||||
<field name="act_to" ref="act_done"/>
|
||||
<field name="condition">invoice_method=='none' or invoice_method=='b4repair'</field>
|
||||
</record>
|
||||
|
||||
<record id="trans_reapir_end_invoice" model="workflow.transition">
|
||||
<field name="act_from" ref="act_repair_end"/>
|
||||
<field name="act_to" ref="act_wait_invoice"/>
|
||||
<field name="condition">invoice_method=='after_repair'</field>
|
||||
</record>
|
||||
|
||||
<record id="trans_wait_repair_cancel3" model="workflow.transition">
|
||||
<field name="act_from" ref="act_wait_repair"/>
|
||||
<field name="act_to" ref="act_cancel3"/>
|
||||
<field name="signal">cancel</field>
|
||||
</record>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
</data>
|
||||
</openerp>
|
||||
|
|
|
|||
Loading…
Reference in New Issue