From 4738eeb564620af984da3a1429c77de81521423b Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Mon, 19 Apr 2010 11:58:23 +0530
Subject: [PATCH 1/5] [Add] account: convert account_unreconcile wizard to
 osv_memory

bzr revid: psi@tinyerp.co.in-20100419062823-zlbgmvk0agczi2fm
---
 addons/account/__openerp__.py                 |  1 +
 addons/account/account_wizard.xml             |  4 +-
 addons/account/wizard/__init__.py             |  2 +-
 addons/account/wizard/account_unreconcile.py  | 55 ++++++++++++
 .../wizard/account_unreconcile_view.xml       | 83 +++++++++++++++++++
 .../wizard/account_validate_move_view.xml     |  2 +-
 addons/account/wizard/wizard_unreconcile.py   | 76 -----------------
 7 files changed, 143 insertions(+), 80 deletions(-)
 create mode 100644 addons/account/wizard/account_unreconcile.py
 create mode 100644 addons/account/wizard/account_unreconcile_view.xml
 delete mode 100644 addons/account/wizard/wizard_unreconcile.py

diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py
index ca5caee014d..78bb11c4883 100644
--- a/addons/account/__openerp__.py
+++ b/addons/account/__openerp__.py
@@ -68,6 +68,7 @@ module named account_voucherss
         'wizard/account_validate_move_view.xml',
         'wizard/account_statement_from_invoice_view.xml',
         'wizard/account_pay_invoice_view.xml',
+        'wizard/account_unreconcile_view.xml',
         'project/wizard/project_account_analytic_line_view.xml',
         'account_view.xml',
         'account_end_fy.xml',
diff --git a/addons/account/account_wizard.xml b/addons/account/account_wizard.xml
index 09ae2bafede..5c2322cce42 100644
--- a/addons/account/account_wizard.xml
+++ b/addons/account/account_wizard.xml
@@ -49,7 +49,7 @@
         <!-- manual reconcile -->
         <wizard id="wizard_reconcile" model="account.move.line" name="account.move.line.reconcile" string="Reconcile Entries"/>
 
-        <wizard id="wizard_reconcile_unreconcile" model="account.move.reconcile" name="account.reconcile.unreconcile" string="Unreconcile Entries"/>
+<!--        <wizard id="wizard_reconcile_unreconcile" model="account.move.reconcile" name="account.reconcile.unreconcile" string="Unreconcile Entries"/>-->
 
 
  <!--       <wizard id="wizard_reconcile_select" menu="False" model="account.move.line" name="account.move.line.reconcile.select" string="Reconcile entries"/>
@@ -57,7 +57,7 @@
  -->
 
         <!-- unreconcile -->
-        <wizard id="wizard_unreconcile" model="account.move.line" name="account.move.line.unreconcile" string="Unreconcile Entries"/>
+<!--        <wizard id="wizard_unreconcile" model="account.move.line" name="account.move.line.unreconcile" string="Unreconcile Entries"/>-->
 
 <!--   unreconcile
 
diff --git a/addons/account/wizard/__init__.py b/addons/account/wizard/__init__.py
index 6183ee3acee..d96ced0cdd3 100644
--- a/addons/account/wizard/__init__.py
+++ b/addons/account/wizard/__init__.py
@@ -23,7 +23,7 @@ import wizard_automatic_reconcile
 import account_move_line_reconcile_select
 import account_move_line_unreconcile_select
 import wizard_reconcile
-import wizard_unreconcile
+import account_unreconcile
 import account_invoice_refund
 import account_pay_invoice
 import account_move_journal
diff --git a/addons/account/wizard/account_unreconcile.py b/addons/account/wizard/account_unreconcile.py
new file mode 100644
index 00000000000..d50994a6f28
--- /dev/null
+++ b/addons/account/wizard/account_unreconcile.py
@@ -0,0 +1,55 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero 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 Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from osv import fields, osv
+
+class account_unreconcile(osv.osv_memory):
+    _name = "account.unreconcile"
+    _description = "Account Unreconcile"
+
+    def trans_unrec(self, cr, uid, ids, context=None):
+        obj_move_line = self.pool.get('account.move.line')
+        obj_move_reconcile = self.pool.get('account.move.reconcile')
+        if context is None:
+            context = {}
+        recs = obj_move_line.read(cr, uid, context['active_ids'], ['reconcile_id',])
+        recs = filter(lambda x: x['reconcile_id'], recs)
+        rec_ids = [rec['reconcile_id'][0] for rec in recs]
+        if len(rec_ids):
+            obj_move_reconcile.unlink(cr, uid, rec_ids)
+        return {}
+
+account_unreconcile()
+
+class account_unreconcile_reconcile(osv.osv_memory):
+    _name = "account.unreconcile.reconcile"
+    _description = "Account Unreconcile Reconcile"
+
+    def trans_unrec_reconcile(self, cr, uid, ids, context=None):
+        obj_move_reconcile = self.pool.get('account.move.reconcile')
+        if context is None:
+            context = {}
+        if len(rec_ids):
+            obj_move_reconcile.unlink(cr, uid, context['active_ids'])
+        return {}
+
+account_unreconcile_reconcile()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account/wizard/account_unreconcile_view.xml b/addons/account/wizard/account_unreconcile_view.xml
new file mode 100644
index 00000000000..3ac038329d9
--- /dev/null
+++ b/addons/account/wizard/account_unreconcile_view.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="account_unreconcile_view" model="ir.ui.view">
+            <field name="name">Unreconcile Entries</field>
+            <field name="model">account.unreconcile</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+			<form string="Unreconciliation">
+			    <separator string="Unreconciliation transactions" colspan="4"/>
+			    <image name="gtk-dialog-info"/>
+			    <label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable" colspan="2"/>
+			    <separator colspan="4"/>
+                    <group colspan="4" col="6">
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-ok" string="Unreconcile" name="trans_unrec" type="object" default_focus="1"/>
+                   </group>
+               </form>
+            </field>
+        </record>
+
+        <record id="action_account_unreconcile" model="ir.actions.act_window">
+            <field name="name">Unreconcile Entries</field>
+            <field name="res_model">account.unreconcile</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+           <field name="view_id" ref="account_unreconcile_view"/>
+           <field name="target">new</field>
+        </record>
+
+		<record model="ir.values" id="account_unreconcile_values">
+            <field name="model_id" ref="account.model_account_move_line" />
+            <field name="object" eval="1" />
+            <field name="name">Unreconcile Entries</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_unreconcile'))" />
+            <field name="key">action</field>
+            <field name="model">account.move.line</field>
+        </record>
+
+        <record id="account_unreconcile_reconcile_view" model="ir.ui.view">
+            <field name="name">Unreconcile Entries</field>
+            <field name="model">account.unreconcile.reconcile</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+			<form string="Unreconciliation">
+			    <separator string="Unreconciliation transactions" colspan="4"/>
+			    <image name="gtk-dialog-info"/>
+			    <label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable" colspan="2"/>
+			    <separator colspan="4"/>
+                    <group colspan="4" col="6">
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-ok" string="Unreconcile" name="trans_unrec_reconcile" type="object" default_focus="1"/>
+                   </group>
+               </form>
+            </field>
+        </record>
+
+		<record id="action_account_unreconcile_reconcile" model="ir.actions.act_window">
+            <field name="name">Unreconcile Entries</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.unreconcile.reconcile</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="account_unreconcile_reconcile_view"/>
+	        <field name="context">{'record_id' : active_id}</field>
+            <field name="target">new</field>
+    	</record>
+
+		<record model="ir.values" id="account_unreconcile_reconcile_values">
+            <field name="model_id" ref="account.model_account_move_reconcile" />
+            <field name="object" eval="1" />
+            <field name="name">Unreconcile Entries</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_unreconcile_reconcile'))" />
+            <field name="key">action</field>
+            <field name="model">account.move.reconcile</field>
+        </record>
+
+    </data>
+</openerp>
+
diff --git a/addons/account/wizard/account_validate_move_view.xml b/addons/account/wizard/account_validate_move_view.xml
index dd116ca478c..27ca48662bc 100644
--- a/addons/account/wizard/account_validate_move_view.xml
+++ b/addons/account/wizard/account_validate_move_view.xml
@@ -64,7 +64,7 @@
             <field name="target">new</field>
     	</record>
 
-		<record model="ir.values" id="event_registration_values">
+		<record model="ir.values" id="validate_account_move_line_values">
             <field name="model_id" ref="account.model_account_move_line" />
             <field name="object" eval="1" />
             <field name="name">Validate Ledger Postings</field>
diff --git a/addons/account/wizard/wizard_unreconcile.py b/addons/account/wizard/wizard_unreconcile.py
deleted file mode 100644
index e42a1bc080b..00000000000
--- a/addons/account/wizard/wizard_unreconcile.py
+++ /dev/null
@@ -1,76 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero 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 Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import pooler
-
-_info_form = '''<?xml version="1.0"?>
-<form string="Unreconciliation">
-    <separator string="Unreconciliation transactions" colspan="4"/>
-    <image name="gtk-dialog-info" colspan="2"/>
-    <label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable" colspan="2"/>
-</form>'''
-
-def _trans_unrec(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    recs = pool.get('account.move.line').read(cr, uid, data['ids'], ['reconcile_id',])
-    recs = filter(lambda x: x['reconcile_id'], recs)
-    rec_ids = [rec['reconcile_id'][0] for rec in recs]
-    if len(rec_ids):
-        pooler.get_pool(cr.dbname).get('account.move.reconcile').unlink(cr, uid, rec_ids)
-    return {}
-
-class wiz_unreconcile(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'form', 'arch': _info_form, 'fields': {}, 'state':[('end', 'Cancel', 'gtk-cancel'), ('unrec', 'Unreconcile', 'gtk-ok')]}
-        },
-        'unrec': {
-            'actions': [_trans_unrec],
-            'result': {'type': 'state', 'state':'end'}
-        }
-    }
-wiz_unreconcile('account.move.line.unreconcile')
-
-
-def _trans_unrec_reconcile(self, cr, uid, data, context):
-    rec_ids = data['ids']
-    if len(rec_ids):
-        pooler.get_pool(cr.dbname).get('account.move.reconcile').unlink(cr, uid, rec_ids)
-    return {}
-
-class wiz_unreconcile_reconcile(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'form', 'arch': _info_form, 'fields': {}, 'state':[('end', 'Cancel', 'gtk-cancel'), ('unrec', 'Unreconcile', 'gtk-ok')]}
-        },
-        'unrec': {
-            'actions': [_trans_unrec_reconcile],
-            'result': {'type': 'state', 'state':'end'}
-        }
-    }
-wiz_unreconcile_reconcile('account.reconcile.unreconcile')
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

From 6c69d44126e58cf780e9fa32f5da5e936535e25c Mon Sep 17 00:00:00 2001
From: "mra (Open ERP)" <mra@tinyerp.com>
Date: Mon, 19 Apr 2010 12:12:00 +0530
Subject: [PATCH 2/5] [ADD] hr_timesheet: Employee Timesheet => OSV Memory (Not
 merge)

bzr revid: mra@tinyerp.com-20100419064200-9v0lwddsyh0qmt0u
---
 addons/hr_timesheet/__openerp__.py            |  3 +-
 addons/hr_timesheet/hr_timesheet_report.xml   |  8 +--
 .../hr_timesheet_print_employee_view.xml      | 39 ++++++++++++++
 .../wizard/wizard_print_timesheet.py          | 51 +++++++++++++------
 4 files changed, 81 insertions(+), 20 deletions(-)
 create mode 100644 addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml

diff --git a/addons/hr_timesheet/__openerp__.py b/addons/hr_timesheet/__openerp__.py
index 976242edc0c..92ffae79668 100644
--- a/addons/hr_timesheet/__openerp__.py
+++ b/addons/hr_timesheet/__openerp__.py
@@ -44,7 +44,8 @@ to set up a management by affair.
         'hr_timesheet_view.xml',
         'hr_timesheet_report.xml',
         'hr_timesheet_wizard.xml',
-        'process/hr_timesheet_process.xml'
+        'process/hr_timesheet_process.xml',
+        'wizard/hr_timesheet_print_employee_view.xml'
     ],
     'demo_xml': ['hr_timesheet_demo.xml'],
     'installable': True,
diff --git a/addons/hr_timesheet/hr_timesheet_report.xml b/addons/hr_timesheet/hr_timesheet_report.xml
index 9b7c527fea9..66ee5c4856c 100644
--- a/addons/hr_timesheet/hr_timesheet_report.xml
+++ b/addons/hr_timesheet/hr_timesheet_report.xml
@@ -13,15 +13,15 @@
             sequence="1" />
         <report auto="False" id="report_user_timesheet" menu="False" model="hr.employee" name="hr.analytical.timesheet" string="Employee timesheet" xsl="hr_timesheet/report/user_timesheet.xsl"/>
 
-        <wizard id="wizard_hr_timesheet" menu="False" model="hr.employee" name="hr.analytical.timesheet" string="Employee Timesheet"/>
-
+        <!--<wizard id="wizard_hr_timesheet" menu="False" model="hr.employee" name="hr.analytical.timesheet" string="Employee Timesheet"/>
+-->
         <!--<menuitem id="next_id_48" name="Timesheet" parent="hr.menu_hr_reporting"/>-->
        <!-- <menuitem action="wizard_hr_timesheet" id="menu_wizard_hr_timesheet" parent="next_id_48" type="wizard"
             groups="hr.group_hr_manager"/>-->
-        <menuitem action="wizard_hr_timesheet" id="menu_wizard_hr_timesheet" parent="menu_hr_reporting_timesheet" type="wizard"
+        <!--<menuitem action="wizard_hr_timesheet" id="menu_wizard_hr_timesheet" parent="menu_hr_reporting_timesheet" type="wizard"
 
             groups="hr.group_hr_manager"
-            />
+            />-->
         <wizard id="wizard_hr_timesheet_my" menu="False" model="hr.employee" name="hr.analytical.timesheet.my" string="Print My Timesheet"/>
         <menuitem
             action="wizard_hr_timesheet_my"
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
new file mode 100644
index 00000000000..63a073b3f31
--- /dev/null
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+    	<record id="view_hr_timesheet_employee" model="ir.ui.view">
+            <field name="name">hr.analytical.timesheet.employee.form</field>
+            <field name="model">hr.analytical.timesheet.employee</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Employee Timesheet">
+                	<group colspan="4" >
+	                	<field name="month" />
+	                	<field name="year" />
+	                	<field name="user_id" colspan="3" />
+                	</group>
+                    <group colspan="4" col="6">
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-print" string="Print" name="print_report" type="object"/>
+                   </group>
+               </form>
+            </field>
+        </record>
+
+		<record id="action_hr_timesheet_employee" model="ir.actions.act_window">
+            <field name="name">Employee Timesheet</field>
+            <field name="res_model">hr.analytical.timesheet.employee</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_hr_timesheet_employee"/>
+           <field name="target">new</field>
+        </record>
+
+        <menuitem action="action_hr_timesheet_employee"
+        	id="menu_hr_timesheet_employee"
+        	parent="menu_hr_reporting_timesheet"
+        	groups="hr.group_hr_manager" />
+
+    </data>
+</openerp>
diff --git a/addons/hr_timesheet/wizard/wizard_print_timesheet.py b/addons/hr_timesheet/wizard/wizard_print_timesheet.py
index ba11d301762..255d949025a 100644
--- a/addons/hr_timesheet/wizard/wizard_print_timesheet.py
+++ b/addons/hr_timesheet/wizard/wizard_print_timesheet.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,13 +15,14 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
 import datetime
 
 import wizard
+from osv import osv, fields
 import netsvc
 
 dates_form = '''<?xml version="1.0"?>
@@ -49,23 +50,43 @@ def _get_value(self, cr, uid, data, context):
     today = datetime.date.today()
     return dict(month=today.month, year=today.year, user_id=uid)
 
-class wizard_report(wizard.interface):
-    states = {
-        'init': {
-            'actions': [_get_value], 
-            'result': {'type':'form', 'arch':dates_form, 'fields':dates_fields, 'state':[ ('end','Cancel','gtk-cancel'),('report','Print','gtk-print')]}
-        },
-        'report': {
-            'actions': [],
-            'result': {'type':'print', 'report':'hr.analytical.timesheet', 'state':'end'}
-        }
-    }
-wizard_report('hr.analytical.timesheet')
+class analytical_timesheet_employee(osv.osv_memory):
+    _name = 'hr.analytical.timesheet.employee'
+    _description = 'Print Employee Timesheet'
+    _columns = {
+        'month': fields.selection([(x, datetime.date(2000, x, 1).strftime('%B')) for x in range(1, 13)],
+                                  'Month', required=True),
+        'year': fields.integer('Year', required=True),
+        'user_id': fields.many2one('res.users', 'User', required=True)
+                }
+
+    def _get_user(self, cr, uid, context=None):
+        return uid
+
+    _defaults = {
+         'month': datetime.date.today().month,
+         'year': datetime.date.today().year,
+         'user_id': _get_user
+             }
+
+    def print_report(self, cr, uid, ids, context=None):
+        data = self.read(cr, uid, ids, context=context)[0]
+        datas = {
+             'ids': [],
+             'model': 'hr.employee',
+             'form': data
+                 }
+        return {
+            'type': 'ir.actions.report.xml',
+            'report_name': 'hr.analytical.timesheet',
+            'datas': datas,
+            }
+analytical_timesheet_employee()
 
 class wizard_report_my(wizard.interface):
     states = {
         'init': {
-            'actions': [_get_value], 
+            'actions': [_get_value],
             'result': {'type':'form', 'arch':dates_form_ro, 'fields':dates_fields, 'state':[ ('end','Cancel','gtk-cancel'),('report','Print','gtk-print')]}
         },
         'report': {

From 666a5203fe74643a693e72f733f01329e3ef2fb4 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Tue, 20 Apr 2010 11:01:42 +0530
Subject: [PATCH 3/5] [ADD,MOD] account : wizard invoice state converted to the
 osv memory wizard

bzr revid: vir@tinyerp.com-20100420053142-fon34f3niaswn659
---
 addons/account/__openerp__.py                 |  1 +
 addons/account/account_wizard.xml             |  6 +-
 addons/account/wizard/__init__.py             |  2 +-
 .../account/wizard/account_invoice_state.py   | 62 ++++++++++++++++
 .../wizard/account_invoice_state_view.xml     | 73 +++++++++++++++++++
 addons/account/wizard/wizard_invoice_state.py | 59 ---------------
 6 files changed, 140 insertions(+), 63 deletions(-)
 create mode 100644 addons/account/wizard/account_invoice_state.py
 create mode 100644 addons/account/wizard/account_invoice_state_view.xml
 delete mode 100644 addons/account/wizard/wizard_invoice_state.py

diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py
index 78bb11c4883..0afe7f878e0 100644
--- a/addons/account/__openerp__.py
+++ b/addons/account/__openerp__.py
@@ -69,6 +69,7 @@ module named account_voucherss
         'wizard/account_statement_from_invoice_view.xml',
         'wizard/account_pay_invoice_view.xml',
         'wizard/account_unreconcile_view.xml',
+        'wizard/account_invoice_state_view.xml',
         'project/wizard/project_account_analytic_line_view.xml',
         'account_view.xml',
         'account_end_fy.xml',
diff --git a/addons/account/account_wizard.xml b/addons/account/account_wizard.xml
index 5c2322cce42..148491fb2a1 100644
--- a/addons/account/account_wizard.xml
+++ b/addons/account/account_wizard.xml
@@ -85,9 +85,9 @@
         <wizard id="wizard_balance_report" keyword="client_print_multi" model="account.account" name="account.account.balance.report" string="Account Balance"/>
         <wizard id="wizard_general_ledger_report" keyword="client_print_multi" model="account.account" name="account.general.ledger.report" string="General Ledger"/>
 
-        <wizard id="wizard_invoice_state_confirm" keyword="client_action_multi" model="account.invoice" multi="True" name="account.invoice.state.confirm" string="Confirm draft invoices" groups="base.group_user"/>
-        <wizard id="wizard_invoice_state_cancel" keyword="client_action_multi" model="account.invoice" multi="True" name="account.invoice.state.cancel" string="Cancel selected invoices" groups="base.group_user"/>
-
+<!--        <wizard id="wizard_invoice_state_confirm" keyword="client_action_multi" model="account.invoice" multi="True" name="account.invoice.state.confirm" string="Confirm draft invoices" groups="base.group_user"/>-->
+<!--        <wizard id="wizard_invoice_state_cancel" keyword="client_action_multi" model="account.invoice" multi="True" name="account.invoice.state.cancel" string="Cancel selected invoices" groups="base.group_user"/>-->
+<!---->
 
         <!-- account.move validate -->
 <!--        <wizard id="wizard_validate_account_moves" menu="False" model="account.move" name="account.move.validate" string="Validate Ledger Postings"/>
diff --git a/addons/account/wizard/__init__.py b/addons/account/wizard/__init__.py
index d96ced0cdd3..e9ca2487604 100644
--- a/addons/account/wizard/__init__.py
+++ b/addons/account/wizard/__init__.py
@@ -42,7 +42,7 @@ import account_vat
 import account_open_closed_fiscalyear
 
 import wizard_compare_account_balance_report
-import wizard_invoice_state
+import account_invoice_state
 import wizard_account_duplicate
 import account_chart
 import wizard_move_line_select
diff --git a/addons/account/wizard/account_invoice_state.py b/addons/account/wizard/account_invoice_state.py
new file mode 100644
index 00000000000..6b1a41f49af
--- /dev/null
+++ b/addons/account/wizard/account_invoice_state.py
@@ -0,0 +1,62 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero 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 Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from osv import fields, osv
+from tools.translate import _
+import netsvc
+
+class account_invoice_confirm(osv.osv_memory):
+    """
+    This wizard will confirm the all the selected draft invoices
+    """
+
+    _name = "account.invoice.confirm"
+    _description = "Confirm the selected invoices"
+
+    def invoice_confirm(self, cr, uid, ids, context=None):
+        wf_service = netsvc.LocalService('workflow')
+        if context is None:
+            context = {}
+        for id in context['active_ids']:
+            wf_service.trg_validate(uid, 'account.invoice', id, 'invoice_open', cr)
+        return {}
+
+account_invoice_confirm()
+
+class account_invoice_cancel(osv.osv_memory):
+    """
+    This wizard will cancel the all the selected invoices.
+    If in the journal, the option allow cancelling entry is not selected then it will give warning message.
+    """
+
+    _name = "account.invoice.cancel"
+    _description = "Cancel the selected invoices"
+
+    def invoice_cancel(self, cr, uid, ids, context=None):
+        wf_service = netsvc.LocalService('workflow')
+        if context is None:
+            context = {}
+        for id in context['active_ids']:
+            wf_service.trg_validate(uid, 'account.invoice', id, 'invoice_cancel', cr)
+        return {}
+
+account_invoice_cancel()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account/wizard/account_invoice_state_view.xml b/addons/account/wizard/account_invoice_state_view.xml
new file mode 100644
index 00000000000..8748edbb688
--- /dev/null
+++ b/addons/account/wizard/account_invoice_state_view.xml
@@ -0,0 +1,73 @@
+<openerp>
+    <data>
+
+		<record id="account_invoice_confirm_view" model="ir.ui.view">
+            <field name="name">account.invoice.confirm.form</field>
+            <field name="model">account.invoice.confirm</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+			<form string="Confirm draft invoices">
+			    <separator string="Confirm draft invoices" colspan="4"/>
+                    <group colspan="4" col="6">
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-execute" string="Confirm Invoices" name="invoice_confirm" type="object" default_focus="1"/>
+                   </group>
+               </form>
+            </field>
+    	</record>
+
+		<record id="action_account_invoice_confirm" model="ir.actions.act_window">
+            <field name="name">Confirm draft invoices</field>
+            <field name="res_model">account.invoice.confirm</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+           <field name="view_id" ref="account_invoice_confirm_view"/>
+           <field name="target">new</field>
+        </record>
+
+		<record model="ir.values" id="action_account_invoice_confirm_values">
+            <field name="model_id" ref="account.model_account_invoice" />
+            <field name="object" eval="1" />
+            <field name="name">Confirm draft invoices</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' +str(ref('action_account_invoice_confirm'))" />
+            <field name="key">action</field>
+            <field name="model">account.invoice</field>
+		</record>
+
+		<record id="account_invoice_cancel_view" model="ir.ui.view">
+            <field name="name">account.invoice.cancel.form</field>
+            <field name="model">account.invoice.cancel</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+			<form string="Cancel selected invoices">
+			    <separator string="Cancel selected invoices" colspan="4"/>
+                    <group colspan="4" col="6">
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-execute" string="Cancel selected invoices" name="invoice_cancel" type="object" default_focus="1"/>
+                   </group>
+               </form>
+            </field>
+    	</record>
+
+		<record id="action_account_invoice_cancel" model="ir.actions.act_window">
+            <field name="name">Cancel selected invoices</field>
+            <field name="res_model">account.invoice.cancel</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+           <field name="view_id" ref="account_invoice_cancel_view"/>
+           <field name="target">new</field>
+        </record>
+
+		<record model="ir.values" id="action_account_invoice_cancel_values">
+            <field name="model_id" ref="account.model_account_invoice" />
+            <field name="object" eval="1" />
+            <field name="name">Cancel selected invoices</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' +str(ref('action_account_invoice_cancel'))" />
+            <field name="key">action</field>
+            <field name="model">account.invoice</field>
+		</record>
+
+	</data>
+</openerp>
\ No newline at end of file
diff --git a/addons/account/wizard/wizard_invoice_state.py b/addons/account/wizard/wizard_invoice_state.py
deleted file mode 100644
index 342ce5a97be..00000000000
--- a/addons/account/wizard/wizard_invoice_state.py
+++ /dev/null
@@ -1,59 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero 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 Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import netsvc
-
-def _invoice_confirm(self, cr, uid, data, context):
-    wf_service = netsvc.LocalService('workflow')
-    for id in data['ids']:
-        wf_service.trg_validate(uid, 'account.invoice', id, 'invoice_open', cr)
-    return {}
-
-class wizard_invoice_confirm(wizard.interface):
-    states = {
-        'init': {
-            'actions': [_invoice_confirm], 
-            'result': {'type':'state', 'state':'end'}
-        }
-    }
-wizard_invoice_confirm('account.invoice.state.confirm')
-
-
-def _invoice_cancel(self, cr, uid, data, context):
-    wf_service = netsvc.LocalService('workflow')
-    for id in data['ids']:
-        wf_service.trg_validate(uid, 'account.invoice', id, 'invoice_cancel', cr)
-    return {}
-
-class wizard_invoice_cancel(wizard.interface):
-    states = {
-        'init': {
-            'actions': [_invoice_cancel], 
-            'result': {'type':'state', 'state':'end'}
-        }
-    }
-wizard_invoice_cancel('account.invoice.state.cancel')
-
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

From c2bdeba0c2d51db626a913d8c1375a78d9f27982 Mon Sep 17 00:00:00 2001
From: "mra (Open ERP)" <mra@tinyerp.com>
Date: Tue, 20 Apr 2010 11:41:38 +0530
Subject: [PATCH 4/5] [ADD] hr_timesheet: Print Employee Timesheet and Users
 Timesheet => OSV Memory

bzr revid: mra@tinyerp.com-20100420061138-bpn2ai9nebmdhqh5
---
 addons/hr_timesheet/__openerp__.py            |  3 +-
 addons/hr_timesheet/hr_timesheet_report.xml   |  8 +--
 addons/hr_timesheet/report/users_timesheet.py | 20 +++----
 addons/hr_timesheet/wizard/__init__.py        |  8 +--
 ...heet.py => hr_timesheet_print_employee.py} | 48 +---------------
 .../hr_timesheet_print_employee_view.xml      | 36 ++++++++++++
 .../wizard/hr_timesheet_print_users.py        | 56 +++++++++++++++++++
 .../wizard/hr_timesheet_print_users_view.xml  | 41 ++++++++++++++
 .../wizard/wizard_print_timesheet_users.py    | 56 -------------------
 9 files changed, 155 insertions(+), 121 deletions(-)
 rename addons/hr_timesheet/wizard/{wizard_print_timesheet.py => hr_timesheet_print_employee.py} (60%)
 create mode 100644 addons/hr_timesheet/wizard/hr_timesheet_print_users.py
 create mode 100644 addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
 delete mode 100644 addons/hr_timesheet/wizard/wizard_print_timesheet_users.py

diff --git a/addons/hr_timesheet/__openerp__.py b/addons/hr_timesheet/__openerp__.py
index 92ffae79668..a917ed2df4c 100644
--- a/addons/hr_timesheet/__openerp__.py
+++ b/addons/hr_timesheet/__openerp__.py
@@ -45,7 +45,8 @@ to set up a management by affair.
         'hr_timesheet_report.xml',
         'hr_timesheet_wizard.xml',
         'process/hr_timesheet_process.xml',
-        'wizard/hr_timesheet_print_employee_view.xml'
+        'wizard/hr_timesheet_print_employee_view.xml',
+        'wizard/hr_timesheet_print_users_view.xml'
     ],
     'demo_xml': ['hr_timesheet_demo.xml'],
     'installable': True,
diff --git a/addons/hr_timesheet/hr_timesheet_report.xml b/addons/hr_timesheet/hr_timesheet_report.xml
index 66ee5c4856c..6fa7185c7e9 100644
--- a/addons/hr_timesheet/hr_timesheet_report.xml
+++ b/addons/hr_timesheet/hr_timesheet_report.xml
@@ -22,23 +22,23 @@
 
             groups="hr.group_hr_manager"
             />-->
-        <wizard id="wizard_hr_timesheet_my" menu="False" model="hr.employee" name="hr.analytical.timesheet.my" string="Print My Timesheet"/>
+       <!-- <wizard id="wizard_hr_timesheet_my" menu="False" model="hr.employee" name="hr.analytical.timesheet.my" string="Print My Timesheet"/>
         <menuitem
             action="wizard_hr_timesheet_my"
             id="menu_wizard_hr_timesheet_my"
             parent="menu_hr_reporting_timesheet"
             type="wizard"
             groups="hr.group_hr_user"
-            />
+            />-->
 
         <report auto="False" id="report_users_timesheet" menu="False" model="hr.employee" name="hr.analytical.timesheet_users" string="Employees Timesheet" xsl="hr_timesheet/report/users_timesheet.xsl"/>
 
         <wizard id="wizard_hr_timesheet_users" menu="False" model="hr.employee" name="hr.analytical.timesheet_users" string="Employees Timesheet"/>
-        <menuitem
+        <!--<menuitem
             action="wizard_hr_timesheet_users"
             id="menu_wizard_hr_timesheet_users"
             groups="hr.group_hr_manager"
             parent="menu_hr_reporting_timesheet" type="wizard"/>
-
+-->
     </data>
 </openerp>
diff --git a/addons/hr_timesheet/report/users_timesheet.py b/addons/hr_timesheet/report/users_timesheet.py
index c179c3d3fff..9755d2d5871 100644
--- a/addons/hr_timesheet/report/users_timesheet.py
+++ b/addons/hr_timesheet/report/users_timesheet.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -42,24 +42,24 @@ def emp_create_xml(cr, id, som, eom):
         "and line.user_id=%s and line.date >= %s and line.date < %s "
         "order by line.date",
         (id, som.strftime('%Y-%m-%d'), eom.strftime('%Y-%m-%d')))
-    
+
     # Sum by day
     month = {}
     for presence in cr.dictfetchall():
         day = int(presence['date'][-2:])
         month[day] = month.get(day, 0.0) + presence['amount']
-    
+
     xml = '''
     <time-element date="%s">
         <amount>%.2f</amount>
     </time-element>
     '''
     time_xml = ([xml % (day, amount) for day, amount in month.iteritems()])
-    
+
     # Computing the employee
     cr.execute("select name from res_users where id=%s", (id,))
     emp = cr.fetchone()[0]
-    
+
     # Computing the xml
     xml = '''
     <employee id="%d" name="%s">
@@ -73,13 +73,13 @@ class report_custom(report_rml):
     def get_month_name(self, cr, uid, month):
         _months = {1:_("January"), 2:_("February"), 3:_("March"), 4:_("April"), 5:_("May"), 6:_("June"), 7:_("July"), 8:_("August"), 9:_("September"), 10:_("October"), 11:_("November"), 12:_("December")}
         return _months[month]
-    
+
     def get_weekday_name(self, cr, uid, weekday):
         _weekdays = {1:_('Mon'), 2:_('Tue'), 3:_('Wed'), 4:_('Thu'), 5:_('Fri'), 6:_('Sat'), 7:_('Sun')}
         return _weekdays[weekday]
 
     def create_xml(self, cr, uid, ids, data, context):
-    
+
         # Computing the dates (start of month: som, and end of month: eom)
         som = datetime.date(data['form']['year'], data['form']['month'], 1)
         eom = som + datetime.timedelta(lengthmonth(som.year, som.month))
@@ -87,9 +87,9 @@ class report_custom(report_rml):
         date_xml += ['<day number="%d" name="%s" weekday="%d" />' % (x, self.get_weekday_name(cr, uid, som.replace(day=x).weekday()+1), som.replace(day=x).weekday()+1) for x in range(1, lengthmonth(som.year, som.month)+1)]
         date_xml.append('</days>')
         date_xml.append('<cols>2.5cm%s,2cm</cols>\n' % (',0.7cm' * lengthmonth(som.year, som.month)))
-        
+
         emp_xml=''
-        for id in data['form']['user_ids'][0][2]:
+        for id in data['form']['user_ids']:
             emp_xml += emp_create_xml(cr, id, som, eom)
 
         # Computing the xml
diff --git a/addons/hr_timesheet/wizard/__init__.py b/addons/hr_timesheet/wizard/__init__.py
index 88b1cb40415..8619dcbcfea 100644
--- a/addons/hr_timesheet/wizard/__init__.py
+++ b/addons/hr_timesheet/wizard/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,13 +15,13 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
 import sign_in_out
-import wizard_print_timesheet
-import wizard_print_timesheet_users
+import hr_timesheet_print_employee
+import hr_timesheet_print_users
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/hr_timesheet/wizard/wizard_print_timesheet.py b/addons/hr_timesheet/wizard/hr_timesheet_print_employee.py
similarity index 60%
rename from addons/hr_timesheet/wizard/wizard_print_timesheet.py
rename to addons/hr_timesheet/wizard/hr_timesheet_print_employee.py
index 255d949025a..d2e9a54f836 100644
--- a/addons/hr_timesheet/wizard/wizard_print_timesheet.py
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_employee.py
@@ -18,41 +18,13 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-
 import datetime
 
-import wizard
 from osv import osv, fields
-import netsvc
-
-dates_form = '''<?xml version="1.0"?>
-<form string="Choose your month">
-    <field name="month" />
-    <field name="year" />
-    <field name="user_id" colspan="3" />
-</form>'''
-
-
-dates_form_ro = '''<?xml version="1.0"?>
-<form string="Choose your month">
-    <field name="month" />
-    <field name="year" />
-    <field name="user_id" colspan="3" readonly="1"/>
-</form>'''
-
-dates_fields = {
-    'month': dict(string=u'Month', type='selection', required=True, selection=[(x, datetime.date(2000, x, 1).strftime('%B')) for x in range(1, 13)]),
-    'year': dict(string=u'Year', type=u'integer', required=True),
-    'user_id' : dict(string=u'User', type='many2one', relation='res.users', required=True),
-}
-
-def _get_value(self, cr, uid, data, context):
-    today = datetime.date.today()
-    return dict(month=today.month, year=today.year, user_id=uid)
 
 class analytical_timesheet_employee(osv.osv_memory):
     _name = 'hr.analytical.timesheet.employee'
-    _description = 'Print Employee Timesheet'
+    _description = 'Print Employee Timesheet & Print My Timesheet'
     _columns = {
         'month': fields.selection([(x, datetime.date(2000, x, 1).strftime('%B')) for x in range(1, 13)],
                                   'Month', required=True),
@@ -82,20 +54,4 @@ class analytical_timesheet_employee(osv.osv_memory):
             'datas': datas,
             }
 analytical_timesheet_employee()
-
-class wizard_report_my(wizard.interface):
-    states = {
-        'init': {
-            'actions': [_get_value],
-            'result': {'type':'form', 'arch':dates_form_ro, 'fields':dates_fields, 'state':[ ('end','Cancel','gtk-cancel'),('report','Print','gtk-print')]}
-        },
-        'report': {
-            'actions': [],
-            'result': {'type':'print', 'report':'hr.analytical.timesheet', 'state':'end'}
-        }
-    }
-wizard_report_my('hr.analytical.timesheet.my')
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
index 63a073b3f31..a3b53a05d22 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
@@ -2,6 +2,7 @@
 <openerp>
     <data>
 
+		<!-- Print Employee Timesheet -->
     	<record id="view_hr_timesheet_employee" model="ir.ui.view">
             <field name="name">hr.analytical.timesheet.employee.form</field>
             <field name="model">hr.analytical.timesheet.employee</field>
@@ -35,5 +36,40 @@
         	parent="menu_hr_reporting_timesheet"
         	groups="hr.group_hr_manager" />
 
+
+      <!-- Print My Timesheet -->
+      <record id="view_hr_timesheet_my" model="ir.ui.view">
+            <field name="name">hr.analytical.timesheet.my.form</field>
+            <field name="model">hr.analytical.timesheet.employee</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Print My Timesheet">
+                	<group colspan="4" >
+	                	<field name="month" />
+	                	<field name="year" />
+	                	<field name="user_id" colspan="3" readonly="1" />
+                	</group>
+                    <group colspan="4" col="6">
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-print" string="Print" name="print_report" type="object"/>
+                   </group>
+               </form>
+            </field>
+        </record>
+
+		<record id="action_hr_timesheet_my" model="ir.actions.act_window">
+            <field name="name">Print My Timesheet</field>
+            <field name="res_model">hr.analytical.timesheet.employee</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_hr_timesheet_my"/>
+           <field name="target">new</field>
+        </record>
+
+        <menuitem action="action_hr_timesheet_my"
+        	id="menu_hr_timesheet_my"
+        	parent="menu_hr_reporting_timesheet"
+        	groups="hr.group_hr_user" />
+
     </data>
 </openerp>
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_users.py b/addons/hr_timesheet/wizard/hr_timesheet_print_users.py
new file mode 100644
index 00000000000..3931e41e185
--- /dev/null
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_users.py
@@ -0,0 +1,56 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero 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 Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import datetime
+
+from osv import osv, fields
+
+class analytical_timesheet_employees(osv.osv_memory):
+    _name = 'hr.analytical.timesheet.users'
+    _description = 'Print Employees Timesheet'
+    _columns = {
+        'month': fields.selection([(x, datetime.date(2000, x, 1).strftime('%B')) for x in range(1, 13)],
+                                  'Month', required=True),
+        'year': fields.integer('Year', required=True),
+        'user_ids': fields.many2many('res.users', 'timesheet_users_rel', 'timesheet_id', 'user_id', 'Users', required=True)
+                }
+
+    _defaults = {
+         'month': datetime.date.today().month,
+         'year': datetime.date.today().year,
+             }
+
+    def print_report(self, cr, uid, ids, context=None):
+        data = self.read(cr, uid, ids, context=context)[0]
+        datas = {
+             'ids': [],
+             'model': 'hr.employee',
+             'form': data
+                 }
+        return {
+            'type': 'ir.actions.report.xml',
+            'report_name': 'hr.analytical.timesheet_users',
+            'datas': datas,
+            }
+
+analytical_timesheet_employees()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
new file mode 100644
index 00000000000..4e12f4f2333
--- /dev/null
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+		<!-- Print Employees Timesheets -->
+    	<record id="view_hr_timesheet_users" model="ir.ui.view">
+            <field name="name">hr.analytical.timesheet.users.form</field>
+            <field name="model">hr.analytical.timesheet.users</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Employees Timesheet">
+                	<group colspan="4" >
+	                	<field name="month" />
+	                	<field name="year" />
+	                	<field name="user_ids" colspan="3" />
+                	</group>
+                    <group colspan="4" col="6">
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-print" string="Print" name="print_report" type="object"/>
+                   </group>
+               </form>
+            </field>
+        </record>
+
+		<record id="action_hr_timesheet_users" model="ir.actions.act_window">
+            <field name="name">Employees Timesheet</field>
+            <field name="res_model">hr.analytical.timesheet.users</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_hr_timesheet_users"/>
+           <field name="target">new</field>
+        </record>
+
+        <menuitem action="action_hr_timesheet_users"
+        	id="menu_hr_timesheet_users"
+        	parent="menu_hr_reporting_timesheet"
+        	groups="hr.group_hr_manager" />
+
+
+     </data>
+</openerp>
diff --git a/addons/hr_timesheet/wizard/wizard_print_timesheet_users.py b/addons/hr_timesheet/wizard/wizard_print_timesheet_users.py
deleted file mode 100644
index a00ddd00084..00000000000
--- a/addons/hr_timesheet/wizard/wizard_print_timesheet_users.py
+++ /dev/null
@@ -1,56 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero 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 Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import datetime
-
-form='''<?xml version="1.0"?>
-<form string="Choose Users">
-    <field name="month"/>
-    <field name="year"/>
-    <field name="user_ids" colspan="3"/>
-</form>'''
-
-fields = {
-    'month': dict(string=u'Month', type='selection', required=True, selection=[(x, datetime.date(2000, x, 1).strftime('%B')) for x in range(1, 13)]), 
-    'year': dict(string=u'Year', type='integer', required=True),
-    'user_ids': dict(string=u'Users', type='many2many', relation='res.users', required=True),
-}
-
-def _get_value(self, cr, uid, data, context):
-    today=datetime.date.today()
-    return dict(month=today.month, year=today.year)
-
-class wizard_report(wizard.interface):
-    states={
-        'init':{
-            'actions':[_get_value],
-            'result':{'type':'form', 'arch':form, 'fields':fields, 'state':[('end','Cancel','gtk-cancel'),('report','Print','gtk-print')]}
-        },
-        'report':{
-            'actions':[],
-            'result':{'type':'print', 'report':'hr.analytical.timesheet_users', 'state':'end'}
-        }
-    }
-wizard_report('hr.analytical.timesheet_users')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

From fbe9da561f98431275c54f06034f44655f219729 Mon Sep 17 00:00:00 2001
From: "mra (Open ERP)" <mra@tinyerp.com>
Date: Tue, 20 Apr 2010 12:40:13 +0530
Subject: [PATCH 5/5] [IMP] hr_timesheet: Add analytic jouranl while creating
 timesheet on sign in out by project wizard

bzr revid: mra@tinyerp.com-20100420071013-0sexr0fijz8dah4p
---
 addons/hr_timesheet/hr_timesheet_wizard.xml | 4 ++--
 addons/hr_timesheet/wizard/sign_in_out.py   | 9 ++++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/addons/hr_timesheet/hr_timesheet_wizard.xml b/addons/hr_timesheet/hr_timesheet_wizard.xml
index 8d84a261ba6..f0a2d7175b3 100644
--- a/addons/hr_timesheet/hr_timesheet_wizard.xml
+++ b/addons/hr_timesheet/hr_timesheet_wizard.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <!--<wizard id="si_so" model="hr.employee" name="hr_timesheet.si_so" string="Sign in / Sign out by project"/>-->
-       <!-- <menuitem action="si_so"  id="menu_si_so" parent="hr_attendance.menu_hr_attendance" type="wizard"/>-->
+        <wizard id="si_so" name="hr_timesheet.si_so" string="Sign in / Sign out by project"/>
+        <menuitem action="si_so"  id="menu_si_so" parent="hr_attendance.menu_hr_time_tracking" type="wizard"/>
 
     </data>
 </openerp>
diff --git a/addons/hr_timesheet/wizard/sign_in_out.py b/addons/hr_timesheet/wizard/sign_in_out.py
index 4aea035f829..ff532afc260 100644
--- a/addons/hr_timesheet/wizard/sign_in_out.py
+++ b/addons/hr_timesheet/wizard/sign_in_out.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -25,7 +25,7 @@ import time
 import pooler
 from tools.translate import _
 
-si_form ='''<?xml version="1.0"?> 
+si_form ='''<?xml version="1.0"?>
 <form string="Sign in / Sign out">
     <separator string="Sign in" colspan="4"/>
     <field name="name" readonly="True" />
@@ -98,6 +98,7 @@ def _sign_in_result(self, cr, uid, data, context):
 
 def _write(self, cr, uid, data, emp_id, context):
     timesheet_obj = pooler.get_pool(cr.dbname).get('hr.analytic.timesheet')
+    emp_obj = pooler.get_pool(cr.dbname).get('hr.employee')
     hour = (time.mktime(time.strptime(data['form']['date'] or time.strftime('%Y-%m-%d %H:%M:%S'), '%Y-%m-%d %H:%M:%S')) -
         time.mktime(time.strptime(data['form']['date_start'], '%Y-%m-%d %H:%M:%S'))) / 3600.0
     minimum = data['form']['analytic_amount']
@@ -110,6 +111,8 @@ def _write(self, cr, uid, data, emp_id, context):
     res['name'] = data['form']['info']
     res['account_id'] = data['form']['account_id']
     res['unit_amount'] = hour
+    emp_journal = emp_obj.browse(cr, uid, emp_id, context).journal_id
+    res['journal_id'] = emp_journal and emp_journal.id or False
     res.update(up)
     up = timesheet_obj.on_change_account_id(cr, uid, [], res['account_id']).get('value', {})
     res.update(up)