[MERGE]:Merged from trunk

bzr revid: apa@tinyerp.com-20100916122504-y7d51oacgt8sbu20

addons/hr/security/ir.model.access.csv

@@ -3,16 +3,18 @@
 "access_hr_employee_user","hr.employee user","model_hr_employee","base.group_hr_user",1,1,1,1
 "access_hr_employee_resource_user","resource.resource.user","resource.model_resource_resource","base.group_hr_user",1,1,1,1
 "access_hr_department_user","hr.department.user","model_hr_department","base.group_hr_user",1,1,1,1
-"access_hr_employee_category_manager","hr.employee.category.manager","model_hr_employee_category","base.group_hr_manager",1,0,0,0
+"access_hr_employee_category_manager","hr.employee.category.manager","model_hr_employee_category","base.group_hr_manager",1,1,1,1
 "access_hr_department_manager","hr.department.manager","model_hr_department","base.group_hr_manager",1,1,1,1
 "access_hr_employee_marital_status","hr.employee.marital.status","model_hr_employee_marital_status","base.group_system",1,1,1,1
 "access_hr_job_user","hr.job user","model_hr_job","base.group_hr_user",1,0,0,0
-"access_hr_employee_category_system","hr.employee.category.system","model_hr_employee_category","base.group_system",1,0,0,0
+"access_hr_employee_category_system","hr.employee.category.system","model_hr_employee_category","base.group_system",1,1,1,1
 "access_hr_employee_manager","hr.employee.manager","model_hr_employee","base.group_hr_manager",1,1,1,1
 "access_hr_employee_resource_manager","resource.resource.manager","resource.model_resource_resource","base.group_hr_manager",1,1,1,1
-"access_hr_department_system","hr.department.system","model_hr_department","base.group_system",1,0,0,0
+"access_hr_department_system","hr.department.system","model_hr_department","base.group_system",1,1,1,1
 "access_hr_res_partner_address","res.partner.address","base.model_res_partner_address","base.group_hr_manager",1,1,1,1
 "access_hr_job_manager","hr.job.manager","model_hr_job","base.group_hr_manager",1,1,1,1
-"access_hr_employee_system","hr.employee.system","model_hr_employee","base.group_system",1,1,1,1
+"access_hr_employee_system","hr.employee.system","model_hr_employee","base.group_system",1,0,0,0
 "access_hr_job_system","hr.job system","model_hr_job","base.group_system",1,0,0,0
-"access_hr_employee_category_system","hr.employee.category.system","model_hr_employee_category","base.group_system",1,0,0,0
+"access_hr_employee_employee","hr.employee.employee","model_hr_employee","base.group_user",1,0,0,0
+"access_hr_employee_category_employee","hr.employee.category.employee","model_hr_employee_category","base.group_user",1,0,0,0
+"access_hr_department_employee","hr.department.employee","model_hr_department","base.group_user",1,0,0,0

addons/hr_timesheet_sheet/__openerp__.py

@@ -56,6 +56,7 @@ The validation can be configured in the company:
         'report/timesheet_report_view.xml',
         'board_hr_timesheet_view.xml',
         'report/hr_timesheet_report_view.xml',
+        'wizard/hr_timesheet_current_view.xml',
     ],
     'demo_xml': ['hr_timesheet_sheet_demo.xml',
 

addons/hr_timesheet_sheet/hr_timesheet_sheet.py

@@ -754,7 +754,7 @@ class res_company(osv.osv):
                  "computation for one sheet. Set this to 0 if you do not want any control."),
     }
     _defaults = {
-        'timesheet_range': lambda *args: 'month',
+        'timesheet_range': lambda *args: 'week',
         'timesheet_max_difference': lambda *args: 0.0
     }
 

addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml

@@ -148,10 +148,10 @@
                     </notebook>
                     <field name="state"/>
                     <group col="4" colspan="2">
-                        <button name="button_confirm" states="draft" string="Confirm" type="object" icon="terp-gtk-jump-to-rtl"/>
+                        <button name="button_confirm" states="draft" string="Confirm" type="object" icon="terp-camera_test"/>
                         <button name="action_set_to_draft" states="done" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
                         <button name="cancel" states="confirm" string="Refuse" type="workflow" icon="gtk-cancel"/>
-                        <button name="done" states="confirm" string="Accept" type="workflow" icon="terp-camera_test"/>
+                        <button name="done" states="confirm" string="Approve" type="workflow" icon="gtk-jump-to"/>
                     </group>
                 </form>
             </field>
@@ -165,7 +165,7 @@
                 <search string="Search Timesheet">
                     <group col="10" colspan="4">
                         <filter icon="terp-document-new" string="In Draft" domain="[('state','in',('draft', 'new'))]" help="Unvalidated Timesheets"/>
-                        <filter icon="terp-gtk-go-back-rtl" string="To Approve" domain="[('state','=','confirm')]" help="Confirmed Timesheets"/>
+                        <filter icon="terp-camera_test" string="To Approve" domain="[('state','=','confirm')]" help="Confirmed Timesheets"/>
                         <separator orientation="vertical"/>
                         <field name="user_id" select="1"/>
                         <field name="date_from"/>
@@ -204,7 +204,7 @@
         <menuitem action="hr_timesheet_sheet.act_hr_timesheet_sheet_form" id="menu_act_project_management_timesheet_sheet_form" parent="base.menu_project_management_time_tracking"
               sequence="5"/>
         <menuitem action="act_hr_timesheet_sheet_form" id="menu_act_hr_timesheet_sheet_form" parent="hr_attendance.menu_hr_time_tracking"
-             sequence="1"/>
+             sequence="2"/>
 
         <!--
             Company inheritancy

addons/hr_timesheet_sheet/security/ir.model.access.csv

@@ -3,6 +3,11 @@
 "access_hr_timesheet_sheet_sheet_day","hr_timesheet_sheet.sheet.day","model_hr_timesheet_sheet_sheet_day","base.group_hr_user",1,1,1,1
 "access_hr_timesheet_sheet_sheet_account","hr_timesheet_sheet.sheet.account","model_hr_timesheet_sheet_sheet_account","base.group_hr_user",1,1,1,1
 "access_hr_timesheet_report","hr.timesheet.report","model_hr_timesheet_report","base.group_hr_manager",1,1,1,1
-"access_hr_timesheet_sheet_sheet_manager","hr_timesheet_sheet.sheet.manager","model_hr_timesheet_sheet_sheet","base.group_hr_manager",1,0,0,0
+"access_hr_timesheet_sheet_sheet_manager","hr_timesheet_sheet.sheet.manager","model_hr_timesheet_sheet_sheet","base.group_hr_manager",1,1,1,1
 "access_hr_timesheet_sheet_sheet_system","hr_timesheet_sheet.sheet.system","model_hr_timesheet_sheet_sheet","base.group_system",1,0,0,0
 "access_timesheet_report_manager","timesheet.report.manager","model_timesheet_report","base.group_hr_manager",1,1,1,1
+"access_hr_timesheet_sheet_sheet_employee","hr_timesheet_sheet.sheet.employee","model_hr_timesheet_sheet_sheet","base.group_user",1,0,0,0
+"access_hr_timesheet_sheet_sheet_day_manager","hr_timesheet_sheet.sheet.day.manager","model_hr_timesheet_sheet_sheet_day","base.group_hr_manager",1,1,1,1
+"access_hr_timesheet_sheet_sheet_account_manager","hr_timesheet_sheet.sheet.account.manager","model_hr_timesheet_sheet_sheet_account","base.group_hr_manager",1,1,1,1
+"access_hr_timesheet_sheet_sheet_day_employee","hr_timesheet_sheet.sheet.day.employee","model_hr_timesheet_sheet_sheet_day","base.group_user",1,0,0,0
+"access_hr_timesheet_sheet_sheet_account_employee","hr_timesheet_sheet.sheet.account.employee","model_hr_timesheet_sheet_sheet_account","base.group_user",1,0,0,0

addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+      <record id="view_hr_timesheet_current_open" model="ir.ui.view">
+        <field name="name">hr_timesheet_current_open.form</field>
+        <field name="model">hr.timesheet.current.open</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Current Timesheet">
+               <separator string="It will open the your current timesheet" colspan="4" />
+               <group colspan="4" col="6">
+                    <button  icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    <button  icon="terp-camera_test" name="open_timesheet" string="Open" type="object"/>
+               </group>
+           </form>
+        </field>
+    </record>
+
+    <record id="action_hr_timesheet_current_open" model="ir.actions.act_window">
+        <field name="name">Current Timesheet</field>
+        <field name="res_model">hr.timesheet.current.open</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="view_id" ref="view_hr_timesheet_current_open"/>
+        <field name="target">new</field>
+    </record>
+
+    <menuitem action="action_hr_timesheet_current_open" icon="STOCK_NEW" id="menu_act_hr_timesheet_sheet_form_my_current" name="Current Timesheet" parent="hr_attendance.menu_hr_time_tracking" sequence="1"/>
+
+    </data>
+</openerp>

addons/idea/idea.py

@@ -167,7 +167,7 @@ class idea_idea(osv.osv):
         'state': fields.selection([('draft', 'Draft'),
             ('open', 'Opened'),
             ('close', 'Accepted'),
-            ('cancel', 'Cancelled')],
+            ('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\'.\

addons/subscription/subscription.py

@@ -53,7 +53,7 @@ class subscription_document_fields(osv.osv):
     _rec_name = 'field'
     _columns = {
         'field': fields.many2one('ir.model.fields', 'Field', domain="[('model_id', '=', parent.model)]", required=True),
-        'value': fields.selection([('false','False'),('date','Current Date')], 'Default Value', size=40),
+        'value': fields.selection([('false','False'),('date','Current Date')], 'Default Value', size=40, help="User can set new values for the field when new document is generated"),
         'document_id': fields.many2one('subscription.document', 'Subscription Document', ondelete='cascade'),
     }
     _defaults = {}
@@ -77,9 +77,9 @@ class subscription_subscription(osv.osv):
         'exec_init': fields.integer('Number of documents'),
         'date_init': fields.datetime('First Date'),
         'state': fields.selection([('draft','Draft'),('running','Running'),('done','Done')], 'State'),
-        'doc_source': fields.reference('Source Document', required=True, selection=_get_document_types, size=128),
+        'doc_source': fields.reference('Source Document', required=True, selection=_get_document_types, size=128, help="User can choose the source document on which he wants to create documents"),
         'doc_lines': fields.one2many('subscription.subscription.history', 'subscription_id', 'Documents created', readonly=True),
-        'cron_id': fields.many2one('ir.cron', 'Cron Job'),
+        'cron_id': fields.many2one('ir.cron', 'Cron Job', help="Scheduler which run on subscription"),
         'note': fields.text('Notes', help="Description or Summary of Subscription"),
     }
     _defaults = {

addons/subscription/subscription_view.xml

@@ -101,7 +101,7 @@
         </record>
 
         <record id="action_subscription_form" model="ir.actions.act_window">
-            <field name="name">All Subscriptions</field>
+            <field name="name">Subscriptions</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">subscription.subscription</field>
             <field name="view_type">form</field>

addons/survey/security/ir.model.access.csv

@@ -24,7 +24,7 @@
 "access_survey_tbl_column_heading_manager","survey.tbl.column.heading manager","model_survey_tbl_column_heading","base.group_tool_manager",1,1,1,1
 "access_survey_tbl_column_heading_user","survey.tbl.column.heading user","model_survey_tbl_column_heading","base.group_tool_user",1,1,1,1
 "access_survey_response_line_manager","survey.response.line manager","model_survey_response_line","base.group_tool_manager",1,1,1,1
-"access_survey_response_line_manager","survey.response.line manager","model_survey_response_line","base.group_tool_user",1,1,1,1
+"access_survey_response_line_user","survey.response.line user","model_survey_response_line","base.group_tool_user",1,1,1,1
 "access_survey_type","survey.type","model_survey_type","base.group_hr_manager",1,1,1,1
 "access_survey","survey","model_survey","base.group_hr_manager",1,1,1,1
 "access_survey_history_manager","survey.history","model_survey_history","base.group_hr_manager",1,1,1,1
@@ -44,4 +44,8 @@
 "access_survey_history_system","survey.history.system","model_survey_history","base.group_system",1,0,0,0
 "access_survey_answer_system","survey.answer system","model_survey_answer","base.group_system",1,0,0,0
 "access_survey_answer_base_user","survey.answer.base.user","model_survey_answer","base.group_user",1,1,1,1
-"access_survey_question_base_user","survey.question.base.user","model_survey_question","base.group_user",1,1,1,
+"access_survey_question_base_user","survey.question.base.user","model_survey_question","base.group_user",1,1,1,1
+"access_survey_res_partner_address_user","survey.res.partner.address.user","base.model_res_partner_address","base.group_tool_user",1,1,1,0
+"access_survey_request_employee","survey.request.employee","model_survey_request","base.group_user",1,0,0,0
+"access_survey_response_employee","survey.response employee","model_survey_response","base.group_user",1,0,0,0
+"access_survey_employee","survey.employee","model_survey","base.group_user",1,0,0,0

addons/survey/survey.py

@@ -60,7 +60,7 @@ class survey(osv.osv):
         'response_user': fields.integer('Maximum Answer per User',
                      help="Set to one if  you require only one Answer per user"),
         'state': fields.selection([('draft', 'Draft'), ('open', 'Open'), ('close', 'Closed'), ('cancel', 'Cancelled')], 'Status', readonly=True),
-        'responsible_id': fields.many2one('res.users', 'Responsible'),
+        'responsible_id': fields.many2one('res.users', 'Responsible', help="User responsible for survey"),
         'tot_start_survey': fields.integer("Total Started Survey", readonly=1),
         'tot_comp_survey': fields.integer("Total Completed Survey", readonly=1),
         'note': fields.text('Description', size=128),

addons/survey/survey_view.xml

@@ -476,7 +476,6 @@
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="20">
                         <filter string="Survey" icon="terp-stock_align_left_24" domain="[]"  context="{'group_by':'survey_id'}"/>
-                        <filter string="Page" icon="terp-stock_align_left_24" domain="[]"  context="{'group_by':'title'}"/>                        
                     </group>
                 </search>
             </field>
@@ -1106,7 +1105,7 @@
                     <group expand="0" string="Group By..." colspan="4" col="20">
 	                    <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <separator orientation="vertical"/>
-	                    <filter string="Survey" icon="terp-stock_symbol-selection" domain="[]"  context="{'group_by':'survey_id'}"/>
+	                    <filter string="Survey" icon="terp-stock_align_left_24" domain="[]"  context="{'group_by':'survey_id'}"/>
                         <separator orientation="vertical"/>
 	                    <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]"  context="{'group_by':'state'}"/>
                     </group>
@@ -1119,6 +1118,7 @@
             <field name="res_model">survey.request</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="domain">[('user_id','=',uid)]</field>
             <field name="view_id" ref="survey_request_tree"></field>
             <field name="search_view_id" ref="survey_request_search"/>
         </record>