Merge pull request #60 from prakashpp/develop

Fix state action for import/export order #6750
openlabs · Jan 20, 2015 · ee8607f · ee8607f
2 parents e9a72ee + 2584270
commit ee8607f
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 9 deletions.
diff --git a/sale.py b/sale.py
@@ -15,7 +15,7 @@
 from trytond.transaction import Transaction
 from trytond.exceptions import UserError
 from trytond.pool import PoolMeta, Pool
-from trytond.pyson import Eval, Not, Bool, PYSONEncoder
+from trytond.pyson import Eval, Not, Bool
 from trytond.wizard import Wizard, StateView, Button, StateAction
 
 
@@ -617,7 +617,7 @@ class ImportOrders(Wizard):
         ]
     )
 
-    import_ = StateAction('sale.act_sale_form')
+    import_ = StateAction('magento.act_sale_form_all')
 
     def default_start(self, data):
         """
@@ -642,9 +642,8 @@ def do_import_(self, action):
 
         sales = store_view.import_order_from_store_view()
 
-        action['pyson_domain'] = PYSONEncoder().encode(
-            [('id', 'in', map(int, sales))])
-        return action, {}
+        data = {'res_id': [sale.id for sale in sales]}
+        return action, data
 
     def transition_import_(self):
         return 'end'
@@ -674,7 +673,7 @@ class ExportOrderStatus(Wizard):
         ]
     )
 
-    export_ = StateAction('sale.act_sale_form')
+    export_ = StateAction('magento.act_sale_form_all')
 
     def default_start(self, data):
         """
@@ -698,9 +697,8 @@ def do_export_(self, action):
 
         sales = store_view.export_order_status_for_store_view()
 
-        action['pyson_domain'] = PYSONEncoder().encode(
-            [('id', 'in', map(int, sales))])
-        return action, {}
+        data = {'res_id': [sale.id for sale in sales]}
+        return action, data
 
     def transition_export_(self):
         return 'end'

diff --git a/sale.xml b/sale.xml
@@ -10,6 +10,21 @@
             <field name="name">sale_form</field>
         </record>
 
+        <record model="ir.action.act_window" id="act_sale_form_all">
+            <field name="name">Sales</field>
+            <field name="res_model">sale.sale</field>
+        </record>
+        <record model="ir.action.act_window.view" id="act_sale_form_view1">
+            <field name="sequence" eval="10"/>
+            <field name="view" ref="sale.sale_view_tree"/>
+            <field name="act_window" ref="act_sale_form_all"/>
+        </record>
+        <record model="ir.action.act_window.view" id="act_sale_form_view2">
+            <field name="sequence" eval="20"/>
+            <field name="view" ref="sale.sale_view_form"/>
+            <field name="act_window" ref="act_sale_form_all"/>
+        </record>
+
         <!--Sale Line -->
         <record model="ir.ui.view" id="sale_line_view_form">
             <field name="model">sale.line</field>