pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE]:sale

Browse Source 
bzr revid: apa@tinyerp.com-20121029091638-hykveg0emnes3bqp
This commit is contained in:
Amit Patel
2012-10-29 14:46:38 +05:30
parent e5a7eb11bc d922d61c90
commit 430f2b85f8
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/sale/sale.py
+5
View File
@@ -580,6 +580,11 @@ class sale_order(osv.osv):
self.write(cr, uid, ids, {'state': 'cancel'})
return True
def action_draft(self, cr, uid, ids, context=None):
"""Resets Sale Order as draft.
"""
return self.write(cr, uid, ids, {'state':'draft'}, context=context)
def action_button_confirm(self, cr, uid, ids, context=None):
assert len(ids) == 1, 'This option should only be used for a single id at a time.'
wf_service = netsvc.LocalService('workflow')
addons/sale/sale_view.xml
+3 -2
View File
@@ -164,14 +164,15 @@
<field name="arch" type="xml">
<form string="Sales Order" version="7.0">
<header>
<button name="action_draft" string="Reset to Draft" states="cancel" type="object"/>
<button name="invoice_recreate" states="invoice_except" string="Recreate Invoice" groups="base.group_user"/>
<button name="invoice_corrected" states="invoice_except" string="Ignore Exception" groups="base.group_user"/>
<button name="action_quotation_send" string="Send by Mail" type="object" states="draft" class="oe_highlight" groups="base.group_user"/>
<button name="action_quotation_send" string="Send by Mail" type="object" states="sent" groups="base.group_user"/>
<button name="print_quotation" string="Print" type="object" states="draft" class="oe_highlight" groups="base.group_user"/>
<button name="print_quotation" string="Print" type="object" states="sent" groups="base.group_user"/>
<button name="action_button_confirm" states="draft" string="Confirm" type="object" groups="base.group_user"/>
<button name="action_button_confirm" states="sent" string="Confirm" class="oe_highlight" type="object" groups="base.group_user"/>
<button name="action_button_confirm" states="draft" string="Confirm Sale" type="object" groups="base.group_user"/>
<button name="action_button_confirm" states="sent" string="Confirm Sale" class="oe_highlight" type="object" groups="base.group_user"/>
<button name="action_view_invoice" string="View Invoice" type="object" class="oe_highlight"
attrs="{'invisible': [('invoice_exists', '=', False)]}" groups="base.group_user"/>
<button name="%(action_view_sale_advance_payment_inv)d" string="Create Invoice"