[IMP]: Change workflow transition. remove type field

bzr revid: atp@tinyerp.com-20120909123216-vys9dyuqk5i7grgr

addons/sale/edi/sale_order_action_data.xml

@@ -28,10 +28,10 @@
     <!-- Mail template and workflow bindings are done in a NOUPDATE block
          so users can freely customize/delete them -->
     <data noupdate="1">
-         <!-- bind the mailing server action to sale.order confirmed activity-->
+         <!-- bind the mailing server action to sale.order confirmed activity
         <record id="sale.act_wait_ship" model="workflow.activity">
             <field name="action_id" ref="ir_actions_server_edi_sale"/>
-        </record>
+        </record>-->
 
 
         <!--Email template -->

addons/sale/sale_view.xml

@@ -246,7 +246,6 @@
                                         groups="base.group_user" 
                                         on_change="product_id_change(parent.pricelist_id, product_id, product_uom_qty, product_uom, product_uos_qty, product_uos, name, parent.partner_id, False, True, parent.date_order, False, parent.fiscal_position, False, context)"/>
                                     <field name="name"/>
-                                    <field name="type" invisible="1"/>
                                     <field name="product_uom_qty"
                                         context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}"
                                         on_change="product_id_change(parent.pricelist_id, product_id, product_uom_qty, product_uom, product_uos_qty, product_uos, name, parent.partner_id, False, False, parent.date_order, False, parent.fiscal_position, True, context)"/>

addons/sale/security/sale_security.xml

@@ -25,6 +25,10 @@
         <field name="category_id" ref="base.module_category_hidden"/>
     </record>
 
+    <record id="group_mrp_properties" model="res.groups">
+        <field name="name">Properties on lines</field>
+        <field name="category_id" ref="base.module_category_hidden"/>
+    </record>
 
     <record id="group_delivery_invoice_address" model="res.groups">
         <field name="name">Addresses in Sale Orders</field>

addons/sale_stock/process/sale_stock_process.xml

@@ -146,7 +146,7 @@
             <field eval="&quot;&quot;&quot;The Salesman creates an invoice manually, if the sales order shipping policy is 'Shipping and Manual in Progress'. The invoice is created automatically if the shipping policy is 'Payment before Delivery'.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="sale.process_node_invoice0"/>
             <field model="process.node" name="source_node_id" ref="sale.process_node_saleorder0"/>
-            <field eval="[(6,0,[ref('sale_stock.trans_wait_invoice_invoice_manual')])]" name="transition_ids"/>
+            <field eval="[(6,0,[ref('sale.trans_wait_invoice_invoice_manual')])]" name="transition_ids"/>
         </record>
 
         <record id="process_transition_action_cancelorder0" model="process.transition.action">

addons/sale_stock/res_config.py

@@ -48,7 +48,7 @@ class sale_configuration(osv.osv_memory):
         'default_picking_policy' : fields.boolean("Deliver all at once when all products are available.",
             help = "Sales order by default will be configured to deliver all products at once instead of delivering each product when it is available. This may have an impact on the shipping price."),
         'group_mrp_properties': fields.boolean('Product properties on order lines',
-            implied_group='sale_stock.group_mrp_properties',
+            implied_group='sale.group_mrp_properties',
             help="Allows you to tag sale order lines with properties."),
         'group_multiple_shops': fields.boolean("Manage Multiple Shops",
             implied_group='stock.group_locations',

addons/sale_stock/sale_stock_view.xml

@@ -104,7 +104,7 @@
                    </xpath>
                    <xpath expr="//page[@string='Order Lines']/field[@name='order_line']/form[@string='Sales Order Lines']/group/group/field[@name='address_allotment_id']" position="after">
                        <field name="property_ids" widget="many2many_tags"
-                            groups="sale_stock.group_mrp_properties"/>
+                            groups="sale.group_mrp_properties"/>
                    </xpath>
                    <xpath expr="//page[@string='Order Lines']/field[@name='order_line']/form[@string='Sales Order Lines']/group/group/field[@name='tax_id']" position="before">
                        <field name="product_packaging" context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}" on_change="product_packaging_change(parent.pricelist_id, product_id, product_uom_qty, product_uom, parent.partner_id, product_packaging, True, context)" domain="[('product_id','=',product_id)]" groups="product.group_stock_packaging" colspan="3"/>

addons/sale_stock/security/sale_stock_security.xml

@@ -2,11 +2,6 @@
 <openerp>
     <data noupdate="0">
     
-    <record id="group_mrp_properties" model="res.groups">
-        <field name="name">Properties on lines</field>
-        <field name="category_id" ref="base.module_category_hidden"/>
-    </record>
-    
     <record id="group_invoice_deli_orders" model="res.groups">
         <field name="name">Enable Invoicing Delivery orders</field>
         <field name="category_id" ref="base.module_category_hidden"/>