Khushboo Bhatt(openerp) has proposed merging 
lp:~openerp-dev/openobject-addons/trunk-10clicks-sale-apa-sale-order-kbh into 
lp:~openerp-dev/openobject-addons/trunk-10clicks-sale-apa.

Requested reviews:
  Amit Patel (OpenERP) (apa-tiny)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-10clicks-sale-apa-sale-order-kbh/+merge/131823

Hello,
   Sale::
   -  On sales order,I have added a "Reset to Draft" button when the sale order 
is cancelled.
   -  Renamed the "Confirm" button on sale order into "Confirm Sale".

Thanks,
KBH.
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-10clicks-sale-apa-sale-order-kbh/+merge/131823
Your team OpenERP R&D Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-10clicks-sale-apa.
=== modified file 'sale/sale.py'
--- sale/sale.py	2012-10-26 15:34:36 +0000
+++ sale/sale.py	2012-10-29 07:14:21 +0000
@@ -580,6 +580,11 @@
         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')

=== modified file 'sale/sale_view.xml'
--- sale/sale_view.xml	2012-10-28 15:15:37 +0000
+++ sale/sale_view.xml	2012-10-29 07:14:21 +0000
@@ -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"

_______________________________________________
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

Reply via email to