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

[IMP]: product: Improved reference name for UoM hour and day to make it consistent with other demo reference name 

bzr revid: rpa@tinyerp.com-20120703104559-3yew39vtv7ayop64
This commit is contained in:
Rucha (Open ERP) 2012-07-03 16:15:59 +05:30
parent 11e710e0ad
commit d259c31449
10 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
addons/hr_timesheet/hr_timesheet_demo.xml
View File

@ -31,7 +31,7 @@
<field eval="time.strftime('%Y-%m-%d')" name="date"/>
<field eval="2.00" name="unit_amount"/>
<field name="product_id" ref="product.product_product_0"/>
<field name="product_uom_id" ref="product.uom_hour"/>
<field name="product_uom_id" ref="product.product_uom_hour"/>
<field name="account_id" ref="account.analytic_administratif"></field>
<field eval="-60.00" name="amount"/>
<field name="general_account_id" model="account.account" ref="account.a_expense"/>
@ -44,7 +44,7 @@
<field eval="time.strftime('%Y-%m-%d')" name="date"/>
<field eval="1.00" name="unit_amount"/>
<field name="product_id" ref="product.product_product_0"/>
<field name="product_uom_id" ref="product.uom_hour"/>
<field name="product_uom_id" ref="product.product_uom_hour"/>
<field name="account_id" ref="account.analytic_administratif"></field>
<field eval="-30.00" name="amount"/>
<field name="general_account_id" model="account.account" ref="account.a_expense"/>
@ -57,7 +57,7 @@
<field eval="time.strftime('%Y-%m-%d')" name="date"/>
<field eval="03.00" name="unit_amount"/>
<field name="product_id" ref="product.product_product_0"/>
<field name="product_uom_id" ref="product.uom_hour"/>
<field name="product_uom_id" ref="product.product_uom_hour"/>
<field name="account_id" ref="account.analytic_administratif"></field>
<field eval="-90.00" name="amount"/>
<field name="general_account_id" model="account.account" ref="account.a_expense"/>
@ -70,7 +70,7 @@
<field eval="time.strftime('%Y-%m-%d')" name="date"/>
<field eval="01.00" name="unit_amount"/>
<field name="product_id" ref="product.product_product_0"/>
<field name="product_uom_id" ref="product.uom_hour"/>
<field name="product_uom_id" ref="product.product_uom_hour"/>
<field name="account_id" ref="account.analytic_administratif"></field>
<field eval="-30.00" name="amount"/>
<field name="general_account_id" model="account.account" ref="account.a_expense"/>
@ -83,7 +83,7 @@
<field eval="time.strftime('%Y-%m-%d')" name="date"/>
<field eval="01.00" name="unit_amount"/>
<field name="product_id" ref="product.product_product_0"/>
<field name="product_uom_id" ref="product.uom_hour"/>
<field name="product_uom_id" ref="product.product_uom_hour"/>
<field name="account_id" ref="account.analytic_administratif"></field>
<field eval="-30.00" name="amount"/>
<field name="general_account_id" model="account.account" ref="account.a_expense"/>

2
addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml
View File

@ -10,7 +10,7 @@
journal_id: hr_timesheet.analytic_journal
name: develop yaml for hr module
product_id: product.product_product_0
product_uom_id: product.uom_hour
product_uom_id: product.product_uom_hour
to_invoice: hr_timesheet_invoice.timesheet_invoice_factor2
unit_amount: 5.00
-

4
addons/mrp/mrp_demo.xml
View File

@ -20,8 +20,8 @@
<record id="product.product_assembly" model="product.product">
<field name="standard_price">0.1</field>
<field name="uom_id" ref="product.uom_hour"/>
<field name="uom_po_id" ref="product.uom_hour"/>
<field name="uom_id" ref="product.product_uom_hour"/>
<field name="uom_po_id" ref="product.product_uom_hour"/>
<field name="type">service</field>
<field name="name">Assembly Service Cost</field>
<field name="categ_id" ref="product.product_category_14"/>

8
addons/product/product_data.xml
View File

@ -50,13 +50,13 @@
<field name="factor" eval="1000"/>
<field name="uom_type">smaller</field>
</record>
<record id="uom_hour" model="product.uom">
<record id="product_uom_hour" model="product.uom">
<field name="name">Hour</field>
<field eval="uom_categ_wtime" name="category_id"/>
<field name="factor" eval="8.0"/>
<field name="uom_type">smaller</field>
</record>
<record id="uom_day" model="product.uom">
<record id="product_uom_day" model="product.uom">
<field name="name">Day</field>
<field eval="uom_categ_wtime" name="category_id"/>
<field name="factor" eval="1.0"/>
@ -188,8 +188,8 @@ parameter) will see those record just disappear.
<record id="product_product_0" model="product.product">
<field name="list_price">75.0</field>
<field name="standard_price">30.0</field>
<field name="uom_id" ref="product.uom_hour"/>
<field name="uom_po_id" ref="product.uom_hour"/>
<field name="uom_id" ref="product.product_uom_hour"/>
<field name="uom_po_id" ref="product.product_uom_hour"/>
<field name="name">Service on Demand</field>
<field name="categ_id" ref="product.product_category_0"/>
<field name="type">service</field>

8
addons/product/product_demo.xml
View File

@ -94,8 +94,8 @@
<field name="standard_price">20.5</field>
<field name="list_price">30.75</field>
<field name="type">service</field>
<field name="uom_id" ref="uom_hour"/>
<field name="uom_po_id" ref="uom_hour"/>
<field name="uom_id" ref="product_uom_hour"/>
<field name="uom_po_id" ref="product_uom_hour"/>
</record>
<record id="product_product_2" model="product.product">
@ -104,8 +104,8 @@
<field name="standard_price">25.5</field>
<field name="list_price">38.25</field>
<field name="type">service</field>
<field name="uom_id" ref="uom_hour"/>
<field name="uom_po_id" ref="uom_hour"/>
<field name="uom_id" ref="product_uom_hour"/>
<field name="uom_po_id" ref="product_uom_hour"/>
</record>
<record id="product_product_3" model="product.product">

2
addons/project/project_demo.xml
View File

@ -275,7 +275,7 @@
Resource: project.project
-->
<record id="base.main_company" model="res.company">
<field name="project_time_mode_id" ref="product.uom_hour"></field>
<field name="project_time_mode_id" ref="product.product_uom_hour"></field>
</record>
<!-- Projects -->

12
addons/project_long_term/project_long_term_demo.xml
View File

@ -14,7 +14,7 @@
<record id="project_phase_1" model="project.phase">
<field eval="[(6, 0, [])]" name="previous_phase_ids"/>
<field name="name">Collect Requirement and Make SRS</field>
<field name="product_uom" ref="product.uom_day"/>
<field name="product_uom" ref="product.product_uom_day"/>
<field eval="1" name="sequence"/>
<field name="duration">30</field>
<field name="constraint_date_start" eval="time.strftime('%Y-%m-01 10:00:00')"></field>
@ -26,7 +26,7 @@
<record id="project_phase_2" model="project.phase">
<field eval="[(6, 0, [ref('project_phase_1')])]" name="previous_phase_ids"/>
<field name="name">Design Model</field>
<field name="product_uom" ref="product.uom_day"/>
<field name="product_uom" ref="product.product_uom_day"/>
<field eval="2" name="sequence"/>
<field name="duration">20</field>
<field name="project_id" ref="project.project_integrate_openerp"/>
@ -36,7 +36,7 @@
<record id="project_phase_3" model="project.phase">
<field eval="[(6, 0, [ref('project_phase_2')])]" name="previous_phase_ids"/>
<field name="name">Planning and compute Risk analysis, Time chart </field>
<field name="product_uom" ref="product.uom_day"/>
<field name="product_uom" ref="product.product_uom_day"/>
<field eval="3" name="sequence"/>
<field name="duration">20</field>
<field name="project_id" ref="project.project_integrate_openerp"/>
@ -46,7 +46,7 @@
<record id="project_phase_4" model="project.phase">
<field eval="[(6, 0, [ref('project_phase_3')])]" name="previous_phase_ids"/>
<field name="name">Development and Integration</field>
<field name="product_uom" ref="product.uom_day"/>
<field name="product_uom" ref="product.product_uom_day"/>
<field eval="4" name="sequence"/>
<field name="duration">90</field>
<field name="project_id" ref="project.project_integrate_openerp"/>
@ -55,7 +55,7 @@
<record id="project_phase_5" model="project.phase">
<field eval="[(6, 0, [ref('project_phase_4')])]" name="previous_phase_ids"/>
<field name="name">Review and Testing</field>
<field name="product_uom" ref="product.uom_day"/>
<field name="product_uom" ref="product.product_uom_day"/>
<field eval="5" name="sequence"/>
<field name="duration">30</field>
<field name="project_id" ref="project.project_integrate_openerp"/>
@ -64,7 +64,7 @@
<record id="project_phase_6" model="project.phase">
<field eval="[(6, 0, [ref('project_phase_5')])]" name="previous_phase_ids"/>
<field name="name">Deployement and Training</field>
<field name="product_uom" ref="product.uom_day"/>
<field name="product_uom" ref="product.product_uom_day"/>
<field eval="6" name="sequence"/>
<field name="duration">10</field>
<field name="project_id" ref="project.project_integrate_openerp"/>

2
addons/project_mrp/project_mrp_demo.xml
View File

@ -8,7 +8,7 @@
<field name="order_id" ref="sale.order7"/>
<field name="name">Advance</field>
<field name="product_id" ref="sale.advance_product_0"/>
<field name="product_uom" ref="product.uom_day"/>
<field name="product_uom" ref="product.product_uom_day"/>
<field name="price_unit">150.0</field>
<field name="product_uom_qty">5.0</field>
<field name="type">make_to_order</field>

4
addons/project_timesheet/test/worktask_entry_to_timesheetline_entry.yml
View File

@ -21,8 +21,8 @@
standard_price: 1.0
supply_method: buy
type: service
uom_id: product.uom_hour
uom_po_id: product.uom_hour
uom_id: product.product_uom_hour
uom_po_id: product.product_uom_hour
volume: 0.0
warranty: 0.0
weight: 0.0

4
addons/sale/sale_demo.xml
View File

@ -266,8 +266,8 @@
<field name="list_price">150.0</field>
<field name="standard_price">100.0</field>
<field name="supply_method">produce</field>
<field name="uom_id" ref="product.uom_day"/>
<field name="uom_po_id" ref="product.uom_day"/>
<field name="uom_id" ref="product.product_uom_day"/>
<field name="uom_po_id" ref="product.product_uom_day"/>
<field name="company_id" eval="[]"/>
</record>