Bharat Devnani (Open ERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-bug-808704-ara into
lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
Related bugs:
Bug #808704 in OpenERP Addons: "hr-expense : incmplete handling of canceld
and reopened invoices"
https://bugs.launchpad.net/openobject-addons/+bug/808704
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-808704-ara/+merge/82672
Hello Qdp,
I have made some modifications in order to keep the functionality separate
between
hr_expense and supplier_invoice as suggested by you.
Thanks & Regards,
Devnani Bharat R.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-808704-ara/+merge/82672
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-bug-808704-ara.
=== modified file 'hr_expense/hr_expense.py'
--- hr_expense/hr_expense.py 2011-10-27 21:11:24 +0000
+++ hr_expense/hr_expense.py 2011-11-18 11:55:41 +0000
@@ -137,8 +137,9 @@
inv_ids.append(self.browse(cr, uid, id).invoice_id.id)
return {
'name': _('Supplier Invoices'),
+ 'view_type': 'form',
'view_mode': 'form',
- 'view_id': [res[1] if res else False],
+ 'view_id': [res and res[1] or False],
'res_model': 'account.invoice',
'context': "{'type':'out_invoice', 'journal_type': 'purchase'}",
'type': 'ir.actions.act_window',
=== modified file 'hr_expense/hr_expense_workflow.xml'
--- hr_expense/hr_expense_workflow.xml 2011-01-14 00:11:01 +0000
+++ hr_expense/hr_expense_workflow.xml 2011-11-18 11:55:41 +0000
@@ -104,13 +104,6 @@
</record>
<record id="t10" model="workflow.transition">
- <field name="act_from" ref="act_invoice"/>
- <field name="act_to" ref="act_refused"/>
- <field name="signal">subflow.cancel</field>
- <field name="group_id" ref="base.group_hr_user"/>
- </record>
-
- <record id="t11" model="workflow.transition">
<field name="act_from" ref="act_refused"/>
<field name="act_to" ref="act_draft"/>
<field name="signal">draft</field>
_______________________________________________
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
