Divyesh Makwana(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-hr_expense-improvement-mdi into
lp:~openerp-dev/openobject-addons/trunk-hr_expense.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-hr_expense-improvement-mdi/+merge/116192
Hello Sir,
I have done the following improvements:
1. The button approve must be visible by HR Officer.
2. Rename the "Issue Receipt" into "Generate Account Entry" and make it visible
only by the eInvoicing & Payment User (not the HR).
3. "Open Receipt" must be normal, not red.
4. Rename "Done" status into "Paid".
Thanks,
Divyesh
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-hr_expense-improvement-mdi/+merge/116192
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-dev/openobject-addons/trunk-hr_expense-improvement-mdi into
lp:~openerp-dev/openobject-addons/trunk-hr_expense.
=== modified file 'hr_expense/hr_expense.py'
--- hr_expense/hr_expense.py 2012-07-17 10:42:14 +0000
+++ hr_expense/hr_expense.py 2012-07-23 06:01:22 +0000
@@ -86,10 +86,10 @@
('cancelled', 'Refused'),
('confirm', 'Waiting Approval'),
('accepted', 'Approved'),
- ('done', 'Done'),
+ ('done', 'Paid'),
],
'Status', readonly=True, help='When the expense request is created the status is \'Draft\'.\n It is confirmed by the user and request is sent to admin, the status is \'Waiting Confirmation\'.\
- \nIf the admin accepts it, the status is \'Accepted\'.\n If a receipt is made for the expense request, the status is \'Done\'.'),
+ \nIf the admin accepts it, the status is \'Accepted\'.\n If a receipt is made for the expense request, the status is \'Paid\'.'),
}
_defaults = {
'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'hr.employee', context=c),
=== modified file 'hr_expense/hr_expense_view.xml'
--- hr_expense/hr_expense_view.xml 2012-07-17 10:42:14 +0000
+++ hr_expense/hr_expense_view.xml 2012-07-23 06:01:22 +0000
@@ -68,8 +68,8 @@
<button name="confirm" states="draft" string="Submit to Manager" type="workflow" class="oe_highlight"/>
<button name="validate" states="confirm" string="Approve" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
<button name="draft" states="confirm,cancelled" string="Set to Draft" type="workflow" groups="base.group_hr_user" />
- <button name="done" states="accepted" string="Issue Receipt" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
- <button name="action_view_receipt" states="done" string="Open Receipt" type="object" class="oe_highlight"/>
+ <button name="done" states="accepted" string="Generate Account Entry" type="workflow" groups="account.group_account_invoice" class="oe_highlight"/>
+ <button name="action_view_receipt" states="done" string="Open Receipt" type="object"/>
<button name="refuse" states="confirm,accepted" string="Refuse" type="workflow" groups="base.group_hr_user" />
<field name="state" widget="statusbar" statusbar_visible="draft,confirm,accepted,done" statusbar_colors='{"confirm":"blue","cancelled":"red"}'/>
</header>
_______________________________________________
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
