openerp-dev-web team mailing list archive

["Ysa\(Open ERP\)" <ysa@xxxxxxxxxxx>]

Ysa(Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/ysa-dev-addons2 into lp:~openerp-dev/openobject-addons/trunk-dev-addons2.

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

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/ysa-dev-addons2/+merge/45821

[IMP] shortcuts data remove in view file and create data in separate file and set noupdate='1'.
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/ysa-dev-addons2/+merge/45821
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-dev/openobject-addons/ysa-dev-addons2 into lp:~openerp-dev/openobject-addons/trunk-dev-addons2.

=== modified file 'crm/__openerp__.py'
--- crm/__openerp__.py	2011-01-06 10:56:32 +0000
+++ crm/__openerp__.py	2011-01-11 09:11:20 +0000
@@ -41,7 +41,7 @@
 place.
 
 The CRM module has a email gateway for the synchronisation interface
-between mails and OpenERP. 
+between mails and OpenERP.
 Create dashboard for CRM that includes:
     * My Leads (list)
     * Leads by Stage (graph)
@@ -95,6 +95,7 @@
 
         'crm_meeting_view.xml',
         'crm_meeting_menu.xml',
+        'crm_meeting_shortcut_data.xml',
 
         'crm_phonecall_view.xml',
         'crm_phonecall_menu.xml',
@@ -106,12 +107,12 @@
         'report/crm_phonecall_report_view.xml',
 
         'process/crm_configuration_process.xml',
-        'crm_installer_view.xml', 
-        
+        'crm_installer_view.xml',
+
         'res_partner_view.xml',
         'board_crm_view.xml',
         'board_crm_statistical_view.xml',
-       
+
     ],
     'demo_xml': [
         'crm_demo.xml',

=== modified file 'crm/crm_meeting_menu.xml'
--- crm/crm_meeting_menu.xml	2010-12-14 06:22:11 +0000
+++ crm/crm_meeting_menu.xml	2011-01-11 09:11:20 +0000
@@ -92,12 +92,6 @@
         action="crm_case_categ_meet" parent="menu_meeting_sale"
         sequence="1" />
 
-    <record id="ir_ui_view_sc_calendar0" model="ir.ui.view_sc">
-        <field name="name">Meetings</field>
-        <field name="resource">ir.ui.menu</field>
-        <field name="user_id" ref="base.user_root"/>
-        <field name="res_id" ref="crm.menu_crm_case_categ_meet"/>
-    </record>
     <record id="action_view_attendee_form" model="ir.actions.act_window">
          <field name="name">Meeting Invitations</field>
          <field name="type">ir.actions.act_window</field>

=== added file 'crm/crm_meeting_shortcut_data.xml'
--- crm/crm_meeting_shortcut_data.xml	1970-01-01 00:00:00 +0000
+++ crm/crm_meeting_shortcut_data.xml	2011-01-11 09:11:20 +0000
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<openerp>
+    <data noupdate="1">
+
+	    <record id="ir_ui_view_sc_calendar0" model="ir.ui.view_sc">
+	        <field name="name">Meetings</field>
+	        <field name="resource">ir.ui.menu</field>
+	        <field name="user_id" ref="base.user_root"/>
+	        <field name="res_id" ref="crm.menu_crm_case_categ_meet"/>
+	    </record>
+
+    </data>
+</openerp>

=== modified file 'product/__openerp__.py'
--- product/__openerp__.py	2010-09-21 10:21:42 +0000
+++ product/__openerp__.py	2011-01-11 09:11:20 +0000
@@ -53,6 +53,7 @@
         'product_data.xml',
         'product_report.xml',
         'product_view.xml',
+        'product_shortcut_data.xml',
         'pricelist_view.xml',
         'partner_view.xml',
         'process/product_process.xml'

=== added file 'product/product_shortcut_data.xml'
--- product/product_shortcut_data.xml	1970-01-01 00:00:00 +0000
+++ product/product_shortcut_data.xml	2011-01-11 09:11:20 +0000
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+
+        <record id="ir_ui_view_sc_product0" model="ir.ui.view_sc">
+            <field name="name">Products</field>
+            <field name="resource">ir.ui.menu</field>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="res_id" ref="product.menu_products"/>
+        </record>
+
+    </data>
+</openerp>

=== modified file 'product/product_view.xml'
--- product/product_view.xml	2010-12-28 08:30:43 +0000
+++ product/product_view.xml	2011-01-11 09:11:20 +0000
@@ -9,7 +9,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Product">
-                   <filter string="Services" icon="terp-accessories-archiver" domain="[('type','=','service')]"/>                   
+                   <filter string="Services" icon="terp-accessories-archiver" domain="[('type','=','service')]"/>
                    <filter string="Stockable" icon="terp-accessories-archiver" domain="['|',('type','=','product'),('type','=','consu')]"/>
                    <separator orientation="vertical"/>
                    <filter string="To Sell" icon="terp-accessories-archiver-minus" domain="[('sale_ok','=',1)]"/>
@@ -30,7 +30,7 @@
                        <separator orientation="vertical"/>
                        <filter string='Type' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'type'}" />
                    </group>
-                   
+
                 </search>
             </field>
         </record>
@@ -635,12 +635,6 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="product_template_tree_view"/>
         </record>
-        <record id="ir_ui_view_sc_product0" model="ir.ui.view_sc">
-            <field name="name">Products</field>
-            <field name="resource">ir.ui.menu</field>
-            <field name="user_id" ref="base.user_root"/>
-            <field name="res_id" ref="product.menu_products"/>
-        </record>
 
     </data>
 </openerp>