Jalpesh Patel(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-addons15_hr-pja into
lp:openobject-addons.
Requested reviews:
Atul Patel(OpenERP) (atp-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons15_hr-pja/+merge/128694
Hello,
i have improve code hr_timesheet_invoice.py file in hr_timesheet_invoice
module to fix problem of creating timesheet lines (user is employee + partner
manager + sales manager) and improve hr dashboard applications to be processed
list view.
Thanks!
pja
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons15_hr-pja/+merge/128694
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-addons15_hr-pja.
=== modified file 'hr_recruitment/board_hr_recruitment_statistical_view.xml'
--- hr_recruitment/board_hr_recruitment_statistical_view.xml 2012-09-06 15:23:03 +0000
+++ hr_recruitment/board_hr_recruitment_statistical_view.xml 2012-10-09 12:10:29 +0000
@@ -6,12 +6,13 @@
<field name="name">applicants.status.tree</field>
<field name="model">hr.applicant</field>
<field name="arch" type="xml">
- <tree colors="blue:state == 'draft';black:state in ('open','pending','done','cancel');" string="Applicants Status">
+ <tree string="Applicants Status">
<field name="create_date"/>
<field name="job_id"/>
<field name="partner_name"/>
<field name="stage_id"/>
- <field name="state" groups="base.group_no_one"/>
+ <field name="partner_phone"/>
+ <field name="user_id"/>
</tree>
</field>
</record>
@@ -32,7 +33,7 @@
<field name="inherit_id" ref="hr.board_hr_form"/>
<field name="arch" type="xml">
<xpath expr="/form/board/column[1]" position="inside">
- <action name="%(action_applicants_status)d" string="Applicants To be Processed"/>
+ <action name="%(action_applicants_status)d" string="Applications to be Processed"/>
</xpath>
</field>
</record>
=== modified file 'hr_timesheet_invoice/hr_timesheet_invoice.py'
--- hr_timesheet_invoice/hr_timesheet_invoice.py 2012-10-02 20:40:23 +0000
+++ hr_timesheet_invoice/hr_timesheet_invoice.py 2012-10-09 12:10:29 +0000
@@ -129,15 +129,18 @@
def _default_journal(self, cr, uid, context=None):
proxy = self.pool.get('hr.employee')
record_ids = proxy.search(cr, uid, [('user_id', '=', uid)], context=context)
- employee = proxy.browse(cr, uid, record_ids[0], context=context)
- return employee.journal_id and employee.journal_id.id or False
+ if record_ids:
+ employee = proxy.browse(cr, uid, record_ids[0], context=context)
+ return employee.journal_id and employee.journal_id.id or False
+ return False
def _default_general_account(self, cr, uid, context=None):
proxy = self.pool.get('hr.employee')
record_ids = proxy.search(cr, uid, [('user_id', '=', uid)], context=context)
- employee = proxy.browse(cr, uid, record_ids[0], context=context)
- if employee.product_id and employee.product_id.property_account_income:
- return employee.product_id.property_account_income.id
+ if record_ids:
+ employee = proxy.browse(cr, uid, record_ids[0], context=context)
+ if employee.product_id and employee.product_id.property_account_income:
+ return employee.product_id.property_account_income.id
return False
_defaults = {
_______________________________________________
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
