Merge lp:~openerp-commiter/openobject-addons/trunk-rme into lp:~openerp-dev/openobject-addons/trunk-dev-addons1

[Ravindra Mekhiya(OpenERP)]

Hello,
Changes applied in the following modules,

anonymization : usability issue [FIX],
idea : usability issue [FIX],
subscription : usability issue [FIX].

-Also fixes of lp bugs + IMP

-Bug : 718600 - Access rights having problem so that dash board not available in web-client.

-crm.case.stages search view implemented.

Thanks.

[tfr (Openerp) (tfr)]

Can you complete the information about usability issues that are fix ?

review: Needs Information

[Ravindra Mekhiya(OpenERP) (rme-openerp)]

> Can you complete the information about usability issues that are fix ?

-buttons having wrong name or having wrong icon.
-In list view icon implementation wrong.
-Bit confusing implementation of icon between close & cancel.
-alignment problem.

Let me know if I am wrong !

Thanks.

[tfr (Openerp) (tfr)]

trunk-dev-addons1 is deprecated, so if the merge still important make it for the trunk

=== modified file 'anonymization/anonymization_view.xml'
--- anonymization/anonymization_view.xml	2011-01-07 15:31:06 +0000
+++ anonymization/anonymization_view.xml	2011-02-16 11:28:13 +0000
@@ -19,7 +19,7 @@
                            domain="[('model_id','=',model_id), ('ttype', 'not in', ['function', 'binary', 'many2many', 'many2one', 'one2many', 'reference'])]" />
                     <field name="field_name" select="1" on_change="onchange_field_name(field_name, model_name)" />
                 </group>
-                <field name="state" />
+                <field name="state" string="State"/>
             </form>
         </field>
     </record>
@@ -34,7 +34,7 @@
                 <field name="model_name" />
                 <field name="field_id" />
                 <field name="field_name" />
-                <field name="state" />
+                <field name="state" string="State"/>
             </tree>
         </field>
     </record>

=== modified file 'auction/auction_view.xml'
--- auction/auction_view.xml	2011-01-14 00:11:01 +0000
+++ auction/auction_view.xml	2011-02-16 11:28:13 +0000
@@ -588,7 +588,7 @@
         <field name="model">auction.deposit</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="">
+            <tree string="Deposits">
                 <field name="name"/>
                 <field name="partner_id"/>
                 <field name="date_dep"/>

=== modified file 'base_calendar/base_calendar.py'
--- base_calendar/base_calendar.py	2011-02-14 11:45:07 +0000
+++ base_calendar/base_calendar.py	2011-02-16 11:28:13 +0000
@@ -321,7 +321,7 @@
     _columns = {
         'cutype': fields.selection([('individual', 'Individual'), \
                     ('group', 'Group'), ('resource', 'Resource'), \
-                    ('room', 'Room'), ('unknown', '') ], \
+                    ('room', 'Room'), ('unknown', 'Unknown') ], \
                     'Invite Type', help="Specify the type of Invitation"),
         'member': fields.char('Member', size=124,
                     help="Indicate the groups that the attendee belongs to"),

=== modified file 'base_calendar/base_calendar_view.xml'
--- base_calendar/base_calendar_view.xml	2011-01-18 22:35:02 +0000
+++ base_calendar/base_calendar_view.xml	2011-02-16 11:28:13 +0000
@@ -78,6 +78,7 @@
                     <field name="sent_by_uid" string="Invitation From" />
                     <field name="role" string="My Role"/>
                     <field name="user_id" invisible="1"/>
+                    <field name="partner_address_id" string="Contact" invisible="1"/>
                     <field name="cutype" string="Invitation type"/>
                     <field name="state" />
                     <field name="rsvp" string="Required to Join"/>
@@ -286,6 +287,8 @@
                             <field name="attendee_ids" colspan="4"
                                 nolabel="1" widget="one2many" mode="tree,form">
                                 <tree string="Invitation details" editable="top">
+                                	<field name="sent_by_uid" string="From"/>
+                                	<field name="user_id" string="To"/>
                                     <field name="email" />
                                     <field name="role" width="200" select="1" />
                                     <field name="state" />

=== modified file 'crm/crm_lead.py'
--- crm/crm_lead.py	2011-01-27 12:58:29 +0000
+++ crm/crm_lead.py	2011-02-16 11:28:13 +0000
@@ -146,7 +146,7 @@
         'state': fields.selection(crm.AVAILABLE_STATES, 'State', size=16, readonly=True,
                                   help='The state is set to \'Draft\', when a case is created.\
                                   \nIf the case is in progress the state is set to \'Open\'.\
-                                  \nWhen the case is over, the state is set to \'Done\'.\
+                                  \nWhen the case is over, the state is set to \'Closed\'.\
                                   \nIf the case needs to be reviewed then the state is set to \'Pending\'.'), 
         'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('model','=',_name)]),
     }

=== modified file 'crm/crm_lead_view.xml'
--- crm/crm_lead_view.xml	2011-01-14 00:11:01 +0000
+++ crm/crm_lead_view.xml	2011-02-16 11:28:13 +0000
@@ -2,15 +2,36 @@
 <openerp>
 <data>
 
-    <!--Lead Stage Form view -->
+    
+
+	      
+		<!-- CRM Satges Search View -->
+         
+         <record id="crm_case_stage_search" model="ir.ui.view">
+            <field name="name">stage.search</field>
+            <field name="model">crm.case.stage</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="stage Search">
+                    <filter icon="terp-personal" name="lead"
+                        string="Lead" domain="[('type', '=', 'lead')]"/>
+                    <filter icon="terp-personal+" name="opportunity"
+                        string="Opportunity" domain="[('type', '=', 'opportunity')]"/>
+                    <separator orientation="vertical"/>
+                    <field name="name"/>
+                </search>
+            </field>
+        </record>
+	
+	
 
     <record id="crm_lead_stage_act" model="ir.actions.act_window">
         <field name="name">Stages</field>
         <field name="res_model">crm.case.stage</field>
         <field name="view_type">form</field>
         <field name="view_id" ref="crm.crm_case_stage_tree"/>
-        <field name="domain">[('type', '=', 'lead')]</field>
-        <field name="context">{'type':'lead'}</field>
+        <field name="context">{'type':'lead','search_default_lead':1}</field>
+        <field name="search_view_id" ref="crm_case_stage_search"/>
         <field name="help">Add specific stages to leads and opportunities allowing your sales to better organise their sales pipeline. Stages will allow them to easily track how a specific lead or opportunity is positioned in the sales cycle.</field>
     </record>
     

=== modified file 'crm/crm_opportunity_view.xml'
--- crm/crm_opportunity_view.xml	2011-01-14 00:11:01 +0000
+++ crm/crm_opportunity_view.xml	2011-02-16 11:28:13 +0000
@@ -1,22 +1,6 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-    
-    <record id="crm_opportunity_stage_act" model="ir.actions.act_window">
-        <field name="name">Stages</field>
-        <field name="res_model">crm.case.stage</field>
-        <field name="view_type">form</field>
-        <field name="view_id" ref="crm.crm_case_stage_tree"/>
-        <field name="domain">[('type', '=', 'opportunity')]</field>
-        <field name="context">{'type':'opportunity'}</field>
-        <field name="help">Create specific stages that will help your sales better organise their sales pipeline by maintaining them to their sales opportunities. It will allow them to easily track how is positioned a specific opportunity in the sales cycle.</field>
-    </record>
-    
-
-
-     <menuitem action="crm_opportunity_stage_act" id="menu_crm_opportunity_stage_act" name="Stages"
-        groups="base.group_extended" sequence="0"
-        parent="base.menu_crm_config_opportunity" />
         
         <!-- Opportunities Form View -->
             <record model="ir.ui.view" id="crm_case_form_view_oppor">

=== modified file 'crm/crm_phonecall_view.xml'
--- crm/crm_phonecall_view.xml	2011-01-17 22:22:19 +0000
+++ crm/crm_phonecall_view.xml	2011-02-16 11:28:13 +0000
@@ -60,7 +60,7 @@
             <form string="Phone Call">
                  <group colspan="6" col="7">
                     <field name="name" required="1"/>
-                    <field name="partner_phone"/>
+                    <field name="partner_phone" required="1"/>
                     <field name="duration" widget="float_time" required="1"/>
                     <button string="Schedule a Meeting" name="action_make_meeting" icon="gtk-redo" type="object"/>
 

=== modified file 'document/security/ir.model.access.csv'
--- document/security/ir.model.access.csv	2011-01-14 00:11:01 +0000
+++ document/security/ir.model.access.csv	2011-02-16 11:28:13 +0000
@@ -2,10 +2,8 @@
 "access_document_directory_all","document.directory all","model_document_directory",,1,0,0,0
 "access_document_directory_group_document_manager","document.directory document manager","model_document_directory","base.group_system",1,1,1,1
 "access_document_directory_group_knowledge","document.directory modify","model_document_directory","base.group_document_user",1,1,1,1
-"access_document_directory_group_system","document.directory group system","model_document_directory","base.group_system",1,1,1,1
 "access_document_directory_content_all","document.directory.content all","model_document_directory_content",,1,0,0,0
 "access_document_directory_content_group_document_manager","document.directory.content document manager","model_document_directory_content","base.group_system",1,1,1,1
-"access_document_directory_content_group_system","document.directory.content group system","model_document_directory_content","base.group_system",1,1,1,1
 "access_document_directory_content_type_group_document_manager","document.directory.content.type document manager","model_document_directory_content_type","base.group_system",1,1,1,1
 "access_document_directory_content_type_group_system","document.directory.content.type group system","model_document_directory_content_type","base.group_user",1,0,0,0
 "access_document_storage_group_document_manager","document.storage document manager","model_document_storage","base.group_system",1,1,1,1
@@ -16,13 +14,11 @@
 "access_res_partner_group_user","res.partner user","base.model_res_partner","base.group_document_user",1,1,1,1
 "access_document_directory_dctx_all","document.directory.dctx all","model_document_directory_dctx",,1,0,0,0
 "access_document_directory_dctx_group_document_manager","document.directory.dctx document manager","model_document_directory_dctx","base.group_system",1,1,1,1
-"access_document_directory_dctx_group_system","document.directory.dctx group system","model_document_directory_dctx","base.group_system",1,1,1,1
 "access_report_document_user_group_document_manager","report.document.user document manager","model_report_document_user","base.group_system",1,0,0,0
-"access_report_document_user_group_system","report.document.user group system","model_report_document_user","base.group_system",1,0,0,0
 "access_report_files_partner_group_document_manager","report.files.partner document manager","model_report_files_partner","base.group_system",1,0,0,0
-"access_report_files_partner_group_system","report.files.partner group system","model_report_files_partner","base.group_system",1,0,0,0
 "access_report_document_file_group_document_manager","report.document.file document manager","model_report_document_file","base.group_system",1,0,0,0
-"access_report_document_file_group_system","report.document.file group system","model_report_document_file","base.group_system",1,0,0,0
 "access_report_document_wall_group_document_manager","report.document.wall document manager","model_report_document_wall","base.group_system",1,0,0,0
-"access_report_document_wall_group_system","report.document.wall group system","model_report_document_wall","base.group_system",1,0,0,0
+"access_report_files_partner_group_document","report.files.partner document manager","model_report_files_partner","base.group_document_user",1,0,0,0
+"access_report_document_file_group_document","report.document.file document manager","model_report_document_file","base.group_document_user",1,0,0,0
+"access_report_document_wall_group_document","report.document.wall document manager","model_report_document_wall","base.group_document_user",1,0,0,0
 "access_report_document_user_knowledgeuser","report.document.user knowledgeuser","document.model_report_document_user","base.group_document_user",1,0,0,0

=== modified file 'idea/idea.py'
--- idea/idea.py	2011-01-14 00:11:01 +0000
+++ idea/idea.py	2011-02-16 11:28:13 +0000
@@ -169,8 +169,7 @@
             ('close', 'Accepted'),
             ('cancel', 'Refused')],
             'State', readonly=True,
-            help='When the Idea is created the state is \'Draft\'.\n It is \
-            opened by the user, the state is \'Opened\'.\
+            help='When the Idea is created the state is \'Draft\'.\nIt is opened by the user, the state is \'Opened\'.\
             \nIf the idea is accepted, the state is \'Accepted\'.'
         ),
         'visibility':fields.boolean('Open Idea?', required=False),

=== modified file 'project/project.py'
--- project/project.py	2011-01-18 22:45:39 +0000
+++ project/project.py	2011-02-16 11:28:13 +0000
@@ -134,22 +134,13 @@
                 'project.project': (lambda self, cr, uid, ids, c={}: ids, ['tasks'], 10),
                 'project.task': (_get_project_task, ['planned_hours', 'effective_hours', 'remaining_hours', 'total_hours', 'progress', 'delay_hours','state'], 10),
             }),
-        'effective_hours': fields.function(_progress_rate, multi="progress", method=True, string='Time Spent', help="Sum of spent hours of all tasks related to this project and its child projects.",
-            store = {
-                'project.project': (lambda self, cr, uid, ids, c={}: ids, ['tasks'], 10),
-                'project.task': (_get_project_task, ['planned_hours', 'effective_hours', 'remaining_hours', 'total_hours', 'progress', 'delay_hours','state'], 10),
-            }),
+        'effective_hours': fields.function(_progress_rate, multi="progress", method=True, string='Time Spent', help="Sum of spent hours of all tasks related to this project and its child projects."),
         'total_hours': fields.function(_progress_rate, multi="progress", method=True, string='Total Time', help="Sum of total hours of all tasks related to this project and its child projects.",
             store = {
                 'project.project': (lambda self, cr, uid, ids, c={}: ids, ['tasks'], 10),
                 'project.task': (_get_project_task, ['planned_hours', 'effective_hours', 'remaining_hours', 'total_hours', 'progress', 'delay_hours','state'], 10),
             }),
-        'progress_rate': fields.function(_progress_rate, multi="progress", method=True, string='Progress', type='float', group_operator="avg", help="Percent of tasks closed according to the total of tasks todo.",
-            store = {
-                'project.project': (lambda self, cr, uid, ids, c={}: ids, ['tasks'], 10),
-                'project.task': (_get_project_task, ['planned_hours', 'effective_hours', 'remaining_hours', 'total_hours', 'progress', 'delay_hours','state'], 10),
-                'project.task.work': (_get_project_work, ['hours'], 10),
-            }),
+        'progress_rate': fields.function(_progress_rate, multi="progress", method=True, string='Progress', type='float', group_operator="avg", help="Percent of tasks closed according to the total of tasks todo."),
         'warn_customer': fields.boolean('Warn Partner', help="If you check this, the user will have a popup when closing a task that propose a message to send by email to the customer.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'warn_header': fields.text('Mail Header', help="Header added at the beginning of the email for the warning message sent to the customer when a task is closed.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'warn_footer': fields.text('Mail Footer', help="Footer added at the beginning of the email for the warning message sent to the customer when a task is closed.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),

=== modified file 'purchase/report/__init__.py'
--- purchase/report/__init__.py	2011-01-14 00:11:01 +0000
+++ purchase/report/__init__.py	2011-02-16 11:28:13 +0000
@@ -22,6 +22,7 @@
 import order
 import request_quotation
 import purchase_report
+import test
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

=== modified file 'resource/resource_view.xml'
--- resource/resource_view.xml	2011-01-14 00:11:01 +0000
+++ resource/resource_view.xml	2011-02-16 11:28:13 +0000
@@ -218,20 +218,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Leave Detail">
-                    <group colspan="4" col="6">
-                       <group colspan="2" col="2">
-                           <field name="resource_id" on_change="onchange_resource(resource_id)"/>
-                           <field name="name" string="Reason"/>
-                       </group>
-                       <group colspan="2" col="2">
-                           <field name="date_from"/>
-                           <field name="calendar_id" string="Working Period" readonly='1'/>
-                           <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                       </group>
-                       <group colspan="2" col="2">
-                           <field name="date_to"/>
-                       </group>
-                   </group>
+	                <field name="resource_id" on_change="onchange_resource(resource_id)"/>
+	                <field name="name" string="Reason"/>
+	                <newline/>       
+	                <field name="date_from"/>
+	                <field name="date_to" />
+	                <newline/>
+	                <field name="calendar_id" string="Working Period" readonly='1'/>
+	                <field name="company_id" widget="selection" groups="base.group_multi_company" />
                 </form>
             </field>
         </record>

=== modified file 'subscription/subscription_view.xml'
--- subscription/subscription_view.xml	2011-01-14 00:11:01 +0000
+++ subscription/subscription_view.xml	2011-02-16 11:28:13 +0000
@@ -62,9 +62,10 @@
                     <field name="active" groups="base.group_extended"/>
                     <field name="user_id" select="1"/>
                     <field name="state"/>
-                    <button name="set_process" states="draft" string="Process" type="object" icon="terp-check"/>
-                    <button name="set_done" states="running" string="Done" type="object" icon="terp-gtk-stop"/>
-                    <button name="set_draft" states="done" string="Set to Draft" type="object" icon="terp-document-new"/>
+                    <button name="set_process" states="draft" string="Process" type="object" icon="gtk-go-forward"/>
+                    <button name="set_done" states="running" string="Stop" type="object" icon="gtk-stop"/>
+                    <button name="set_draft" states="done" string="Set to Draft" type="object" icon="gtk-convert"/>
+
                 </tree>
             </field>
         </record>

=== modified file 'survey/survey_view.xml'
--- survey/survey_view.xml	2011-01-14 00:11:01 +0000
+++ survey/survey_view.xml	2011-02-16 11:28:13 +0000
@@ -1026,7 +1026,7 @@
                     <field name="in_visible_menu_choice" invisible="1"/>
                     <group colspan="4" attrs="{'invisible':[('in_visible_rating_weight','!=',False)]}">
                         <field name="rating_weight"/>
-                        <label align="0.0" string="Use if question type is rating_scale" />
+                        <label align="0.0" string="Use if question type is rating scale" />
                     </group>
                     <group colspan="4" attrs="{'invisible':[('in_visible_menu_choice','!=',False)]}">
                         <separator string="Menu Choices (each choice on separate lines)" colspan="4"/>