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

[IMP]improve view in contract 

bzr revid: sgo@tinyerp.com-20120612130056-vjryu1lo5l9v5cq4
This commit is contained in:
Sanjay Gohel (Open ERP) 2012-06-12 18:30:56 +05:30
parent 6c2f1fcf1e
commit 2c1d31f4e5
4 changed files with 43 additions and 33 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

@ -387,7 +387,7 @@ class account_analytic_account(osv.osv):
digits_compute=dp.get_precision('Account')),
'ca_to_invoice': fields.function(_analysis_all, multi='analytic_analysis', type='float', string='Uninvoiced Amount',
help="If invoice from analytic account, the remaining amount you can invoice to the customer based on the total costs.",
digits_compute=dp.get_precision('Account')),
digits_compute=dp.get_precision('Account'),store="True"),
'ca_theorical': fields.function(_analysis_all, multi='analytic_analysis', type='float', string='Theoretical Revenue',
help="Based on the costs you had on the project, what would have been the revenue if all these costs have been invoiced at the normal sale price provided by the pricelist.",
digits_compute=dp.get_precision('Account')),

50
addons/account_analytic_analysis/account_analytic_analysis_view.xml
View File

@ -35,44 +35,46 @@
<tr>
<th class="oe_th_160px" height="20px"></th>
<th width="10px"></th>
<th class="oe_th_110px">Est.Tot</th>
<th class="oe_th_110px">Invoiced</th>
<th class="oe_th_110px">Remaining</th>
<th class="oe_th_90px">Est.Tot</th>
<th class="oe_th_90px">Invoiced</th>
<th class="oe_th_90px">Remaining</th>
<th class="oe_th_110px">Ready To Invoice</th>
<th width="10px"></th>
<th></th>
<th></th>
</tr>
<tr>
<th class="oe_border_right">Fix Price Invoices</th>
<td><field name="fix_price_invoices" nolabel="1"/></td>
<td><field class="oe_th_110px" name="amount_max" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
<td class="oe_th_110px"><field name="ca_invoiced" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
<td class="oe_th_110px oe_border_right"><field name="remaining_ca" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
<td class="oe_th_110px"><field name="ca_to_invoice" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
<td width="10px"></td>
<td><button icon="terp-check" class= "oe_btn_width" name="%(action_sales_order_line)d" string="Sales" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
<td><button icon="terp-dolar_ok!" class= "oe_btn_width" 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': [('fix_price_invoices','=',0)]}"/></td>
<th class="oe_th_160px oe_border_right">Fix Price Invoices</th>
<td><field width="10px" name="fix_price_invoices" nolabel="1"/></td>
<group attrs="{'invisible': [('fix_price_invoices','=',0)]}">
<td><field class="oe_th_90px" name="amount_max" nolabel="1" /></td>
<td ><field class="oe_th_90px" name="ca_invoiced" nolabel="1" /></td>
<td ><field class="oe_th_90px oe_border_right" name="remaining_ca" nolabel="1" /></td>
<td ><field class="oe_th_110px" name="ca_to_invoice" nolabel="1" /></td>
<td width="10px"></td>
<td><button icon="terp-check" class= "oe_btn_width_120px" name="%(action_sales_order_line)d" string="Sales" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
<td><button icon="terp-dolar_ok!" class= "oe_btn_width" 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': [('fix_price_invoices','=',0)]}"/></td>
</group>
</tr>
<tr>
<th class="oe_border_right">Invoice On Timesheets</th>
<td><field name="invoice_on_timesheets" nolabel="1"/></td>
<td><field class="oe_th_110px" name="hours_qtt_est" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
<td class="oe_th_110px"><field name="hours_qtt_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
<td class="oe_th_110px oe_border_right"><field name="remaining_hours" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
<td class="oe_th_110px"><field name="hours_qtt_non_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
<th class="oe_th_160px oe_border_right">Invoice On Timesheets</th>
<td><field width="10px" name="invoice_on_timesheets" nolabel="1"/></td>
<td><field class="oe_th_90px" name="hours_qtt_est" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
<td ><field class="oe_th_90px" name="hours_qtt_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
<td ><field class="oe_th_90px oe_border_right" name="remaining_hours" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
<td ><field class="oe_th_110px" name="hours_qtt_non_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
<td width="10px"></td>
<td><button icon="terp-go-week" class= "oe_btn_width" name="%(hr_timesheet.act_hr_timesheet_line_evry1_all_form)d" string="Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
<td><button icon="terp-go-week" class= "oe_btn_width_120px" name="%(hr_timesheet.act_hr_timesheet_line_evry1_all_form)d" string="Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
<td><button icon="terp-dolar" class= "oe_btn_width" name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Invoice Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
</tr>
<div name="end_of_tabl_hook"/>
<tr>
<th class="oe_border_right">Total</th>
<th class="oe_th_160px oe_border_right">Total</th>
<td width="10px"></td>
<td class="oe_th_110px oe_border_top"><field name="est_total" nolabel="1"/></td>
<td class="oe_th_110px oe_border_top"><field name="invoiced_total" nolabel="1"/></td>
<td class="oe_th_110px oe_border_right oe_border_top"><field name="remaining_total" nolabel="1"/></td>
<td class="oe_th_110px oe_border_top"><field name="toinvoice_total" nolabel="1"/></td>
<td ><field class="oe_th_90px oe_border_top" name="est_total" nolabel="1"/></td>
<td ><field class="oe_th_90px oe_border_top" name="invoiced_total" nolabel="1"/></td>
<td ><field class="oe_th_90px oe_border_right oe_border_top" name="remaining_total" nolabel="1"/></td>
<td ><field class="oe_th_110px oe_border_top" name="toinvoice_total" nolabel="1"/></td>
</tr>
</table>
</xpath>

14
addons/account_analytic_analysis/static/src/css/account_analytic.css
View File

@ -1,10 +1,10 @@
.oe_th_110px{
width:110px !important;
.oe_th_90px{
width:90px !important;
text-align: center !important;
vertical-align: middle;
}
.oe_th_160px{
width:160px;
width:150px;
}
.oe_btn_width{
width: 150px !important;
@ -15,4 +15,12 @@
}
.oe_border_top{
border-top: 1px solid #000000;
}
.oe_th_110px{
width:110px !important;
text-align: center !important;
vertical-align: middle;
}
.oe_btn_width_120px{
width: 110px !important;
}

10
addons/analytic_contract_hr_expense/analytic_contract_hr_expense_view.xml
View File

@ -10,14 +10,14 @@
<field name="arch" type="xml">
<xpath expr='//div[@name="end_of_tabl_hook"]' position='before'>
<tr>
<th class="oe_border_right">Charge Expenses</th>
<th class="oe_th_160px oe_border_right">Charge Expenses</th>
<td><field name="charge_expenses" nolabel="1"/></td>
<td><field class="oe_th_110px" name="est_expenses" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
<td class="oe_th_110px"><field name="expense_invoiced" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
<td class="oe_th_110px oe_border_right"><field name="remaining_expense" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
<td><field class="oe_th_90px" name="est_expenses" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
<td class="oe_th_90px"><field name="expense_invoiced" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
<td class="oe_th_90px oe_border_right"><field name="remaining_expense" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
<td class="oe_th_110px"><field name="expense_to_invoice" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
<td width="10px"></td>
<td><button icon="gtk-select-all" class= "oe_btn_width" name="open_hr_expense" string="Expenses" type="object" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
<td><button icon="gtk-select-all" class= "oe_btn_width_120px" name="open_hr_expense" string="Expenses" type="object" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
<td><button icon="terp-dolar" class= "oe_btn_width" name="hr_to_invoiced_expense" string="Invoice Expenses" type="object" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
</tr>
</xpath>