Vauxoo Addons

Merge lp:~vauxoo/addons-vauxoo/addons-vauxoo-6.1_mrp_bom_cost_del_assets_dev_luis into lp:addons-vauxoo/6.1

  1. addons-vauxoo-6.1_mrp_bom_cost_del_assets_dev_luis
  2. Merge into 6.1
Proposed by Luis Torres - http://www.vauxoo.com
Status: Merged
Merged at revision: 532
Proposed branch: lp:~vauxoo/addons-vauxoo/addons-vauxoo-6.1_mrp_bom_cost_del_assets_dev_luis
Merge into: lp:addons-vauxoo/6.1
Diff against target: 84 lines (+3/-47)
1 file modified
mrp_advance/mrp_bom_cost/mrp_po_view.xml (+3/-47)
To merge this branch: bzr merge lp:~vauxoo/addons-vauxoo/addons-vauxoo-6.1_mrp_bom_cost_del_assets_dev_luis
Reviewer Review Type Date Requested Status
Rodolfo Lopez Pending
Review via email: mp+130450@code.launchpad.net

Description of the change

Se elimino todo lo relacionado con asets de la vista de mrp_bom_cost

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'mrp_advance/mrp_bom_cost/mrp_po_view.xml'
--- mrp_advance/mrp_bom_cost/mrp_po_view.xml 2012-09-14 00:26:19 +0000
+++ mrp_advance/mrp_bom_cost/mrp_po_view.xml 2012-10-18 22:55:23 +0000
@@ -3,17 +3,8 @@
3 <data>3 <data>
4 <menuitem id="menu_mrp_product" name="Products" parent="base.menu_mrp_root" sequence="1"/>4 <menuitem id="menu_mrp_product" name="Products" parent="base.menu_mrp_root" sequence="1"/>
5<!--Product5<!--Product
6 new sub-menu:Products Assets, Products for Sales.6 new sub-menu: Products for Sales.
7 -->7 -->
8 <record id="product_normal_action_assets" model="ir.actions.act_window">
9 <field name="name">Products Assets</field>
10 <field name="type">ir.actions.act_window</field>
11 <field name="res_model">product.product</field>
12 <field name="domain">[('product_active','=',True)]</field>
13 <field name="view_type">form</field>
14 <field name="view_mode">tree,form</field>
15 </record>
16 <menuitem action="product_normal_action_assets" id="menu_products_assets" parent="menu_mrp_product" sequence="18"/>
178
18 <record id="product_normal_action_sales" model="ir.actions.act_window">9 <record id="product_normal_action_sales" model="ir.actions.act_window">
19 <field name="name">Products for Sales</field>10 <field name="name">Products for Sales</field>
@@ -56,34 +47,13 @@
56 Bill of Materials47 Bill of Materials
57 -->48 -->
5849
59 <!-- bom Assets -->
60 <record id="mrp_bom_form_action_assets" model="ir.actions.act_window">
61 <field name="name">Bill of Materials Assets</field>
62 <field name="type">ir.actions.act_window</field>
63 <field name="res_model">mrp.bom</field>
64 <field name="view_type">form</field>
65 <field name="domain">[('bom_id','=',False),('bom_assets','=',True)]</field>
66 </record>
67 <menuitem action="mrp_bom_form_action_assets" id="menu_mrp_bom_form_action_assets" parent="mrp.menu_mrp_configuration"/>
68
69 <record id="mrp_bom_form_action_new_assets" model="ir.actions.act_window">
70 <field name="name">New Bill of Materials Assets</field>
71 <field name="type">ir.actions.act_window</field>
72 <field name="res_model">mrp.bom</field>
73 <field name="view_type">form</field>
74 <field name="view_mode">form,tree</field>
75 <field name="domain">[('bom_id','=',False),('bom_assets','=',True)]</field>
76 <field name="context">{'bom_assets': True}</field>
77 </record>
78 <menuitem action="mrp_bom_form_action_new_assets" id="menu_mrp_bom_form_action_new_assets" parent="menu_mrp_bom_form_action_assets"/>
79
80<!-- bom for Sales -->50<!-- bom for Sales -->
81 <record id="mrp_bom_form_action_for_sales" model="ir.actions.act_window">51 <record id="mrp_bom_form_action_for_sales" model="ir.actions.act_window">
82 <field name="name">Bill of Materials for Sales</field>52 <field name="name">Bill of Materials for Sales</field>
83 <field name="type">ir.actions.act_window</field>53 <field name="type">ir.actions.act_window</field>
84 <field name="res_model">mrp.bom</field>54 <field name="res_model">mrp.bom</field>
85 <field name="view_type">form</field>55 <field name="view_type">form</field>
86 <field name="domain">[('bom_id','=',False),('bom_assets','=',False)]</field>56 <field name="domain">[('bom_id','=',False),]</field>
87 </record>57 </record>
88 <menuitem action="mrp_bom_form_action_for_sales" id="menu_mrp_bom_form_action_for_sales" parent="mrp.menu_mrp_configuration"/>58 <menuitem action="mrp_bom_form_action_for_sales" id="menu_mrp_bom_form_action_for_sales" parent="mrp.menu_mrp_configuration"/>
8959
@@ -93,24 +63,10 @@
93 <field name="res_model">mrp.bom</field>63 <field name="res_model">mrp.bom</field>
94 <field name="view_type">form</field>64 <field name="view_type">form</field>
95 <field name="view_mode">form,tree</field>65 <field name="view_mode">form,tree</field>
96 <field name="domain">[('bom_id','=',False),('bom_assets','=',False)]</field>66 <field name="domain">[('bom_id','=',False),]</field>
97 <field name="context">{'bom_assets': False}</field>
98 </record>67 </record>
99 <menuitem action="mrp_bom_form_action_new_for_sales" id="menu_mrp_bom_form_action_new_for_sales" parent="menu_mrp_bom_form_action_for_sales"/>68 <menuitem action="mrp_bom_form_action_new_for_sales" id="menu_mrp_bom_form_action_new_for_sales" parent="menu_mrp_bom_form_action_for_sales"/>
10069
101<!-- field bom_assets
102 <record model="ir.ui.view" id="view_mrp_bom_form_cost_assets">
103 <field name="name">mrp.bom.form.cost_assets</field>
104 <field name="model">mrp.bom</field>
105 <field name="type">form</field>
106 <field name="inherit_id" ref="mrp.mrp_bom_form_view"/>
107 <field name="arch" type="xml">
108 <field name="type" position="after">
109 <field name="bom_assets" invisible='0'/>
110 </field>
111 </field>
112 </record>
113-->
114 <record model="ir.ui.view" id="view_mrp_bom_form_cost1">70 <record model="ir.ui.view" id="view_mrp_bom_form_cost1">
115 <field name="name">mrp.bom.form.cost_t1</field>71 <field name="name">mrp.bom.form.cost_t1</field>
116 <field name="model">mrp.bom</field>72 <field name="model">mrp.bom</field>