odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

merge 

bzr revid: fp@tinyerp.com-20081106165500-tae7w4hwt85fzuhh
This commit is contained in:
Fabien Pinckaers 2008-11-06 17:55:00 +01:00
parent 560cf4336e
commit 45f3ff0560
6 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/account/account_view.xml
View File

@ -812,9 +812,9 @@
<form string="Account Entry">
<separator colspan="4" string="General Information"/>
<group colspan="4" col="6">
<field name="name" select="1"/>
<field name="period_id" select="2"/>
<field name="journal_id" select="1"/>
<field name="name" select="1"/>
<field name="partner_id" select="2"/>
<field name="amount" select="2"/>
<field name="ref" select="1" groups="base.group_extended"/>

4
addons/mrp/mrp.py
View File

@ -1034,10 +1034,10 @@ class mrp_procurement(osv.osv):
def action_cancel(self, cr, uid, ids):
todo = []
for proc in self.browse(cr, uid, ids):
if proc.move_id:
if proc.move_id and proc.move_id.state=='waiting':
todo.append(proc.move_id.id)
if len(todo):
self.pool.get('stock.move').action_cancel(cr, uid, [proc.move_id.id])
self.pool.get('stock.move').write(cr, uid, todo, {'state':'assigned'})
self.write(cr, uid, ids, {'state':'cancel'})
wf_service = netsvc.LocalService("workflow")

6
addons/purchase/purchase_view.xml
View File

@ -64,11 +64,11 @@
<button name="purchase_appbuyer" states="wait_auth" string="Approve Purchase"/>
<button name="purchase_approve" states="confirmed" string="Approved by Supplier"/>
<button name="purchase_cancel" states="draft,confirmed,wait_auth" string="Cancel Purchase Order"/>
<button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
<button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
<button name="action_cancel" states="approved" string="Cancel Purchase Order" type="object"/>
<button name="shipping_ok" states="except_shipping" string="Shipping Done"/>
<button name="invoice_ok" states="except_invoice" string="Invoice Done"/>
<button name="picking_ok" states="except_picking" string="Manually Corrected"/>
<button name="invoice_ok" states="except_invoice" string="Manually Corrected"/>
</group>
</page>
<page string="Delivery &amp; Invoices">

1
addons/purchase/purchase_workflow.xml
View File

@ -23,6 +23,7 @@
<field name="wkf_id" ref="purchase_order"/>
<field name="name">cancel</field>
<field name="kind">function</field>
<field name="flow_stop">True</field>
<field name="action">write({'state':'cancel'})</field>
</record>
<record id="act_except_invoice" model="workflow.activity">

20
addons/stock/stock.py
View File

@ -1090,20 +1090,22 @@ class stock_move(osv.osv):
if move.state in ('confirmed','waiting','assigned','draft'):
if move.picking_id:
pickings[move.picking_id.id] = True
self.write(cr, uid, ids, {'state':'cancel'})
if move.move_dest_id and move.move_dest_id.state=='waiting':
self.write(cr, uid, [move.move_dest_id.id], {'state':'confirmed'})
self.write(cr, uid, ids, {'state':'cancel', 'move_dest_id': False})
for pick_id in pickings:
wf_service = netsvc.LocalService("workflow")
wf_service.trg_validate(uid, 'stock.picking', pick_id, 'button_cancel', cr)
ids2 = []
for res in self.read(cr, uid, ids, ['move_dest_id']):
if res['move_dest_id']:
ids2.append(res['move_dest_id'][0])
#for pick_id in pickings:
# wf_service = netsvc.LocalService("workflow")
# wf_service.trg_validate(uid, 'stock.picking', pick_id, 'button_cancel', cr)
#ids2 = []
#for res in self.read(cr, uid, ids, ['move_dest_id']):
# if res['move_dest_id']:
# ids2.append(res['move_dest_id'][0])
wf_service = netsvc.LocalService("workflow")
for id in ids:
wf_service.trg_trigger(uid, 'stock.move', id, cr)
self.action_cancel(cr,uid, ids2, context)
#self.action_cancel(cr,uid, ids2, context)
return True
def action_done(self, cr, uid, ids, context=None):

4
addons/stock/stock_view.xml
View File

@ -1023,8 +1023,8 @@
<button name="draft_force_assign" states="draft" string="Process Later" type="object"/>
<button name="draft_validate" states="draft" string="Process Now" type="object"/>
<button name="action_assign" states="confirmed" string="Assign" type="object"/>
<button name="force_assign" states="confirmed" string="Force Assignation" type="object"/>
<button name="cancel_assign" states="assigned" string="Cancel Assignation" type="object"/>
<button name="force_assign" states="confirmed" string="Force Assignation" type="object" groups="base.group_extended"/>
<button name="cancel_assign" states="assigned" string="Cancel Assignation" type="object" groups="base.group_extended"/>
<button name="%(partial_picking)d" states="assigned" string="Validate" type="action"/>
<button name="button_cancel" states="assigned,confirmed,draft" string="Cancel"/>
</group>