pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP]account_analytic_analysis: Inherit project form view

Browse Source 
bzr revid: dbr@tinyerp.com-20120531093323-wks6p7arbyoam8t9
This commit is contained in:
DBR (OpenERP)
2012-05-31 15:03:23 +05:30
parent b6f5bfb741
commit 498549e8e5
4 changed files with 89 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account_analytic_analysis/__openerp__.py
+1 -1
View File
@@ -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_timesheet_invoice", "sale"], #although sale is technically not required to install this module, all menuitems are located under 'Sales' application
"depends": ["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",
addons/account_analytic_analysis/account_analytic_analysis_view.xml
+86
View File
@@ -248,6 +248,92 @@
</field>
</record>
<record id="project_account_analytic_account_form" model="ir.ui.view">
<field name="name">project.account.analytic.account.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" name="contract_page">
<group colspan="2" col= "2" name="contract" class="oe_form_group_label_border">
<separator colspan="2" string="Validity"/>
<field name="date_start"/>
<field name="date"/>
<group col="6" colspan="3" class="oe_form_group_label_border">
<field name="quantity_max"/><field name="company_uom_id" nolabel="1"/><field name="remaining_hours" string="/ Remaining"/>
</group>
</group>
<group colspan="2" col= "2" name="invoice_rate" class="oe_form_group_label_border">
<separator colspan="2" string="Invoice Rate"/>
<field name="pricelist_id" />
<field name="to_invoice" widget="selection" />
</group>
<separator colspan="4" string="Invoicing" name="invoicing"/>
<group col="1" colspan="4">
<table border="0">
<tr>
<th class="oe_th_150px" 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">Invoice 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">todo</td>
<td class="oe_amount_center oe_th_110px">todo</td>
<td class="oe_amount_center oe_th_110px oe_border_right">todo</td>
<td class="oe_amount_center oe_th_110px">todo</td>
<td width="10px"></td>
<td class="oe_th_150px">todo</td>
<td class="oe_th_150px">todo</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">todo</td>
<td class="oe_amount_center oe_th_110px oe_border_top">todo</td>
<td class="oe_amount_center oe_th_110px oe_border_right oe_border_top">todo</td>
<td class="oe_amount_center oe_th_110px oe_border_top">todo</td>
</tr>
</table>
</group>
<separator string="Terms and Condition" colspan="4" name="description"/>
<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>
addons/project/project.py
+1
View File
@@ -1236,6 +1236,7 @@ class account_analytic_account(osv.osv):
_columns = {
'use_tasks': fields.boolean('Tasks Management'),
'company_uom_id': fields.related('company_id', 'project_time_mode_id', type='many2one', relation='product.uom'),
'company_uom_id1': fields.related('company_id', 'project_time_mode_id', type='many2one', relation='product.uom'),
'members': fields.many2many('res.users', 'project_user_rel', 'project_id', 'uid', 'Project Members',
states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
}
addons/project/project_view.xml
+1 -1
View File
@@ -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"/>