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

[MERGE]:merged sgo's branch for demo data

Browse Source 
bzr revid: apa@tinyerp.com-20120615122232-w9mt2gslx685ci2h
This commit is contained in:
Amit Patel (OpenERP)
2012-06-15 17:52:32 +05:30
parent 090ef9f431 0759ac7126
commit ef93dbd48c
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr_timesheet/hr_timesheet_demo.xml
+15
View File
@@ -12,6 +12,21 @@
<field name="product_id" ref="product.product_consultant"/>
<field name="journal_id" ref="analytic_journal"/>
</record>
<record id="account.analytic_administratif" model="account.analytic.account">
<field name="use_timesheets">True</field>
</record>
<record id="account.analytic_partners" model="account.analytic.account">
<field name="type">contract</field>
<field name="use_timesheets">True</field>
</record>
<record id="account.analytic_customers" model="account.analytic.account">
<field name="type">contract</field>
<field name="use_timesheets">True</field>
</record>
<record id="account.analytic_support_internal" model="account.analytic.account">
<field name="type">contract</field>
<field name="use_timesheets">True</field>
</record>
<record id="working_hours_requirements" model="hr.analytic.timesheet">
<field name="name">Requirements analysis and specification</field>
addons/sale/sale_view.xml
+1 -1
View File
@@ -137,7 +137,7 @@
<field domain="[('parent_id','=',partner_id)]" name="partner_invoice_id" groups="sale.group_delivery_invoice_address" options='{"quick_create": false}'/>
<field domain="[('parent_id','=',partner_id)]" name="partner_shipping_id" groups="sale.group_delivery_invoice_address" options='{"quick_create": false}'/>
<field domain="[('type','=','sale')]" name="pricelist_id" groups="product.group_sale_pricelist" on_change="onchange_pricelist_id(pricelist_id,order_line)"/>
<field name="project_id" context="{'partner_id':partner_id, 'pricelist_id':pricelist_id, 'default_name':name}" groups="sale.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
<field name="project_id" context="{'partner_id':partner_id, 'pricelist_id':pricelist_id, 'default_name':name}" groups="sale.group_analytic_accounting" domain="[('type','in',['view','normal','contract'])]"/>
</group><group>
<field name="date_order"/>
<field name="shop_id" on_change="onchange_shop_id(shop_id)" widget="selection" groups="stock.group_locations"/>