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

Some changes to better invoice on projects 

Uninvoiced entries of my projects
	Zoom from project to entries
HR_EXPENSE
	Better view for expenses
	Copy method on expenses to duplicated

bzr revid: fp@tinyerp.com-12363987d21a90d76b2b63580c9973f661637c8e
This commit is contained in:
Fabien Pinckaers 2007-07-04 11:12:50 +00:00
parent 93d8dda3f8
commit be4eb5d379
5 changed files with 40 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
addons/account_analytic_analysis/account_analytic_analysis_menu.xml
View File

@ -16,6 +16,18 @@
id="menu_analytic_account_managed"
action="action_account_analytic_managed" />
<record model="ir.actions.act_window" id="action_hr_tree_invoiced_my">
<field name="name">Uninvoiced entries of my accounts</field>
<field name="res_model">account.analytic.line</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('invoice_id','=',False),('to_invoice','!=',False),('account_id.user_id','=',uid)]</field>
</record>
<menuitem name="Project/Analytic accounts/Uninvoiced entries of my projects"
id="menu_action_hr_tree_invoiced_my"
action="action_hr_tree_invoiced_my"/>
<record model="ir.actions.act_window" id="action_account_analytic_managed_open">
<field name="name">My open managed accounts</field>

5
addons/hr_expense/hr_expense.py
View File

@ -39,6 +39,11 @@ def _employee_get(obj,cr,uid,context={}):
return False
class hr_expense_expense(osv.osv):
def copy(self, cr, uid, id, default=None, context={}):
if not default: default = {}
default.update( {'invoice_id':False,'date_confirm':False,'date_valid':False,'user_valid':False})
return super(hr_expense_expense, self).copy(cr, uid, id, default, context)
def _amount(self, cr, uid, ids, field_name, arg, context):
id_set = ",".join(map(str, ids))
cr.execute("SELECT s.id,COALESCE(SUM(l.unit_amount*l.unit_quantity),0) AS amount FROM hr_expense_expense s LEFT OUTER JOIN hr_expense_line l ON (s.id=l.expense_id) WHERE s.id IN ("+id_set+") GROUP BY s.id ")

4
addons/hr_expense/hr_expense_view.xml
View File

@ -54,10 +54,10 @@
<form string="Expense Lines">
<field name="name" select="1"/>
<field name="date_value" select="1"/>
<field name="unit_quantity" select="2"/>
<field name="unit_amount" select="2"/>
<field name="product_id" select="2" on_change="onchange_product_id(product_id, uom_id)"/>
<field name="uom_id" select="2" on_change="onchange_product_id(product_id, uom_id)"/>
<field name="unit_quantity" select="2"/>
<field name="unit_amount" select="2"/>
<field name="ref" select="2"/>
<field name="sequence"/>
<field name="analytic_account" domain="[('type','=','normal')]"/>

11
addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
View File

@ -123,6 +123,17 @@
action="action_hr_analytic_timesheet_tree_invoiced"/>
<record model="ir.actions.act_window" id="action_hr_analytic_timesheet_tree_invoiced_my">
<field name="name">My uninvoiced Entries</field>
<field name="res_model">account.analytic.line</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('invoice_id','=',False),('to_invoice','!=',False),('user_id','=',uid)]</field>
</record>
<menuitem name="Financial Management/Periodical Processing/Invoice on Entries/Uninvoiced Entries/My uninvoiced entries"
id="menu_hr_analytic_timesheet_tree_invoiced_my"
action="action_hr_analytic_timesheet_tree_invoiced_my"/>
<record model="ir.actions.act_window" id="action_open_analytic_accounts">
<field name="name">Open analytic accounts</field>
<field name="res_model">account.analytic.account</field>

14
addons/report_analytic_line/report_analytic_line_view.xml
View File

@ -57,15 +57,21 @@
</record>
<menuitem name="Financial Management/Reporting/Analytic/All Months/Analytic lines to invoice" id="account_analytic_lines_to_invoice_report" action="action_account_analytic_line_to_invoice" />
<act_window name="Analytic lines to invoice"
<act_window name="Costs to invoice"
domain="[('product_id', '=', active_id)]"
res_model="report.account.analytic.line.to.invoice"
src_model="product.product"
id="act_product_product_2_report_acc_analytic_line_to_invoice"/>
<act_window name="Analytic lines to invoice"
domain="[('account_id', '=', active_id)]"
res_model="report.account.analytic.line.to.invoice"
<act_window name="Costs to invoice"
domain="[('user_id', '=', active_id),('invoice_id','=',False),('to_invoice','&lt;&gt;',False)]"
res_model="account.analytic.line"
src_model="res.users"
id="act_users_analytic_acc_2_report_acc_analytic_line_to_invoice"/>
<act_window name="Costs to invoice"
domain="[('account_id', '=', active_id),('invoice_id','=',False),('to_invoice','&lt;&gt;',False)]"
res_model="account.analytic.line"
src_model="account.analytic.account"
id="act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice"/>
</data>