← Back to team overview

openerp-dev-web team mailing list archive

[Merge] lp:~openerp-dev/openobject-addons/6.0-opw-5661-skh into lp:openobject-addons/6.0

 

Somesh Khare(OpenERP) has proposed merging lp:~openerp-dev/openobject-addons/6.0-opw-5661-skh into lp:openobject-addons/6.0.

Requested reviews:
  Priyesh (Open ERP) (pso-openerp)
  Jay Vora (OpenERP) (jvo-openerp)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-5661-skh/+merge/62447

Hello,

[FIX]:Update the file content of init_xml[] and data[] in __openerp__.py and set noupdate=1 in the respective <data></data> tag (Ref : Case 5661.

Thanks.
SKH
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-5661-skh/+merge/62447
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/6.0-opw-5661-skh.
=== modified file 'auction/auction_data.xml'
--- auction/auction_data.xml	2011-01-14 00:11:01 +0000
+++ auction/auction_data.xml	2011-05-26 10:06:15 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <openerp>
-<data>
+<data noupdate="1">
 	
 	
 	<!-- Auction lots category data -->

=== modified file 'base_iban/base_iban_data.xml'
--- base_iban/base_iban_data.xml	2011-01-14 00:11:01 +0000
+++ base_iban/base_iban_data.xml	2011-05-26 10:06:15 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
+    <data noupdate="1">
 
         <!--
         Default bank account description

=== modified file 'base_report_designer/wizard/base_report_design_view.xml'
--- base_report_designer/wizard/base_report_design_view.xml	2011-01-14 00:11:01 +0000
+++ base_report_designer/wizard/base_report_design_view.xml	2011-05-26 10:06:15 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
+    <data noupdate="1">
 
      
         <record id="view_base_report_sxw" model="ir.ui.view">

=== modified file 'crm/__openerp__.py'
--- crm/__openerp__.py	2011-01-17 08:00:48 +0000
+++ crm/__openerp__.py	2011-05-26 10:06:15 +0000
@@ -65,7 +65,6 @@
         'crm_data.xml',
         'crm_meeting_data.xml',
         'crm_lead_data.xml',
-        'crm_meeting_data.xml',
         'crm_opportunity_data.xml',
         'crm_phonecall_data.xml',
     ],

=== modified file 'document_ics/document_data.xml'
--- document_ics/document_data.xml	2011-01-14 00:11:01 +0000
+++ document_ics/document_data.xml	2011-05-26 10:06:15 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <openerp>
-<data>
+<data noupdate="1">
 
     <record model="document.directory.content.type" id="ics">
         <field name="code">.ics</field>

=== modified file 'hr_timesheet/hr_timesheet_data.xml'
--- hr_timesheet/hr_timesheet_data.xml	2011-01-14 00:11:01 +0000
+++ hr_timesheet/hr_timesheet_data.xml	2011-05-26 10:06:15 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
+    <data noupdate="1">
         <record id="analytic_journal" model="account.analytic.journal">
             <field name="code">TS</field>
             <field name="name">Timesheet Journal</field>

=== modified file 'l10n_ch/dta_data.xml'
--- l10n_ch/dta_data.xml	2011-02-09 08:59:05 +0000
+++ l10n_ch/dta_data.xml	2011-05-26 10:06:15 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <openerp>
-    <data>
+    <data noupdate="1">
 
 
     <!-- Memo :

=== modified file 'l10n_ch/journal_data.xml'
--- l10n_ch/journal_data.xml	2011-01-14 12:42:37 +0000
+++ l10n_ch/journal_data.xml	2011-05-26 10:06:15 +0000
@@ -1,5 +1,5 @@
 <openerp>
-    <data>
+    <data noupdate="1">
         
         <record id="expenses_journal" model="account.journal">
             <field name="name">Journal de frais</field>

=== modified file 'l10n_ch/sterchi_chart/fiscal_position.xml'
--- l10n_ch/sterchi_chart/fiscal_position.xml	2011-01-14 12:42:37 +0000
+++ l10n_ch/sterchi_chart/fiscal_position.xml	2011-05-26 10:06:15 +0000
@@ -1,5 +1,5 @@
 <openerp>
-    <data>
+    <data noupdate="1">
         <!-- Fiscal Position Templates -->
         
         <record id="fiscal_position_template_import" model="account.fiscal.position.template">

=== modified file 'l10n_cn/base_data.xml'
--- l10n_cn/base_data.xml	2011-01-14 00:11:01 +0000
+++ l10n_cn/base_data.xml	2011-05-26 10:06:15 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <openerp>
-	<data>
+	<data noupdate="1">
 
         <!-- 添加省份数据 -->
         <record id="state_BJ" model="res.country.state">

=== modified file 'l10n_es/taxes_data.xml'
--- l10n_es/taxes_data.xml	2011-01-14 00:11:01 +0000
+++ l10n_es/taxes_data.xml	2011-05-26 10:06:15 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
+    <data noupdate="1">
 		
      <!--
      Definición de IVA y retenciones, códigos de impuestos y cuentas contables adicionales

=== modified file 'project_timesheet/project_timesheet_data.xml'
--- project_timesheet/project_timesheet_data.xml	2010-12-22 08:44:44 +0000
+++ project_timesheet/project_timesheet_data.xml	2011-05-26 10:06:15 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <openerp>
-    <data>
+    <data noupdate="1">
     
         <record id="base.menu_project_management_time_tracking" model="ir.ui.menu">
             <field name="name">Time Tracking</field>

=== modified file 'survey/survey_data.xml'
--- survey/survey_data.xml	2011-01-14 00:11:01 +0000
+++ survey/survey_data.xml	2011-05-26 10:06:15 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <openerp>
-    <data>
+    <data noupdate="1">
 
     </data>
 </openerp>
\ No newline at end of file


Follow ups