[IMP]improved value of demo data and selection field

bzr revid: mba@tinyerp.com-20140108104029-rrdw8t2skrxs7yzj

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 7000477..964479e 100644 (file)
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -28,11 +28,9 @@ from openerp.osv import fields
 from openerp.osv import osv
 
 AVAILABLE_PRIORITIES = [
-    ('0', 'Lowest'),
-    ('1', 'Low'),
-    ('2', 'Normal'),
-    ('3', 'High'),
-    ('4', 'Highest'),
+    ('0', 'Normal'),
+    ('1', 'High'),
+    ('2', 'Highest'),
 ]
 
 class crm_case_channel(osv.osv):

diff --git a/addons/crm/crm_lead_demo.xml b/addons/crm/crm_lead_demo.xml
index c378508..a76415f 100644 (file)
--- a/addons/crm/crm_lead_demo.xml
+++ b/addons/crm/crm_lead_demo.xml
@@ -54,7 +54,7 @@ Could you please send me the details ?</field>
             <field name="type_id" ref="type_lead7"/>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor2])]"/>
             <field name="channel_id" ref="crm_case_channel_website"/>
-            <field name="priority">4</field>
+            <field name="priority">0</field>
             <field name="section_id" ref="section_sales_department"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="stage_lead1"/>
@@ -104,7 +104,7 @@ Could you please send me the details ?</field>
             <field name="type_id" ref="type_lead8"/>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor5])]"/>
             <field name="channel_id" ref=""/>
-            <field name="priority">3</field>
+            <field name="priority">1</field>
             <field name="section_id" ref="crm_case_section_2"/>
             <field name="user_id" ref="base.user_demo"/>
             <field name="stage_id" ref="stage_lead6"/>
@@ -129,7 +129,7 @@ Could you please send me the details ?</field>
             <field name="type_id" ref="type_lead3"/>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor1])]"/>
             <field name="channel_id" ref="crm_case_channel_website"/>
-            <field name="priority">3</field>
+            <field name="priority">1</field>
             <field name="section_id" ref="crm_case_section_1"/>
             <field name="user_id" ref=""/>
             <field name="stage_id" ref="stage_lead1"/>
@@ -156,7 +156,7 @@ Contact: +1 813 494 5005</field>
             <field name="type_id" ref="type_lead3"/>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor3,categ_oppor4])]"/>
             <field name="channel_id" ref=""/>
-            <field name="priority">3</field>
+            <field name="priority">1</field>
             <field name="section_id" ref="crm_case_section_2"/>
             <field name="user_id" ref=""/>
             <field name="stage_id" ref="stage_lead1"/>
@@ -174,7 +174,7 @@ Contact: +1 813 494 5005</field>
             <field name="type_id" ref="type_lead8"/>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor4])]"/>
             <field name="channel_id" ref=""/>
-            <field name="priority">4</field>
+            <field name="priority">0</field>
             <field name="section_id" ref="crm_case_section_2"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="stage_lead1"/>
@@ -193,7 +193,7 @@ Contact: +1 813 494 5005</field>
             <field name="type_id" ref="type_lead5"/>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor6,categ_oppor8])]"/>
             <field name="channel_id" ref=""/>
-            <field name="priority">4</field>
+            <field name="priority">0</field>
             <field name="section_id" ref="section_sales_department"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="stage_lead1"/>
@@ -253,7 +253,7 @@ Andrew</field>
             <field name="type_id" ref="type_lead3"/>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor7])]"/>
             <field name="channel_id" ref="crm_case_channel_direct"/>
-            <field name="priority">3</field>
+            <field name="priority">1</field>
             <field name="section_id" ref="crm_case_section_1"/>
             <field name="user_id" ref=""/>
             <field name="stage_id" ref="stage_lead1"/>
@@ -331,7 +331,7 @@ Andrew</field>
             <field name="type_id" ref="type_lead3"/>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor2])]"/>
             <field name="channel_id" ref="crm_case_channel_website"/>
-            <field name="priority">3</field>
+            <field name="priority">1</field>
             <field eval="time.strftime('%Y-%m-23')" name="date_deadline"/>
             <field eval="time.strftime('%Y-%m-10')" name="date_action"/>
             <field name="title_action">Send Catalogue by Email</field>
@@ -404,7 +404,7 @@ Andrew</field>
             <field name="type_id" ref="type_lead3"/>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor3,categ_oppor4])]"/>
             <field name="channel_id" ref="crm_case_channel_website"/>
-            <field name="priority">4</field>
+            <field name="priority">0</field>
             <field eval="time.strftime('%Y-%m-8')" name="date_deadline"/>
             <field eval="time.strftime('%Y-%m-3')" name="date_action"/>
             <field name="title_action">Send price list regarding our interventions</field>
@@ -431,7 +431,7 @@ Andrew</field>
             <field name="partner_id" ref="base.res_partner_4"/>
             <field name="type_id" ref="type_lead8"/>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor4,categ_oppor6])]"/>
-            <field name="priority">4</field>
+            <field name="priority">0</field>
             <field eval="time.strftime('%Y-%m-13')" name="date_deadline"/>
             <field eval="time.strftime('%Y-%m-4')" name="date_action"/>
             <field name="title_action">Call to define real needs about training</field>
@@ -492,7 +492,7 @@ Andrew</field>
             <field name="type_id" ref="type_lead2"/>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor7])]"/>
             <field name="channel_id" ref="crm_case_channel_phone"/>
-            <field name="priority">3</field>
+            <field name="priority">1</field>
             <field name="section_id" ref="crm_case_section_2"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="crm.stage_lead4"/>
@@ -510,7 +510,7 @@ Andrew</field>
             <field name="type_id" ref="type_lead7"/>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor3])]"/>
             <field name="channel_id" ref="crm_case_channel_email"/>
-            <field name="priority">3</field>
+            <field name="priority">1</field>
             <field name="section_id" ref="crm_case_section_2"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="crm.stage_lead5"/>
@@ -525,7 +525,7 @@ Andrew</field>
             <field name="type_id" ref="type_lead5"/>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor3])]"/>
             <field name="channel_id" ref="crm_case_channel_direct"/>
-            <field name="priority">4</field>
+            <field name="priority">0</field>
             <field name="section_id" ref="section_sales_department"/>
             <field name="user_id" ref="base.user_demo"/>
             <field name="stage_id" ref="crm.stage_lead5"/>
@@ -543,7 +543,7 @@ Andrew</field>
             <field name="type_id" ref="type_lead8"/>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor7])]"/>
             <field name="channel_id" ref="crm_case_channel_website"/>
-            <field name="priority">4</field>
+            <field name="priority">0</field>
             <field eval="time.strftime('%Y-%m-6')" name="date_deadline"/>
             <field name="section_id" ref="section_sales_department"/>
             <field name="user_id" ref="base.user_root"/>
@@ -588,7 +588,7 @@ Andrew</field>
             <field name="type_id" ref="type_lead3"/>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor2])]"/>
             <field name="channel_id" ref="crm_case_channel_website"/>
-            <field name="priority">3</field>
+            <field name="priority">1</field>
             <field eval="time.strftime('%Y-%m-23')" name="date_deadline"/>
             <field eval="time.strftime('%Y-%m-10')" name="date_action"/>
             <field name="title_action">Send Catalogue by Email</field>

diff --git a/addons/crm/crm_phonecall_demo.xml b/addons/crm/crm_phonecall_demo.xml
index 4002e18..90cda34 100644 (file)
--- a/addons/crm/crm_phonecall_demo.xml
+++ b/addons/crm/crm_phonecall_demo.xml
@@ -6,7 +6,7 @@
         <record id="crm_phonecall_1" model="crm.phonecall">
             <field eval="time.strftime('%Y-%m-04 10:45:36')" name="date"/>
             <field name="partner_id" ref="base.res_partner_11"/>
-            <field eval="'3'" name="priority"/>
+            <field eval="'1'" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="name">Left the message</field>
             <field name="state">done</field>
@@ -19,7 +19,7 @@
         <record id="crm_phonecall_2" model="crm.phonecall">
             <field eval="time.strftime('%Y-%m-11 11:19:25')" name="date"/>
             <field name="partner_id" ref="base.res_partner_7"/>
-            <field eval="'4'" name="priority"/>
+            <field eval="'0'" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="name">Need more information on the proposed deal</field>
             <field name="state">done</field>
@@ -44,7 +44,7 @@
         </record>
         <record id="crm_phonecall_4" model="crm.phonecall">
             <field eval="time.strftime('%Y-%m-21 14:10:23')" name="date"/>
-            <field eval="'3'" name="priority"/>
+            <field eval="'1'" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="name">Wanted information about pricing of laptops</field>
             <field name="state">done</field>
@@ -58,7 +58,7 @@
         <record id="crm_phonecall_5" model="crm.phonecall">
             <field eval="time.strftime('%Y-%m-28 16:20:43')" name="date"/>
             <field name="partner_id" ref="base.res_partner_5"/>
-            <field eval="'3'" name="priority"/>
+            <field eval="'1'" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="name">More information on the proposed deal</field>
             <field name="state">pending</field>
@@ -69,7 +69,7 @@
             <field eval="2.08" name="duration"/>
         </record>
         <record id="crm_phonecall_6" model="crm.phonecall">
-            <field eval="'3'" name="priority"/>
+            <field eval="'1'" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="name">Proposal for discount offer</field>
             <field name="state">open</field>

diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 60f4eca..5b45675 100644 (file)
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -27,11 +27,10 @@ from openerp.tools.translate import _
 from openerp.tools import html2plaintext
 
 AVAILABLE_PRIORITIES = [
-    ('0', 'Not Good'),
-    ('1', 'On Average'),
-    ('2', 'Good'),
-    ('3', 'Very Good'),
-    ('4', 'Excellent')
+    ('0', 'On Average'),
+    ('1', 'Good'),
+    ('2', 'Very Good'),
+    ('3', 'Excellent')
 ]
 
 class hr_recruitment_source(osv.osv):

diff --git a/addons/hr_recruitment/hr_recruitment_demo.xml b/addons/hr_recruitment/hr_recruitment_demo.xml
index 8ba49a2..6c862e3 100644 (file)
--- a/addons/hr_recruitment/hr_recruitment_demo.xml
+++ b/addons/hr_recruitment/hr_recruitment_demo.xml
@@ -75,7 +75,7 @@
         <field name="type_id" ref="degree_licenced"/>
         <field name="categ_ids" eval="[(6,0,[ref('tag_applicant_reserve')])]"/>
         <field name="user_id" ref="base.user_root"/>
-        <field name="priority">4</field>
+        <field name="priority">0</field>
         <field name="partner_name">David Armstrong</field>
         <field name="stage_id" ref="stage_job2"/>
         <field name="partner_phone">33968745</field>

diff --git a/addons/project/project.py b/addons/project/project.py
index c28ace9..29abeb2 100644 (file)
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -753,7 +753,7 @@ class task(osv.osv):
         'active': fields.function(_is_template, store=True, string='Not a Template Task', type='boolean', help="This field is computed automatically and have the same behavior than the boolean 'active' field: if the task is linked to a template or unactivated project, it will be hidden unless specifically asked."),
         'name': fields.char('Task Summary', size=128, required=True, select=True),
         'description': fields.text('Description'),
-        'priority': fields.selection([('0','Very Low'), ('1','Low'), ('2','Medium'), ('3','Important'), ('4','Very important')], 'Priority', select=True),
+        'priority': fields.selection([('0','Medium'), ('1','Important'), ('2','Very important')], 'Priority', select=True),
         'sequence': fields.integer('Sequence', select=True, help="Gives the sequence order when displaying a list of tasks."),
         'stage_id': fields.many2one('project.task.type', 'Stage', track_visibility='onchange',
                         domain="[('project_ids', '=', project_id)]"),

diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index ff225c4..54f78ba 100644 (file)
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -110,7 +110,7 @@
             <field name="planned_hours" eval="40.0"/>
             <field name="remaining_hours" eval="40.0"/>
             <field name="user_id" ref="base.user_demo"/>
-            <field name="priority">4</field>
+            <field name="priority">0</field>
             <field name="project_id" ref="project.project_project_1"/>
             <field name="name">Prepare Requirements Document</field>
             <field name="stage_id" ref="project_tt_analysis"/>
@@ -120,7 +120,7 @@
             <field name="planned_hours" eval="32.0"/>
             <field name="remaining_hours" eval="32.0"/>
             <field name="user_id" ref="base.user_demo"/>
-            <field name="priority">4</field>
+            <field name="priority">0</field>
             <field name="project_id" ref="project.project_project_1"/>
             <field name="name">Make SRS</field>
             <field name="stage_id" ref="project_tt_specification"/>
@@ -129,7 +129,7 @@
             <field name="planned_hours" eval="10.0"/>
             <field name="remaining_hours" eval="10.0"/>
             <field name="user_id" ref="base.user_root"/>
-            <field name="priority">4</field>
+            <field name="priority">0</field>
             <field name="project_id" ref="project.project_project_1"/>
             <field name="name">Budget Planning</field>
             <field name="date_deadline" eval="time.strftime('%Y-%m-24')"/>
@@ -140,7 +140,7 @@
             <field name="planned_hours" eval="60.0"/>
             <field name="remaining_hours" eval="60.0"/>
             <field name="user_id" ref="base.user_demo"/>
-            <field name="priority">4</field>
+            <field name="priority">0</field>
             <field name="project_id" ref="project.project_project_1"/>
             <field name="name">Develop module for Sale Management</field>
             <field name="description">Use the account_budget module</field>

diff --git a/addons/project_issue/project_issue_demo.xml b/addons/project_issue/project_issue_demo.xml
index 29e5b05..4ed2f09 100644 (file)
--- a/addons/project_issue/project_issue_demo.xml
+++ b/addons/project_issue/project_issue_demo.xml
@@ -35,7 +35,7 @@
         <!-- Issues -->
         <record id="crm_case_buginaccountsmodule0" model="project.issue">
             <field eval="time.strftime('%Y-%m-08 10:15:00')" name="date"/>
-            <field name="priority">4</field>
+            <field name="priority">0</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="partner_id" ref="base.res_partner_2"/>
             <field name="section_id" ref="crm.section_sales_department"/>
@@ -51,7 +51,7 @@
 
         <record id="crm_case_programnotgivingproperoutput0" model="project.issue">
             <field eval="time.strftime('%Y-%m-15 12:50:00')" name="date"/>
-            <field name="priority">3</field>
+            <field name="priority">1</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="partner_id" ref="base.res_partner_1"/>
             <field name="section_id" ref="crm.section_sales_department"/>
@@ -64,7 +64,7 @@
 
         <record id="crm_case_outputincorrect0" model="project.issue">
             <field eval="time.strftime('%Y-%m-18 14:30:00')" name="date"/>
-            <field name="priority">4</field>
+            <field name="priority">0</field>
             <field name="user_id" ref="base.user_demo"/>
             <field name="section_id" ref="crm.section_sales_department"/>
             <field eval="1" name="active"/>
@@ -79,7 +79,7 @@
 
         <record id="crm_case_problemloadingpage0" model="project.issue">
             <field eval="time.strftime('%Y-%m-20  15:25:05')" name="date"/>
-            <field name="priority">3</field>
+            <field name="priority">1</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="partner_id" ref="base.res_partner_14"/>
             <field name="section_id" ref="crm.section_sales_department"/>
@@ -92,7 +92,7 @@
 
         <record id="crm_case_pagenotfound0" model="project.issue">
             <field eval="time.strftime('%Y-%m-22  18:15:00')" name="date"/>
-            <field name="priority">3</field>
+            <field name="priority">1</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="partner_id" ref="base.res_partner_13"/>
             <field name="section_id" ref="crm.section_sales_department"/>
@@ -105,7 +105,7 @@
 
         <record id="crm_case_programmingerror0" model="project.issue">
             <field eval="time.strftime('%Y-%m-24  09:45:00')" name="date"/>
-            <field name="priority">3</field>
+            <field name="priority">1</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="partner_id" ref="base.res_partner_5"/>
             <field name="section_id" ref="crm.section_sales_department"/>
@@ -172,7 +172,7 @@
 
         <record id="crm_case_newfeaturestobeadded0" model="project.issue">
             <field eval="time.strftime('%Y-%m-01 12:15:10')" name="date"/>
-            <field name="priority">4</field>
+            <field name="priority">0</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="partner_id" ref="base.res_partner_8"/>
             <field name="section_id" ref="crm.section_sales_department"/>
@@ -199,7 +199,7 @@
 
         <record id="crm_case_includeattendancesheetinproject0" model="project.issue">
             <field eval="time.strftime('%Y-%m-10 17:05:30')" name="date"/>
-            <field name="priority">3</field>
+            <field name="priority">1</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="partner_id" ref="base.res_partner_10"/>
             <field name="section_id" ref="crm.section_sales_department"/>
@@ -213,7 +213,7 @@
 
         <record id="crm_case_createnewobject0" model="project.issue">
             <field eval="time.strftime('%Y-%m-15 10:35:15')" name="date"/>
-            <field name="priority">3</field>
+            <field name="priority">1</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="partner_id" ref="base.res_partner_6"/>
             <field name="section_id" ref="crm.section_sales_department"/>
@@ -226,7 +226,7 @@
 
         <record id="crm_case_improvereportsinhrms0" model="project.issue">
             <field eval="time.strftime('%Y-%m-19 12:15:00')" name="date"/>
-            <field name="priority">4</field>
+            <field name="priority">0</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="partner_id" ref="base.res_partner_11"/>
             <field name="section_id" ref="crm.section_sales_department"/>