openerp-dev-web team mailing list archive

["Hardik Ansodariya \(OpenERP\)" <han@xxxxxxxxxxx>]

Hardik Ansodariya (OpenERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-usability-Be_able_to_cancel_some_documents-han into lp:~openerp-dev/openobject-addons/trunk-usability.

Requested reviews:
  OpenERP R&D Team (openerp-dev)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-usability-Be_able_to_cancel_some_documents-han/+merge/61918

Hello sir,

i have completed work specified in pad for Be_able_to_cancel_some_documents Feature of usability project

Thanks
Hardik
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-usability-Be_able_to_cancel_some_documents-han/+merge/61918
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-dev/openobject-addons/trunk-usability-Be_able_to_cancel_some_documents-han into lp:~openerp-dev/openobject-addons/trunk-usability.

=== modified file 'sale/sale.py'
--- sale/sale.py	2011-05-18 16:45:45 +0000
+++ sale/sale.py	2011-05-23 06:39:05 +0000
@@ -572,7 +572,7 @@
                 if pick.state not in ('draft', 'cancel'):
                     raise osv.except_osv(
                         _('Could not cancel sales order !'),
-                        _('You must first cancel all picking attached to this sales order.'))
+                        _('Cancel all picking attached to this sales order from the picking list in history tab.'))
                 if pick.state == 'cancel':
                     for mov in pick.move_lines:
                         proc_ids = proc_obj.search(cr, uid, [('move_id', '=', mov.id)])

=== modified file 'sale/sale_view.xml'
--- sale/sale_view.xml	2011-05-18 13:07:27 +0000
+++ sale/sale_view.xml	2011-05-23 06:39:05 +0000
@@ -247,7 +247,7 @@
                         <page string="History" groups="base.group_extended">
                             <separator colspan="4" string="Invoices"/>
                             <field colspan="4" name="invoice_ids" nolabel="1" context="{'form_view_ref':'account.invoice_form'}"/>
-                            <separator colspan="4" string="Packings"/>
+                            <separator colspan="4" string="Pickings"/>
                             <field colspan="4" name="picking_ids" nolabel="1"/>
                         </page>
                     </notebook>

=== modified file 'stock/stock.py'
--- stock/stock.py	2011-05-05 05:46:31 +0000
+++ stock/stock.py	2011-05-23 06:39:05 +0000
@@ -1111,14 +1111,14 @@
                     return False
         return True
 
-    def allow_cancel(self, cr, uid, ids, context=None):
-        for pick in self.browse(cr, uid, ids, context=context):
-            if not pick.move_lines:
-                return True
-            for move in pick.move_lines:
-                if move.state == 'done':
-                    raise osv.except_osv(_('Error'), _('You cannot cancel picking because stock move is in done state !'))
-        return True
+#    def allow_cancel(self, cr, uid, ids, context=None):
+#        for pick in self.browse(cr, uid, ids, context=context):
+#            if not pick.move_lines:
+#                return True
+#            for move in pick.move_lines:
+#                if move.state == 'done':
+#                    raise osv.except_osv(_('Error'), _('You cannot cancel picking because stock move is in done state !'))
+#        return True
     def unlink(self, cr, uid, ids, context=None):
         move_obj = self.pool.get('stock.move')
         if context is None:

=== modified file 'stock/stock_view.xml'
--- stock/stock_view.xml	2011-05-02 18:46:43 +0000
+++ stock/stock_view.xml	2011-05-23 06:39:05 +0000
@@ -684,6 +684,7 @@
                     <field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
                     <field name="state"/>
                     <button name="action_process" states="confirmed,assigned" groups="stock.group_stock_user" string="Process" type="object" icon="gtk-go-forward"/>
+                    <button name="action_cancel" states="confirmed" string="Cancel" groups="stock.group_stock_user" type="object" icon="gtk-cancel"/>
                 </tree>
             </field>
         </record>
@@ -992,7 +993,7 @@
                             </field>
                             <group col="12" colspan="4">
                                 <field name="state" readonly="1"/>
-                                <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
+                                <button name="button_cancel" states="assigned,confirmed,draft,done" string="_Cancel" icon="gtk-cancel"/>
                                 <button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-ok"/>
                                 <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-yes"/>
                                 <button name="action_assign" states="confirmed" string="Check Availability" type="object" groups="base.group_extended" icon="gtk-find"/>
@@ -1099,7 +1100,7 @@
                     <field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
                     <field name="state"/>
                     <button name="action_process" states="assigned" string="Process" type="object" icon="gtk-go-forward"/>
-                    <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel" confirm="This operation will cancel the shipment. Do you want to continue?" />
+                    <button name="button_cancel" states="assigned,confirmed,draft,done" string="Cancel" icon="gtk-cancel" confirm="This operation will cancel the shipment. Do you want to continue?" />
                 </tree>
             </field>
         </record>
@@ -1212,7 +1213,7 @@
                             </field>
                             <group col="10" colspan="4">
                                 <field name="state" readonly="1"/>
-                                <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
+                                <button name="button_cancel" states="assigned,confirmed,draft,done" string="_Cancel" icon="gtk-cancel"/>
                                 <button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-ok"/>
                                 <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-media-play"/>
                                 <button name="action_assign" states="confirmed" string="Check Availability" type="object" icon="gtk-find"/>

=== modified file 'stock/stock_workflow.xml'
--- stock/stock_workflow.xml	2011-01-14 00:11:01 +0000
+++ stock/stock_workflow.xml	2011-05-23 06:39:05 +0000
@@ -35,7 +35,6 @@
             <field name="name">done</field>
             <field name="kind">function</field>
             <field name="action">action_done()</field>
-            <field name="flow_stop">True</field>
         </record>
         <record id="act_cancel_inv" model="workflow.activity">
             <field name="wkf_id" ref="wkf_picking"/>
@@ -96,13 +95,11 @@
         <record id="trans_assigned_cancel" model="workflow.transition">
             <field name="act_from" ref="act_assigned"/>
             <field name="act_to" ref="act_cancel"/>
-			 <field name="condition">allow_cancel()</field>
             <field name="signal">button_cancel</field>
         </record>
         <record id="trans_confirmed_cancel" model="workflow.transition">
             <field name="act_from" ref="act_confirmed"/>
             <field name="act_to" ref="act_cancel"/>
-            <field name="condition">allow_cancel()</field>
             <field name="signal">button_cancel</field>
         </record>
         <record id="trans_draft_cancel" model="workflow.transition">
@@ -137,6 +134,17 @@
             <field name="act_to" ref="act_cancel"/>
             <field name="condition">test_cancel()</field>
         </record>
-
+        
+        <record id="trans_done_cancel" model="workflow.transition">
+            <field name="act_from" ref="act_done"/>
+            <field name="act_to" ref="act_cancel"/>
+            <field name="signal">button_cancel</field>
+         </record>
+         
+        <record id="trans_done_cancel_auto" model="workflow.transition">
+            <field name="act_from" ref="act_done"/>
+            <field name="act_to" ref="act_cancel"/>
+            <field name="condition">test_cancel()</field>
+        </record>
     </data>
 </openerp>