[MERGE]:lp:~openerp-dev/openobject-addons/trunk-contract-apa-view-imp-dbr
bzr revid: apa@tinyerp.com-20120531100727-cjcog77k58gbhcf6
This commit is contained in:
Amit Patel (OpenERP)
commit
f1bdc8faff
|
|
@ -35,7 +35,7 @@ user-wise as well as month wise.
|
|||
"author": "Camptocamp",
|
||||
"website": "http://www.camptocamp.com/",
|
||||
"images": ["images/bill_tasks_works.jpeg","images/overpassed_accounts.jpeg"],
|
||||
"depends": ["hr_expense","hr_timesheet_invoice", "sale"], #although sale is technically not required to install this module, all menuitems are located under 'Sales' application
|
||||
"depends": ["hr_expense","hr_timesheet_invoice", "sale","project"], #although sale is technically not required to install this module, all menuitems are located under 'Sales' application
|
||||
"init_xml": [],
|
||||
"update_xml": [
|
||||
"security/ir.model.access.csv",
|
||||
|
|
|
|||
|
|
@ -122,6 +122,92 @@
|
|||
</field>
|
||||
</record>
|
||||
|
||||
<record id="project_account_analytic_account_form" model="ir.ui.view">
|
||||
<field name="name">project.project.form.inherit</field>
|
||||
<field name="model">project.project</field>
|
||||
<field name="type">form</field>
|
||||
<field name="inherit_id" ref="project.edit_project"/>
|
||||
<field eval="18" name="priority"/>
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr='//page[@name="team"]' position='after'>
|
||||
<page string="Contract data">
|
||||
<group colspan="2" col= "2" class="oe_form_group_label_border">
|
||||
<separator colspan="2" string="Validity"/>
|
||||
<field name="date_start"/>
|
||||
<field name="date"/>
|
||||
</group>
|
||||
<group colspan="2" col= "2" class="oe_form_group_label_border">
|
||||
<separator colspan="2" string="Invoice Rate"/>
|
||||
<field name="pricelist_id" />
|
||||
<field name="to_invoice" widget="selection" />
|
||||
</group>
|
||||
<group col="6" colspan="2" class="oe_form_group_label_border">
|
||||
<field name="quantity_max"/><field name="company_uom_id" nolabel="1" readonly="1"/><field name="remaining_hours" string="/ Remaining"/>
|
||||
</group>
|
||||
<separator colspan="4" string="Invoicing"/>
|
||||
<group col="1" colspan="4">
|
||||
<table border="0">
|
||||
<tr>
|
||||
<th class="oe_th_137px" 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_110px">Ready To Invoice</th>
|
||||
<th width="10px"></th>
|
||||
<th class="oe_th_150px"></th>
|
||||
<th class="oe_th_150px"></th>
|
||||
</tr>
|
||||
<tr>
|
||||
<th class="oe_border_right">Fix Price Invoices</th>
|
||||
<td><field name="fix_price_invoices" nolabel="1"/></td>
|
||||
<td class="oe_amount_center oe_th_110px"><field name="amount_max" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
|
||||
<td class="oe_amount_center oe_th_110px"><field name="ca_invoiced" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
|
||||
<td class="oe_amount_center oe_th_110px oe_border_right"><field name="remaining_ca" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
|
||||
<td class="oe_amount_center oe_th_110px"><field name="ca_to_invoice" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
|
||||
<td width="10px"></td>
|
||||
<td class="oe_th_150px"><button 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 class="oe_th_150px"><button 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>
|
||||
</tr>
|
||||
<tr>
|
||||
<th class="oe_border_right">Inv. On Timesheets</th>
|
||||
<td><field name="invoice_on_timesheets" nolabel="1"/></td>
|
||||
<td class="oe_amount_center oe_th_110px"><field name="quantity_max" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
|
||||
<td class="oe_amount_center oe_th_110px"><field name="hours_qtt_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
|
||||
<td class="oe_amount_center oe_th_110px oe_border_right"><field name="remaining_hours" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
|
||||
<td class="oe_amount_center oe_th_110px"><field name="hours_qtt_non_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
|
||||
<td width="10px"></td>
|
||||
<td class="oe_th_150px"><button class= "oe_btn_width" name="%(action_timesheet_lines_tree)d" string="Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
|
||||
<td class="oe_th_150px"><button 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>
|
||||
<tr>
|
||||
<th class="oe_border_right">Charge Expenses</th>
|
||||
<td><field name="charge_expenses" nolabel="1"/></td>
|
||||
<td class="oe_amount_center oe_th_110px"><field name="expense_max" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
|
||||
<td class="oe_amount_center oe_th_110px"><field name="expense_invoiced" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
|
||||
<td class="oe_amount_center oe_th_110px oe_border_right"><field name="remaining_expense" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
|
||||
<td class="oe_amount_center oe_th_110px"><field name="expense_to_invoice" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
|
||||
<td width="10px"></td>
|
||||
<td class="oe_th_150px"><button class= "oe_btn_width" name="open_hr_expense" string="Expenses" type="object" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
|
||||
<td class="oe_th_150px"><button class= "oe_btn_width" name="hr_to_invoiced_expense" string="Invoice Expenses" type="object" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th class="oe_border_right">Total</th>
|
||||
<td width="10px"></td>
|
||||
<td class="oe_amount_center oe_th_110px oe_border_top"><field name="est_total" nolabel="1"/></td>
|
||||
<td class="oe_amount_center oe_th_110px oe_border_top"><field name="invoiced_total" nolabel="1"/></td>
|
||||
<td class="oe_amount_center oe_th_110px oe_border_right oe_border_top"><field name="remaining_total" nolabel="1"/></td>
|
||||
<td class="oe_amount_center oe_th_110px oe_border_top"><field name="toinvoice_total" nolabel="1"/></td>
|
||||
</tr>
|
||||
</table>
|
||||
</group>
|
||||
<separator string="Terms and Condition" colspan="4"/>
|
||||
<field colspan="4" name="description" nolabel="1"/>
|
||||
</page>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<!-- Add information on Account analytic list for the project management -->
|
||||
<record id="view_account_analytic_account_tree_c2c_2" model="ir.ui.view">
|
||||
<field name="name">account.analytic.account.tree</field>
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@
|
|||
<field name="active" attrs="{'invisible':[('state','in',['open', 'pending', 'template'])]}"/>
|
||||
</group>
|
||||
</page>
|
||||
<page string="Team">
|
||||
<page name="team" string="Team">
|
||||
<field colspan="4" name="members" nolabel="1" help="Project's members are users who can have an access to the tasks related to this project.">
|
||||
<tree string="Members">
|
||||
<field name="name"/>
|
||||
|
|
|
|||
Loading…
Reference in New Issue