Merge lp:~openerp-commiter/openobject-addons/filter-addons-pso into lp:~openerp/openobject-addons/old_trunk

[Priyesh (OpenERP)]

[Priyesh (OpenERP) (pso-openerp)]

Create an onchange event on section_id of holiday_status of hr_holidays module.
Changes in hr_contract module.
modification in crm_configuration module.

[lp:~openerp-commiter/openobject-addons/filter-addons-pso]

2031. By Priyesh (OpenERP) on 2009-04-27

put onchange event on date_from field of hr_holidays

Unmerged revisions

2075. By pso (Open ERP) <email address hidden> on 2009-10-06

merge

2074. By pso (Open ERP) <email address hidden> on 2009-09-22

merge

2073. By pso (Open ERP) <email address hidden> on 2009-09-07

merge

2072. By pso (Open ERP) <email address hidden> on 2009-08-20

merge

2071. By pso (Open ERP) <email address hidden> on 2009-08-07

merge

2070. By Priyesh (OpenERP) on 2009-07-22

merge

2069. By Priyesh (OpenERP) on 2009-07-03

merge

2068. By Priyesh (OpenERP) on 2009-06-29

merge

=== modified file 'base_report_creator/base_report_creator.py'
--- base_report_creator/base_report_creator.py	2009-03-27 16:26:22 +0000
+++ base_report_creator/base_report_creator.py	2009-03-31 12:46:02 +0000
@@ -258,7 +258,7 @@
             if check<>False:
                 fields.insert(0,(check+' as id'))
             result[obj.id] = """select
-%s
+%s 
 from
 %s
             """ % (',\n'.join(fields), models)

=== modified file 'hr_contract/hr_contract.py'
--- hr_contract/hr_contract.py	2009-03-04 13:32:36 +0000
+++ hr_contract/hr_contract.py	2009-04-23 06:46:55 +0000
@@ -86,14 +86,13 @@
         'function' : fields.many2one('res.partner.function', 'Function'),
         'date_start' : fields.date('Start Date', required=True),
         'date_end' : fields.date('End Date'),
-        'working_hours_per_day' : fields.integer('Working hours per day'),
+        'working_hours_per_day_id' : fields.many2one('hr.timesheet.group', 'Working hours per day'),
         'wage_type_id' : fields.many2one('hr.contract.wage.type', 'Wage Type', required=True),
         'wage' : fields.float('Wage', required=True),
         'notes' : fields.text('Notes'),
     }
     _defaults = {
         'date_start' : lambda *a : time.strftime("%Y-%m-%d"),
-        'working_hours_per_day' : lambda *a : 8,
     }
 hr_contract()
 

=== modified file 'hr_contract/hr_contract_view.xml'
--- hr_contract/hr_contract_view.xml	2009-03-04 13:32:36 +0000
+++ hr_contract/hr_contract_view.xml	2009-04-23 06:46:55 +0000
@@ -83,7 +83,7 @@
                                 <field name="function"/>
                                 <field name="date_start"/>
                                 <field name="date_end"/>
-                                <field name="working_hours_per_day"/>
+                                <field name="working_hours_per_day_id"/>
                                 <field name="wage_type_id"/>
                                 <field name="wage"/>
                             </tree>
@@ -94,7 +94,7 @@
                                 <newline/>
                                 <separator colspan="4" string="Contract Duration"/>
                                 <field name="function"/>
-                                <field name="working_hours_per_day"/>
+                                <field name="working_hours_per_day_id"/>
                                 <field name="date_start" select="1"/>
                                 <field name="date_end" select="1"/>
                                 
@@ -155,7 +155,7 @@
                     <separator colspan="4" string="Contract Duration"/>
                     <field name="date_start" select="1"/>
                     <field name="date_end" select="1"/>
-                    <field name="working_hours_per_day"/>
+                    <field name="working_hours_per_day_id"/>
                     <newline/>
                     
                     <separator colspan="4" string="Remuneration"/>
@@ -189,7 +189,7 @@
                     <field name="function"/>
                     <field name="date_start"/>
                     <field name="date_end"/>
-                    <field name="working_hours_per_day"/>
+                    <field name="working_hours_per_day_id"/>
                     <field name="wage_type_id"/>
                     <field name="wage"/>
                 </tree>
@@ -200,11 +200,12 @@
             <field name="name">Contract</field>
             <field name="res_model">hr.contract</field>
             <field name="view_type">form</field>
-            <field name="view_mode">form,tree</field>
+            <field name="view_mode">tree,form</field>
             <field name="domain">[]</field>
         </record>
         
-        <menuitem action="action_hr_contract" id="hr_menu_contract" parent="hr.menu_hr_root"/>
+        <menuitem name="Contract" id="menu_hr_contract" parent="hr.menu_hr_root"/>
+        <menuitem action="action_hr_contract" id="hr_menu_contract" parent="menu_hr_contract"/>
         
     </data>
 </openerp>

=== modified file 'hr_holidays/hr.py'
--- hr_holidays/hr.py	2009-03-19 15:56:46 +0000
+++ hr_holidays/hr.py	2009-04-24 12:10:44 +0000
@@ -107,6 +107,17 @@
 class hr_holidays(osv.osv):
     _name = "hr.holidays"
     _description = "Holidays"
+    
+    def _get_days(self, cr, uid, ids, field_name, arg=None, context={}):
+        result = {}
+        for holidays_obj in self.browse(cr, uid, ids):
+            if holidays_obj.date_from and holidays_obj.date_to:
+                diffDate = datetime.datetime(*time.strptime(holidays_obj.date_to,'%Y-%m-%d %H:%M:%S')[:5]) - datetime.datetime(*time.strptime(holidays_obj.date_from,'%Y-%m-%d %H:%M:%S')[:5])
+                qty = diffDate.days 
+                result[holidays_obj.id] = qty + 1
+            else:
+                result[holidays_obj.id] = 0.0
+        return result
 
     _columns = {
         'name' : fields.char('Description', required=True, readonly=True, size=64, states={'draft':[('readonly',False)]}),
@@ -118,7 +129,7 @@
         'user_id':fields.many2one('res.users', 'Employee_id', states={'draft':[('readonly',False)]}, select=True, readonly=True),
         'manager_id' : fields.many2one('hr.employee', 'Holiday manager', invisible=False, readonly=True),
         'notes' : fields.text('Notes',readonly=True, states={'draft':[('readonly',False)]}),
-        'number_of_days': fields.float('Number of Days in this Holiday Request', required=True, readonly=True, states={'draft': [('readonly', False)]}),
+        'number_of_days': fields.function(_get_days, method=True, string='Number of Days in this Holiday Request', type='float'),
         'case_id': fields.many2one('crm.case', 'Case'),
         'holiday_user_id': fields.many2one('hr.holidays.per.user', 'Holiday per user')
     }
@@ -132,14 +143,25 @@
 
     def _check_date(self, cr, uid, ids):
         if ids:
-            cr.execute('select number_of_days from hr_holidays where id in ('+','.join(map(str, ids))+')')
-            res =  cr.fetchall()
-            if res and res[0][0] < 0:
-                return False
+            res = self.read(cr, uid, ids, ['number_of_days'])
+            for i in res:
+                if i['number_of_days']  <= 0:
+                    return False
         return True
 
     _constraints = [(_check_date, 'Start date should not be larger than end date! ', ['number_of_days'])]
 
+    def onchange_sec_id(self, cr, uid, ids, status, context={}):
+        warning = {}
+        if status:
+            brows_obj = self.pool.get('hr.holidays.status').browse(cr, uid, [status])[0]
+            if not brows_obj.section_id.allow_unlink:
+                warning = {
+                    'title': "Warning for ",
+                    'message': "You won\'t be able to cancel a validated holiday. you did not select the 'allow_unlink' field"
+                        }
+        return {'warning': warning}
+
     def create(self, cr, uid, vals, *args, **kwargs):
         id_holiday = super(hr_holidays, self).create(cr, uid, vals, *args, **kwargs)
         self._create_holiday(cr, uid, [id_holiday])
@@ -157,27 +179,14 @@
         holidays_user_obj.write(cr, uid, ids_user_hdays, {'holiday_ids': [(6, 0, list_holiday)]})
         return True
 
-    def onchange_date_to(self, cr, uid, ids, date_from, date_to):
-        result = {}
-        if date_from:
-            if date_to:
-                from_dt = time.mktime(time.strptime(date_from,'%Y-%m-%d %H:%M:%S'))
-                to_dt = time.mktime(time.strptime(date_to,'%Y-%m-%d %H:%M:%S'))
-                diff_day = (to_dt-from_dt)/(3600*24)
-                result['value'] = {
-                    'number_of_days': round(diff_day)+1
-                }
-                return result
-        result['value'] = {
-            'number_of_days': 0
-        }
-        return result
-
     def set_to_draft(self, cr, uid, ids, *args):
         self.write(cr, uid, ids, {
             'state':'draft',
             'manager_id': False
         })
+        wf_service = netsvc.LocalService("workflow")
+        for holiday_id in ids:
+            wf_service.trg_create(uid, 'hr.holidays', holiday_id, cr)
         self._create_holiday(cr, uid, ids)
         return True
 
@@ -283,4 +292,31 @@
         return True
 hr_holidays()
 
+class holiday_user_log(osv.osv):
+    _name = 'hr.holidays.log'
+    _description = 'hr.holidays.log'
+    _order = "holiday_req_id desc"
+    _columns = {
+        'name' : fields.char('Action', size=64, readonly=True),
+        'holiday_req_id' : fields.char('Holiday Request ID', size=64),
+        'nb_holidays' : fields.float('Number of Holidays Requested'),
+        'employee_id' : fields.many2one('hr.employee', 'Employee', readonly=True),
+        'holiday_status' : fields.many2one("hr.holidays.status", "Holiday's Status", readonly=True),
+        'holiday_user_id' : fields.many2one('hr.holidays.per.user', 'Holidays user'),
+        'date': fields.datetime('Date'),
+                }
+    _defaults = {
+        'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
+    }
+holiday_user_log()
+
+class hr_employee(osv.osv):
+    _description ='Employees'
+    _name='hr.employee'
+    _inherit='hr.employee'
+    _columns = {
+         'log_ids' : fields.many2many('hr.holidays.log', 'hr_employee_holiday_log', 'emp_id', 'log_id', 'Holiday log'),
+        }
+hr_employee()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== modified file 'hr_holidays/hr_view.xml'
--- hr_holidays/hr_view.xml	2009-04-17 10:37:08 +0000
+++ hr_holidays/hr_view.xml	2009-04-24 12:10:44 +0000
@@ -10,9 +10,9 @@
             <field name="arch" type="xml">
                 <form string="Employee Holidays">
                     <field name="name" select="1"/>
-                    <field name="holiday_status" select="1"/>
+                    <field name="holiday_status" select="1" on_change="onchange_sec_id(holiday_status)"/>
                     <field name="date_from" select="1"/>
-                    <field name="date_to" select="1" on_change="onchange_date_to(date_from, date_to)"/>
+                    <field name="date_to" select="1" />
                     <notebook colspan="4">
                         <page string="General">
                             <field name="employee_id" select="1" />
@@ -272,6 +272,59 @@
             res_model="hr.holidays"
             src_model="hr.employee"
             id="act_hr_employee_holiday_request"/>
+            
+    <!--
+		Holiday Log
+	-->
+        
+        <record model="ir.ui.view" id="view_employee_log_form">
+            <field name="name">hr.employee.form</field>
+            <field name="model">hr.employee</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="hr.view_employee_form"/>
+            <field name="arch" type="xml">
+                <notebook position="inside">
+                    <page string="Holiday Log">
+                    	<separator colspan="4" string="Holiday logs"/>
+                        <field colspan="4" name="log_ids" nolabel="1"/>
+                    </page>
+                </notebook>
+            </field>
+    	</record>
+        
+		<record model="ir.ui.view" id="view_holidays_log_form">
+            <field name="name">hr.holidays.log.form</field>
+            <field name="model">hr.holidays.log</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Holidays log">
+                    <field name="name" select="1"/>
+                    <field name="holiday_req_id" select="2"/>
+                    <field name="nb_holidays"  select="1" />
+                    <field name="employee_id" select="2"/>
+                    <field name="holiday_status" select="1"/>
+                    <field name="holiday_user_id" select="2"/>
+                    <field name="date" select="1"/>
+                </form>
+            </field>
+        </record>
+        
+        <record model="ir.ui.view" id="view_holidays_log_tree">
+            <field name="name">hr.holidays.log.tree</field>
+            <field name="model">hr.holidays.log</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Holidays log">
+                    <field name="name"/>
+                    <field name="holiday_req_id"/>
+                    <field name="nb_holidays"/>
+                    <field name="employee_id"/>
+                    <field name="holiday_status"/>
+                    <field name="holiday_user_id"/>
+                    <field name="date"/>
+                </tree>
+            </field>
+        </record>
 
     </data>
 </openerp>

=== modified file 'hr_holidays/hr_workflow.xml'
--- hr_holidays/hr_workflow.xml	2008-09-10 17:56:00 +0000
+++ hr_holidays/hr_workflow.xml	2009-04-17 14:46:54 +0000
@@ -53,6 +53,10 @@
 		<field name="action">holidays_cancel()</field>
 		<field name="join_mode">XOR</field>
 	</record>
+	
+	<!-- 	
+		workflow transition
+	-->
 
 	<record model="workflow.transition" id="t1">
 		<field name="act_from" ref="act_draft" />
@@ -91,6 +95,8 @@
 	<record model="workflow.transition" id="t7">
 		<field name="act_from" ref="act_cancel" />
 		<field name="act_to" ref="act_draft" />
+		<field name="signal">set_to_draft</field>
 	</record>
+	
 </data>
 </openerp>

=== modified file 'hr_timesheet/process/hr_timesheet_process.xml'
--- hr_timesheet/process/hr_timesheet_process.xml	2009-01-12 08:52:06 +0000
+++ hr_timesheet/process/hr_timesheet_process.xml	2009-01-29 06:40:12 +0000
@@ -12,5 +12,80 @@
             <field eval="&quot;&quot;&quot;Timesheet Process&quot;&quot;&quot;" name="name"/>
         </record>
         
+        <!-- 
+            Process Node
+        -->
+        
+        <record id="process_node_timesheetline0" model="process.node">
+            <field name="menu_id" ref="hr_timesheet.menu_act_hr_timesheet_line_me_all_form"/>
+            <field name="model_id" ref="hr_timesheet.model_hr_analytic_timesheet"/>
+            <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
+            <field eval="&quot;&quot;&quot;Timesheet Line&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Encode your timesheet line&quot;&quot;&quot;" name="note"/>
+            <field name="process_id" ref="process_process_timesheetprocess0"/>
+            <field eval="0" name="flow_start"/>
+        </record>
+        
+        <record id="process_node_phonecall0" model="process.node">
+            <field name="menu_id" ref="hr_timesheet.menu_act_hr_timesheet_line_me_all_form"/>
+            <field name="model_id" ref="hr_timesheet.model_hr_analytic_timesheet"/>
+            <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
+            <field eval="&quot;&quot;&quot;Phone call&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Whatever time u spent for phone call&quot;&quot;&quot;" name="note"/>
+            <field name="process_id" ref="process_process_timesheetprocess0"/>
+            <field eval="1" name="flow_start"/>
+        </record>
+        
+        <record id="process_node_analyticcost0" model="process.node">
+            <field name="menu_id" ref="hr_timesheet.menu_act_hr_timesheet_line_me_all_form"/>
+            <field name="model_id" ref="hr_timesheet.model_hr_analytic_timesheet"/>
+            <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
+            <field eval="&quot;&quot;&quot;Analytic cost&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Analytic cost is created&quot;&quot;&quot;" name="note"/>
+            <field name="process_id" ref="process_process_timesheetprocess0"/>
+            <field eval="0" name="flow_start"/>
+        </record>
+    
+        <record id="process_node_review0" model="process.node">
+            <field name="menu_id" ref="hr_timesheet.menu_act_hr_timesheet_line_me_all_form"/>
+            <field name="model_id" ref="hr_timesheet.model_hr_analytic_timesheet"/>
+            <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
+            <field eval="&quot;&quot;&quot;Review&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Review end of day check day is complete&quot;&quot;&quot;" name="note"/>
+            <field name="process_id" ref="process_process_timesheetprocess0"/>
+            <field eval="0" name="flow_start"/>
+        </record>
+        
+         <!-- 
+            Process Transition
+        -->
+        
+        <record id="process_transition_phonecallencoding0" model="process.transition">
+            <field eval="[(6,0,[])]" name="role_ids"/>
+            <field eval="[(6,0,[])]" name="transition_ids"/>
+            <field eval="&quot;&quot;&quot;Phone call encoding&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Encode how much time u spent on phone call&quot;&quot;&quot;" name="note"/>
+            <field model="process.node" name="target_node_id" ref="process_node_timesheetline0"/>
+            <field model="process.node" name="source_node_id" ref="process_node_phonecall0"/>
+        </record>
+        
+        <record id="process_transition_createanalyticcose0" model="process.transition">
+            <field eval="[(6,0,[])]" name="role_ids"/>
+            <field eval="[(6,0,[])]" name="transition_ids"/>
+            <field eval="&quot;&quot;&quot;Create Analytic cost&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Creates your analytic cost accoording to quantity&quot;&quot;&quot;" name="note"/>
+            <field model="process.node" name="target_node_id" ref="process_node_analyticcost0"/>
+            <field model="process.node" name="source_node_id" ref="process_node_timesheetline0"/>
+        </record>
+    
+        <record id="process_transition_reviewofwork0" model="process.transition">
+            <field eval="[(6,0,[])]" name="role_ids"/>
+            <field eval="[(6,0,[])]" name="transition_ids"/>
+            <field eval="&quot;&quot;&quot;Review of work&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Review of your work at the end of the day&quot;&quot;&quot;" name="note"/>
+            <field model="process.node" name="target_node_id" ref="process_node_review0"/>
+            <field model="process.node" name="source_node_id" ref="process_node_timesheetline0"/>
+        </record>
+        
     </data>
 </openerp>
\ No newline at end of file

=== modified file 'hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml'
--- hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml	2009-01-12 08:52:06 +0000
+++ hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml	2009-01-29 06:40:12 +0000
@@ -16,28 +16,6 @@
             Process Node
         -->
         
-        <record id="process_node_analyticcost0" model="process.node">
-            <field name="menu_id" ref="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current"/>
-            <field name="model_id" ref="hr_timesheet_sheet.model_hr_timesheet_sheet_sheet"/>
-            <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-            <field eval="&quot;&quot;&quot;Analytic cost&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Analytic cost is created&quot;&quot;&quot;" name="note"/>
-            <field name="process_id" ref="hr_timesheet.process_process_timesheetprocess0"/>
-            <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
-            <field eval="0" name="flow_start"/>
-        </record>
-    
-        <record id="process_node_review0" model="process.node">
-            <field name="menu_id" ref="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current"/>
-            <field name="model_id" ref="hr_timesheet_sheet.model_hr_timesheet_sheet_sheet"/>
-            <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-            <field eval="&quot;&quot;&quot;Review&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Review end of day check day is complete&quot;&quot;&quot;" name="note"/>
-            <field name="process_id" ref="hr_timesheet.process_process_timesheetprocess0"/>
-            <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
-            <field eval="0" name="flow_start"/>
-        </record>
-    
         <record id="process_node_timesheetconfirming0" model="process.node">
             <field name="menu_id" ref="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current"/>
             <field name="model_id" ref="hr_timesheet_sheet.model_hr_timesheet_sheet_sheet"/>
@@ -50,29 +28,6 @@
             <field eval="0" name="flow_start"/>
         </record>
         
-        <record id="process_node_timesheetline0" model="process.node">
-            <field name="menu_id" ref="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current"/>
-            <field name="model_id" ref="hr_timesheet_sheet.model_hr_timesheet_sheet_sheet"/>
-            <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-            <field eval="&quot;&quot;&quot;Timesheet Line&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Encode your timesheet line&quot;&quot;&quot;" name="note"/>
-            <field name="process_id" ref="hr_timesheet.process_process_timesheetprocess0"/>
-            <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
-            <field eval="0" name="flow_start"/>
-        </record>
-        
-        <record id="process_node_phonecall0" model="process.node">
-            <field name="menu_id" ref="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current"/>
-            <field name="model_id" ref="hr_timesheet_sheet.model_hr_timesheet_sheet_sheet"/>
-            <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-            <field eval="&quot;&quot;&quot;Phone call&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Whatever time u spent for phone call&quot;&quot;&quot;" name="note"/>
-            <field name="process_id" ref="hr_timesheet.process_process_timesheetprocess0"/>
-            <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
-            <field eval="1" name="flow_start"/>
-        </record>
-    
-            
         <record id="process_node_attendance0" model="process.node">
             <field name="model_id" ref="hr.model_hr_employee"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
@@ -139,6 +94,17 @@
             <field eval="0" name="flow_start"/>
         </record>
         
+        <record id="process_node_workontask0" model="process.node">
+            <field name="menu_id" ref="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current"/>
+            <field name="model_id" ref="hr_timesheet_sheet.model_hr_timesheet_sheet_sheet"/>
+            <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
+            <field eval="&quot;&quot;&quot;Work on Task&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Defines the work summary of task&quot;&quot;&quot;" name="note"/>
+            <field name="process_id" ref="hr_timesheet_sheet.process_process_hrtimesheetprocess0"/>
+            <field eval="&quot;&quot;&quot;object.state in ('open', pending', 'done', 'cancelled')&quot;&quot;&quot;" name="model_states"/>
+            <field eval="1" name="flow_start"/>
+        </record>
+        
         <!-- 
             Process Transition
         -->
@@ -197,40 +163,22 @@
             <field model="process.node" name="source_node_id" ref="process_node_confirmedtimesheet0"/>
         </record>
         
-        <record id="process_transition_phonecallencoding0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
-            <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Phone call encoding&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Encode how much time u spent on phone call&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_timesheetline0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_phonecall0"/>
-        </record>
-        
-        <record id="process_transition_createanalyticcose0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
-            <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Create Analytic cost&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Creates your analytic cost accoording to quantity&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_analyticcost0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_timesheetline0"/>
-        </record>
-    
-        <record id="process_transition_reviewofwork0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
-            <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Review of work&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Review of your work at the end of the day&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_review0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_timesheetline0"/>
-        </record>
-    
         <record id="process_transition_confirmtimesheetsheet0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Confirm timesheet sheet&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Confirm timesheet at the end of the period&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_timesheetconfirming0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_review0"/>
+            <field model="process.node" name="source_node_id" ref="hr_timesheet.process_node_review0"/>
+        </record>
+        
+        <record id="process_transition_tasktimesheet0" model="process.transition">
+            <field eval="[(6,0,[])]" name="role_ids"/>
+            <field eval="[(6,0,[])]" name="transition_ids"/>
+            <field eval="&quot;&quot;&quot;Task timesheet&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Moves task entry into the timesheet line&quot;&quot;&quot;" name="note"/>
+            <field model="process.node" name="target_node_id" ref="process_node_timesheet0"/>
+            <field model="process.node" name="source_node_id" ref="process_node_workontask0"/>
         </record>
         
         <!-- 

=== modified file 'project_timesheet/__terp__.py'
--- project_timesheet/__terp__.py	2009-02-03 17:02:20 +0000
+++ project_timesheet/__terp__.py	2009-02-05 06:11:47 +0000
@@ -34,7 +34,7 @@
     'website': 'http://www.openerp.com',
     'depends': ['base', 'project', 'hr_timesheet'],
     'init_xml': [],
-    'update_xml': [],
+    'update_xml': ["process/project_timesheet_process.xml"],
     'demo_xml': [],
     'installable': True,
     'active': False,

=== added directory 'project_timesheet/process'
=== added file 'project_timesheet/process/project_timesheet_process.xml'
--- project_timesheet/process/project_timesheet_process.xml	1970-01-01 00:00:00 +0000
+++ project_timesheet/process/project_timesheet_process.xml	2009-01-29 06:40:12 +0000
@@ -0,0 +1,53 @@
+<?xml version="1.0" ?>
+<openerp>
+    <data>
+    
+    	<!--        
+            Process Node
+        -->
+        
+        <record id="process_node_timesheettask0" model="process.node">
+            <field name="menu_id" ref="hr_timesheet.menu_act_hr_timesheet_line_evry1_today_form"/>
+            <field name="model_id" ref="hr_timesheet.model_hr_analytic_timesheet"/>
+            <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
+            <field eval="&quot;&quot;&quot;Timesheet task&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Complete Your Timesheet.&quot;&quot;&quot;" name="note"/>
+            <field name="process_id" ref="project.process_process_tasksprocess0"/>
+            <field eval="0" name="flow_start"/>
+        </record>
+        
+        <record id="process_node_taskwork0" model="process.node">
+            <field name="menu_id" ref="project.menu_action_view_task6_prog"/>
+            <field name="model_id" ref="project.model_project_task_work"/>
+            <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
+            <field eval="&quot;&quot;&quot;Task Work&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Work on task&quot;&quot;&quot;" name="note"/>
+            <field name="process_id" ref="hr_timesheet.process_process_timesheetprocess0"/>
+            <field eval="&quot;&quot;&quot;object.state=='open'&quot;&quot;&quot;" name="model_states"/>
+            <field eval="1" name="flow_start"/>
+        </record>
+        
+         <!--        
+            Process Transition
+        -->
+        
+        <record id="process_transition_filltimesheet0" model="process.transition">
+            <field eval="[(6,0,[])]" name="role_ids"/>
+            <field eval="[(6,0,[])]" name="transition_ids"/>
+            <field eval="&quot;&quot;&quot;Fill Timesheet&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Task summary is comes into the timesheet line&quot;&quot;&quot;" name="note"/>
+            <field model="process.node" name="target_node_id" ref="process_node_timesheettask0"/>
+            <field model="process.node" name="source_node_id" ref="project.process_node_opentask0"/>
+        </record>
+        
+        <record id="process_transition_taskencoding0" model="process.transition">
+            <field eval="[(6,0,[])]" name="role_ids"/>
+            <field eval="[(6,0,[])]" name="transition_ids"/>
+            <field eval="&quot;&quot;&quot;Task encoding&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Encode how much time u spent on your task&quot;&quot;&quot;" name="note"/>
+            <field model="process.node" name="target_node_id" ref="hr_timesheet.process_node_timesheetline0"/>
+            <field model="process.node" name="source_node_id" ref="process_node_taskwork0"/>
+        </record>
+    
+    </data>
+</openerp>
\ No newline at end of file

=== added directory 'report_stock'
=== added file 'report_stock/__init__.py'
--- report_stock/__init__.py	1970-01-01 00:00:00 +0000
+++ report_stock/__init__.py	2009-03-10 11:14:01 +0000
@@ -0,0 +1,25 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution    
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import report_stock
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== added file 'report_stock/__terp__.py'
--- report_stock/__terp__.py	1970-01-01 00:00:00 +0000
+++ report_stock/__terp__.py	2009-03-10 11:14:01 +0000
@@ -0,0 +1,37 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution    
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+{
+    'name': 'Stock Management - Reporting',
+    'version': '1.0',
+    'category': "Generic Modules/Inventory Control",
+    'description': "Reporting for the stock module",
+    'author': 'Tiny',
+    'website': 'http://www.openerp.com',
+    'depends': ['stock'],
+    'init_xml': [],
+    'update_xml': ["report_stock_view.xml"],
+    'demo_xml': [],
+    'installable': True,
+    'active': False,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'report_stock/report_stock.py'
--- report_stock/report_stock.py	1970-01-01 00:00:00 +0000
+++ report_stock/report_stock.py	2009-03-10 11:14:01 +0000
@@ -0,0 +1,62 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution    
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+
+"""
+    This module gives the stock of product for this month as tree & graph view
+"""
+
+from osv import fields,osv
+
+class report_stock_location_category(osv.osv):
+    
+    _name = "report.stock.location.category"
+    _description = "Stock of product by location"
+    _auto = False
+    _columns = {
+        'name': fields.char('Location name', size=64, readonly=True),
+        'product_id' : fields.many2one('product.product', 'Product', readonly=True),
+        'quantity': fields.float('# of Products', readonly=True),
+        'date' : fields.date('Month', readonly=True)
+    }
+    
+    def init(self, cr):
+        cr.execute("""
+            create or replace view report_stock_location_category as (
+                SELECT min("out".id) as id, 
+                        to_char("out".date, 'YYYY-MM-01') as date, 
+                        l.name AS name, 
+                        "out".product_id as product_id, 
+                        "out".state, sum(
+                            CASE
+                                WHEN l.id = "out".location_id THEN -1*("out".product_qty)
+                                WHEN l.id = "out".location_dest_id THEN "out".product_qty
+                                ELSE 0::double precision
+                            END) AS quantity
+                 FROM stock_move "out", stock_location l
+                 where "out".state = 'done' 
+                 GROUP BY l.id, "out".product_id, l.name, "out".state, to_char("out".date, 'YYYY-MM-01'))
+          """)
+        
+report_stock_location_category()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'report_stock/report_stock_view.xml'
--- report_stock/report_stock_view.xml	1970-01-01 00:00:00 +0000
+++ report_stock/report_stock_view.xml	2009-03-10 11:14:01 +0000
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>		
+
+        <record id="view_stock_order_tree" model="ir.ui.view">
+            <field name="name">report.stock.location.tree</field>
+            <field name="model">report.stock.location.category</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Sales by Category of Products">
+                	<field name="date"/>
+                    <field name="product_id"/>
+                    <field name="quantity"/>
+                    <field name="name"/>
+               </tree>
+            </field>
+        </record>
+        
+        <record id="view_stock_order_graph" model="ir.ui.view">
+            <field name="name">report.stock.location.graph</field>
+            <field name="model">report.stock.location.category</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Sales by Category of Products" type="bar">
+                    <field name="name"/>
+					<field name="quantity"/>
+                </graph>
+            </field>
+        </record>
+        
+        <record id="action_stock_order_tree" model="ir.actions.act_window">
+            <field name="name">Stock of Product (this month)</field>
+            <field name="res_model">report.stock.location.category</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,graph</field>
+            <field name="view_id" ref="view_stock_order_tree" />
+        </record>
+
+        <menuitem action="action_stock_order_tree" id="menu_stock_report_order" parent="stock.next_id_61"/>
+        
+    </data>
+</openerp>
\ No newline at end of file

=== modified file 'wiki/wiki_view.xml'
--- wiki/wiki_view.xml	2009-04-17 10:37:08 +0000
+++ wiki/wiki_view.xml	2009-04-22 05:50:44 +0000
@@ -10,6 +10,12 @@
             string="Create Menu"
             menu="True"
             name="wiki.create.menu"/>
+
+        <wizard
+            id="wizard_open_page"
+            string="Open Page"
+            menu="True"
+            name="wiki.wiki.page.open"/>
             
         <wizard
             id="wizard_open_page"