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

[FIX] purchase double validation unistall fixed 

bzr revid: api@openerp.com-20121206092412-1eki0578ggcjoioz
This commit is contained in:
Arnaud Pineux 2012-12-06 10:24:12 +01:00
parent b4dbebadf6
commit e7477373e9
4 changed files with 35 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
addons/purchase/purchase.py
View File

@ -389,6 +389,15 @@ class purchase_order(osv.osv):
self.write(cr, uid, ids, {'state': 'approved', 'date_approve': fields.date.context_today(self,cr,uid,context=context)})
return True
def print_confirm(self,cr,uid,ids,context=None):
print "Confirmed"
def print_double(self,cr,uid,ids,context=None):
print "double Approval"
def print_router(self,cr,uid,ids,context=None):
print "Routed"
def wkf_send_rfq(self, cr, uid, ids, context=None):
'''
This function opens a window to compose an email, with the edi purchase template message loaded by default

2
addons/purchase/test/process/cancel_order.yml
View File

@ -8,7 +8,7 @@
I check the "Approved" status after confirmed RFQ.
-
!assert {model: purchase.order, id: purchase_order_5}:
- state == 'approved'
- state == 'confirmed'
-
First I cancel receptions related to this order if order shipped.
-

6
addons/purchase_double_validation/purchase_double_validation_installer.py
View File

@ -34,16 +34,16 @@ class purchase_config_settings(osv.osv_memory):
def get_default_limit_amount(self, cr, uid, fields, context=None):
ir_model_data = self.pool.get('ir.model.data')
transition = ir_model_data.get_object(cr, uid, 'purchase_double_validation', 'trans_confirmed_double_app_lt')
transition = ir_model_data.get_object(cr, uid, 'purchase_double_validation', 'trans_confirmed_double_lt')
field, value = transition.condition.split('<', 1)
return {'limit_amount': int(value)}
def set_limit_amount(self, cr, uid, ids, context=None):
ir_model_data = self.pool.get('ir.model.data')
config = self.browse(cr, uid, ids[0], context)
waiting = ir_model_data.get_object(cr, uid, 'purchase_double_validation', 'trans_confirmed_double_app')
waiting = ir_model_data.get_object(cr, uid, 'purchase_double_validation', 'trans_confirmed_double_gt')
waiting.write({'condition': 'amount_total >= %s' % config.limit_amount})
confirm = ir_model_data.get_object(cr, uid, 'purchase_double_validation', 'trans_confirmed_double_app_lt')
confirm = ir_model_data.get_object(cr, uid, 'purchase_double_validation', 'trans_confirmed_double_lt')
confirm.write({'condition': 'amount_total < %s' % config.limit_amount})
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

33
addons/purchase_double_validation/purchase_double_validation_workflow.xml
View File

@ -1,30 +1,41 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record id="act_double_app" model="workflow.activity">
<record id="act_double_wait" model="workflow.activity">
<field name="wkf_id" ref="purchase.purchase_order"/>
<field name="name">doubleApproval</field>
<field name="split_mode">OR</field>
<field name="kind">function</field>
<field name="action">wkf_approve_order()</field>
<field name="name">WaitForApproval</field>
<field name="kind">dummy</field>
</record>
<record id="trans_confirmed_double_app" model="workflow.transition">
<record id="act_double_check" model="workflow.activity">
<field name="wkf_id" ref="purchase.purchase_order"/>
<field name="name">CheckForApproval</field>
<field name="split_mode">OR</field>
<field name="kind">dummy</field>
</record>
<record id="trans_confirmed_double_check" model="workflow.transition">
<field name="act_from" ref="purchase.act_confirmed"/>
<field name="act_to" ref="act_double_app"/>
<field name="act_to" ref="act_double_check"/>
</record>
<record id="trans_confirmed_double_gt" model="workflow.transition">
<field name="act_from" ref="act_double_check"/>
<field name="act_to" ref="act_double_wait"/>
<field name="condition">amount_untaxed &gt;= 5000</field>
<field name="signal">purchase_approve</field>
<field name="group_id" ref="purchase.group_purchase_manager"/>
</record>
<record id="trans_confirmed_double_app_lt" model="workflow.transition">
<field name="act_from" ref="purchase.act_confirmed"/>
<field name="act_to" ref="act_double_app"/>
<record id="trans_confirmed_double_lt" model="workflow.transition">
<field name="act_from" ref="act_double_check"/>
<field name="act_to" ref="act_double_wait"/>
<field name="condition">amount_untaxed &lt; 5000</field>
</record>
<record id="trans_double_app_conf" model="workflow.transition">
<field name="act_from" ref="act_double_app"/>
<field name="act_from" ref="act_double_wait"/>
<field name="act_to" ref="purchase.act_router"/>
</record>