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

[IMP]remaining added and view improvement 

bzr revid: sgo@tinyerp.com-20120529103949-wm8ln19qzwjar9yn
This commit is contained in:
Sanjay Gohel (Open ERP) 2012-05-29 16:09:49 +05:30
parent 6993932c06
commit 3bdb46d113
3 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/account_analytic_analysis/account_analytic_analysis.py
View File

@ -250,7 +250,7 @@ class account_analytic_account(osv.osv):
res = {}
for account in self.browse(cr, uid, ids, context=context):
if account.quantity_max != 0:
res[account.id] = account.quantity_max - account.hours_quantity
res[account.id] = account.quantity_max - account.hours_qtt_invoiced
else:
res[account.id] = 0.0
for id in ids:

22
addons/account_analytic_analysis/account_analytic_analysis_view.xml
View File

@ -28,6 +28,12 @@
</group>
</field>
</record> -->
<act_window
id="action_sales_order_line"
name="Sales Order Lines"
res_model="sale.order.line"
src_model="account.analytic.account"
/>
<record id="hr_timesheet.account_analytic_account_form_form" model="ir.ui.view">
<field name="name">account.analytic.account.invoice.form.inherit</field>
@ -59,31 +65,31 @@
<tr>
<th><div class="oe_field_label">Fix price Invoices</div></th>
<td><div><field name="so_visible" nolabel="1"/></div></td>
<td><div class="oe_float_field_view"><field name="fix_exp_max" nolabel="1" attrs="{'invisible': [('so_visible','=',0)]}"/></div></td>
<td><div class="oe_float_field_view"><field name="amount_max" nolabel="1" attrs="{'invisible': [('so_visible','=',0)]}"/></div></td>
<td><div class="oe_field_view"><field name="ca_invoiced" nolabel="1" attrs="{'invisible': [('so_visible','=',0)]}"/></div></td>
<td><div class="oe_field_view"></div></td>
<td><div class="oe_field_view"><field name="remaining_ca" nolabel="1" attrs="{'invisible': [('so_visible','=',0)]}"/></div></td>
<td><div class="oe_float_field_view"><field name="ca_to_invoice" nolabel="1" attrs="{'invisible': [('so_visible','=',0)]}"/></div></td>
<td><button class="oe_title_button_right" name="%(sale.action_order_form)d" string="Sales" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('so_visible','=',0)]}"/></td>
<td><button class="oe_title_button_right" name="%(action_sales_order_line)d" string="Sales" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('so_visible','=',0)]}"/></td>
<td><button class="oe_title_button_left" name="%(sale.action_order_line_tree2)d" string="Lines To Invoice" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('so_visible','=',0)]}"/></td>
</tr>
<tr>
<th><div class="oe_field_label">Invoice on timesheet</div></th>
<td><div><field name="timsheet_visible" nolabel="1"/></div></td>
<td><div class="oe_float_field_view" ><field name="timesheet_max" nolabel="1" attrs="{'invisible': [('timsheet_visible','=',0)]}"/></div></td>
<td><div class="oe_float_field_view" ><field name="quantity_max" nolabel="1" attrs="{'invisible': [('timsheet_visible','=',0)]}"/></div></td>
<td><div class="oe_field_view" ><field name="hours_qtt_invoiced" nolabel="1" attrs="{'invisible': [('timsheet_visible','=',0)]}"/></div></td>
<td><div class="oe_field_view" ></div></td>
<td><div class="oe_field_view" ><field name="remaining_hours" nolabel="1" attrs="{'invisible': [('timsheet_visible','=',0)]}"/></div></td>
<td><div class="oe_float_field_view" ><field name="hours_qtt_non_invoiced" nolabel="1" attrs="{'invisible': [('timsheet_visible','=',0)]}"/></div></td>
<td><button class="oe_title_button_right" name="%(hr_timesheet_invoice.act_account_analytic_account_2_report_timehsheet_account)d" string="Timesheets" type="action" attrs="{'invisible': [('timsheet_visible','=',0)]}"/></td>
<td><button class="oe_title_button_right" name="%(account.action_account_tree1)d" string="Timesheets" type="action" attrs="{'invisible': [('timsheet_visible','=',0)]}"/></td>
<td><button class="oe_title_button_left" name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Invoice Timesheets" type="action" attrs="{'invisible': [('timsheet_visible','=',0)]}"/></td>
</tr>
<tr>
<!-- <tr>
<th><div class="oe_field_label" >Charge Expenses</div></th>
<td><div><field name="expense_visible" nolabel="1"/></div></td>
<td><div class="oe_float_field_view" ><field name="expense_max" nolabel="1" attrs="{'invisible': [('expense_visible','=',0)]}"/></div></td>
<td><div class="oe_field_view" ></div></td>
<td><div class="oe_field_view" ></div></td>
<td><div class="oe_float_field_view"></div></td>
</tr>
</tr> -->
<tr name="total">
<th><div class="oe_field_label" >Total</div></th>
<td><div></div></td>

2
addons/hr_timesheet_invoice/report/report_analytic_view.xml
View File

@ -136,7 +136,7 @@
<act_window
domain="[('invoice_id','=',False),('to_invoice','&lt;&gt;',False)]"
context="{'search_default_account_id': [active_id], 'default_account_id': active_id}"
context="{'search_default_account_id': [active_id], 'default_account_id': active_id,'search_default_to_invoice': 1}"
id="act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice"
name="Lines to Invoice"
res_model="account.analytic.line"