Mayur Maheshwari(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-bug-932059-mma into
lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
Related bugs:
Bug #932059 in OpenERP Addons: "purchase : wait state is unused"
https://bugs.launchpad.net/openobject-addons/+bug/932059
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-932059-mma/+merge/93190
Hello,
purchase: I have removed wait and wait_auth which unnecessary in py and
xml
Thanks.
mma
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-932059-mma/+merge/93190
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-bug-932059-mma.
=== modified file 'purchase/purchase.py'
--- purchase/purchase.py 2012-02-14 12:25:20 +0000
+++ purchase/purchase.py 2012-02-15 12:07:24 +0000
@@ -143,7 +143,6 @@
STATE_SELECTION = [
('draft', 'Request for Quotation'),
- ('wait', 'Waiting'),
('confirmed', 'Waiting Approval'),
('approved', 'Approved'),
('except_picking', 'Shipping Exception'),
=== modified file 'purchase/purchase_view.xml'
--- purchase/purchase_view.xml 2012-01-31 13:36:57 +0000
+++ purchase/purchase_view.xml 2012-02-15 12:07:24 +0000
@@ -196,13 +196,12 @@
</group>
<group col="11" colspan="4">
<field name="state" widget="statusbar" statusbar_visible="draft,approved,done" statusbar_colors='{"except_picking":"red","except_invoice":"red","confirmed":"blue","wait":"blue"}' readonly="1"/>
- <button name="purchase_cancel" states="draft,confirmed,wait_auth" string="Cancel" icon="gtk-cancel"/>
+ <button name="purchase_cancel" states="draft,confirmed" string="Cancel" icon="gtk-cancel"/>
<button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
<button name="action_cancel" states="approved,except_picking,except_invoice,wait" string="Cancel Purchase Order" type="object" icon="gtk-cancel"/>
<button name="picking_ok" states="except_picking" string="Manually Corrected" icon="gtk-convert"/>
<button name="invoice_ok" states="except_invoice" string="Manually Corrected" icon="gtk-convert"/>
<button name="purchase_confirm" states="draft" string="Convert to Purchase Order" icon="gtk-go-forward"/>
- <button name="purchase_appbuyer" states="wait_auth" string="Approve Purchase" icon="gtk-ok"/>
<button name="purchase_approve" states="confirmed" string="Approved" icon="gtk-go-forward"/>
<button name="%(report_purchase_order)d" string="Print" states="approved" type="action" icon="gtk-print"/>
</group>
=== modified file 'purchase_requisition/purchase_requisition.py'
--- purchase_requisition/purchase_requisition.py 2011-12-23 11:22:41 +0000
+++ purchase_requisition/purchase_requisition.py 2012-02-15 12:07:24 +0000
@@ -67,7 +67,7 @@
purchase_order_obj = self.pool.get('purchase.order')
for purchase in self.browse(cr, uid, ids, context=context):
for purchase_id in purchase.purchase_ids:
- if str(purchase_id.state) in('draft','wait'):
+ if str(purchase_id.state) in('draft'):
purchase_order_obj.action_cancel(cr,uid,[purchase_id.id])
self.write(cr, uid, ids, {'state': 'cancel'})
return True
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
