odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

Merged 

bzr revid: jni@tinyerp.com-20101007094536-bb0j6jtwkjpb8ut9
This commit is contained in:
Jni (Open ERP) 2010-10-07 15:15:36 +05:30
parent 18e684f924 9161b4c4c7
commit e6c277b409
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addons/account/invoice.py
View File

@ -1622,6 +1622,7 @@ class account_invoice_tax(osv.osv):
tax_grouped[key]['tax_amount'] += val['tax_amount']
for t in tax_grouped.values():
t['base'] = cur_obj.round(cr, uid, cur, t['base'])
t['amount'] = cur_obj.round(cr, uid, cur, t['amount'])
t['base_amount'] = cur_obj.round(cr, uid, cur, t['base_amount'])
t['tax_amount'] = cur_obj.round(cr, uid, cur, t['tax_amount'])

3
addons/account_analytic_default/account_analytic_default.py
View File

@ -111,8 +111,9 @@ class sale_order_line(osv.osv):
sale_line = self.browse(cr, uid, ids[0], context)
inv_line_obj = self.pool.get('account.invoice.line')
anal_def_obj = self.pool.get('account.analytic.default')
for line in inv_line_obj.browse(cr, uid, create_ids, context):
rec = anal_def_obj.account_get(cr, uid, line.product_id.id, sale_line.order_id.partner_id.id, uid, time.strftime('%Y-%m-%d'), context)
rec = anal_def_obj.account_get(cr, uid, line.product_id.id, sale_line.order_id.partner_id.id, sale_line.order_id.user_id.id, time.strftime('%Y-%m-%d'), context)
if rec:
inv_line_obj.write(cr, uid, [line.id], {'account_analytic_id':rec.analytic_id.id}, context=context)

11
addons/account_analytic_default/account_analytic_default_view.xml
View File

@ -53,14 +53,14 @@
</field>
</record>
<record id="action_analytic_default_form" model="ir.actions.act_window">
<record id="action_analytic_default_list" model="ir.actions.act_window">
<field name="name">Analytic Defaults</field>
<field name="res_model">account.analytic.default</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="search_view_id" ref="view_account_analytic_default_form_search"/>
</record>
<act_window
name="Entries"
id="act_account_acount_move_line_open"
@ -68,7 +68,12 @@
src_model="account.account"
context="{'search_default_account_id': [active_id]}"
/>
<menuitem
action="action_analytic_default_list"
id="menu_analytic_default_list"
parent="account.menu_analytic_accounting"/>
<act_window
name="Analytic Rules"

2
addons/hr_attendance/report/timesheet.py
View File

@ -82,7 +82,7 @@ class report_custom(report_rml):
for att in attendances:
dt = datetime.strptime(att['name'], '%Y-%m-%d %H:%M:%S')
if att['action'] == 'sign_out':
week_wh[ldt.date().weekday()] = week_wh.get(ldt.date().weekday(), 0) + (dt - ldt).hours
week_wh[ldt.date().weekday()] = week_wh.get(ldt.date().weekday(), 0) + ((dt - ldt).seconds/3600)
ldt = dt
# Week xml representation