Pinakin Nayi (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-addons-hr-timetracking-pso-imp-pna into
lp:~openerp-dev/openobject-addons/trunk-addons-hr-timetracking-pso.
Requested reviews:
Priyesh (OpenERP) (pso-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons-hr-timetracking-pso-imp-pna/+merge/122441
Hello sir,
I improved and solve the issue in timesheet line.
Thanks,
pna
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons-hr-timetracking-pso-imp-pna/+merge/122441
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-addons-hr-timetracking-pso.
=== modified file 'hr_timesheet/hr_timesheet_view.xml'
--- hr_timesheet/hr_timesheet_view.xml 2012-08-29 19:08:31 +0000
+++ hr_timesheet/hr_timesheet_view.xml 2012-09-03 05:25:24 +0000
@@ -9,7 +9,7 @@
<tree editable="bottom" string="Timesheet Lines">
<field name="date" on_change="on_change_date(date)"/>
<field name="user_id" on_change="on_change_user_id(user_id)" required="1"/>
- <field name="journal_id" invisible="1"/>
+ <field name="journal_id"/>
<field name="name"/>
<field domain="[('type','=','normal'),('use_timesheets','=',1)]" name="account_id" context="{'default_use_timesheets': 1}"/>
<field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" required="1" domain="[('type','=','service')]" invisible="1"/>
=== modified file 'hr_timesheet_sheet/hr_timesheet_sheet_view.xml'
--- hr_timesheet_sheet/hr_timesheet_sheet_view.xml 2012-08-13 16:06:57 +0000
+++ hr_timesheet_sheet/hr_timesheet_sheet_view.xml 2012-09-03 05:25:24 +0000
@@ -46,7 +46,7 @@
<field name="arch" type="xml">
<form string="Timesheet" version="7.0">
<header>
- <button name="button_confirm" states="draft" string="Submited to Manager" type="object" class="oe_highlight"/>
+ <button name="button_confirm" states="draft" string="Submit to Manager" type="object" class="oe_highlight"/>
<button name="done" states="confirm" string="Approve" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
<button name="action_set_to_draft" states="done" string="Set to Draft" type="object" />
<button name="cancel" states="confirm" string="Refuse" type="workflow" groups="base.group_hr_user" />
@@ -108,7 +108,7 @@
<field name="name"/>
<field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" widget="float_time"/>
<field name="to_invoice" widget="selection"/>
- <field invisible="1" name="journal_id"/>
+ <field name="journal_id"/>
<field invisible="1" name="product_id" domain="[('type','=','service')]" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)"/>
<field invisible="1" name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)"/>
<field invisible="1" name="amount"/>
=== modified file 'hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot'
--- hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot 2012-08-08 14:46:13 +0000
+++ hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot 2012-09-03 05:25:24 +0000
@@ -976,7 +976,7 @@
#. module: hr_timesheet_sheet
#: view:hr_timesheet_sheet.sheet:0
-msgid "Submited to Manager"
+msgid "Submit to Manager"
msgstr ""
#. module: hr_timesheet_sheet
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
