[MERGE] trunk-usability rco

bzr revid: al@openerp.com-20110806002104-xpc258vhv54j5w53

diff --cc addons/account/demo/account_invoice_demo.xml
index 0000000,613d192..3a3c775
mode 000000,100644..100644
--- /dev/null
--- 2/addons/account/demo/account_invoice_demo.xml
+++ b/addons/account/demo/account_invoice_demo.xml
@@@ -1,0 -1,812 +1,50 @@@
+ <?xml version="1.0" ?>
+ <openerp>
+       <data noupdate="1">
 -              <record id="account_invoice_0" model="account.invoice">
++              <record id="demo_invoice_0" model="account.invoice">
+                       <field name="date_due">2011-07-21</field>
+                       <field name="payment_term" ref="account.account_payment_term"/>
+                       <field name="journal_id" ref="account.refund_expenses_journal"/>
+                       <field name="currency_id" ref="base.EUR"/>
+                       <field name="address_invoice_id" ref="base.res_partner_address_wong"/>
+                       <field name="user_id" ref="base.user_demo"/>
+                       <field name="address_contact_id" ref="base.res_partner_address_wong"/>
+                       <field name="reference_type">none</field>
+                       <field name="company_id" ref="base.main_company"/>
+                       <field name="state">draft</field>
+                       <field name="type">in_invoice</field>
+                       <field name="account_id" ref="account.a_pay"/>
+                       <field eval="0" name="reconciled"/>
+                       <field name="date_invoice">2011-06-01</field>
 -                      <field eval="18.0" name="amount_untaxed"/>
 -                      <field eval="18.0" name="amount_total"/>
++                      <field eval="14.0" name="amount_untaxed"/>
++                      <field eval="14.0" name="amount_total"/>
+                       <field name="partner_id" ref="base.res_partner_maxtor"/>
+               </record>
 -              <record id="account_invoice_line_rpanrearpanelshe0" model="account.invoice.line">
 -                      <field name="uos_id" ref="product.product_uom_unit"/>
 -                      <field name="account_id" ref="account.a_expense"/>
 -                      <field model="account.invoice" name="invoice_id" search="[('name', '=', False)]"/>
 -                      <field eval="10.0" name="price_unit"/>
 -                      <field eval="10.0" name="price_subtotal"/>
 -                      <field name="company_id" ref="base.main_company"/>
 -                      <field eval="[(6,0,[])]" name="invoice_line_tax_id"/>
 -                      <field name="product_id" ref="product.product_product_rearpanelarm0"/>
 -                      <field eval="1.0" name="quantity"/>
 -                      <field name="partner_id" ref="base.res_partner_maxtor"/>
 -                      <field name="name">[RPAN100] Rear Panel SHE100</field>
 -              </record>
 -              <record id="account_invoice_line_rckrackcm0" model="account.invoice.line">
 -                      <field name="uos_id" ref="product.product_uom_unit"/>
 -                      <field name="account_id" ref="account.a_expense"/>
 -                      <field model="account.invoice" name="invoice_id" search="[('name', '=', False)]"/>
 -                      <field eval="4.0" name="price_unit"/>
 -                      <field eval="4.0" name="price_subtotal"/>
 -                      <field name="company_id" ref="base.main_company"/>
 -                      <field eval="[(6,0,[])]" name="invoice_line_tax_id"/>
 -                      <field name="product_id" ref="product.product_product_shelf1"/>
 -                      <field eval="1.0" name="quantity"/>
 -                      <field name="partner_id" ref="base.res_partner_maxtor"/>
 -                      <field name="name">[RCK200] Rack 200cm</field>
 -              </record>
 -              <record id="account_invoice_line_rckrackcm1" model="account.invoice.line">
 -                      <field name="uos_id" ref="product.product_uom_unit"/>
 -                      <field name="account_id" ref="account.a_expense"/>
 -                      <field model="account.invoice" name="invoice_id" search="[('name', '=', False)]"/>
 -                      <field eval="4.0" name="price_unit"/>
 -                      <field eval="4.0" name="price_subtotal"/>
 -                      <field name="company_id" ref="base.main_company"/>
 -                      <field eval="[(6,0,[])]" name="invoice_line_tax_id"/>
 -                      <field name="product_id" ref="product.product_product_shelf1"/>
 -                      <field eval="1.0" name="quantity"/>
 -                      <field name="partner_id" ref="base.res_partner_maxtor"/>
 -                      <field name="name">[RCK200] Rack 200cm</field>
 -              </record>
 -      </data>
 -      <data noupdate="1">
 -              <record id="account_invoice_1" model="account.invoice">
 -                      <field name="date_due">2011-05-30</field>
 -                      <field name="payment_term" ref="account.account_payment_term"/>
 -                      <field name="journal_id" ref="account.refund_expenses_journal"/>
 -                      <field name="currency_id" ref="base.EUR"/>
 -                      <field name="address_invoice_id" ref="base.res_partner_address_3000"/>
 -                      <field name="user_id" ref="base.user_demo"/>
 -                      <field name="address_contact_id" ref="base.res_partner_address_3000"/>
 -                      <field name="reference_type">none</field>
 -                      <field name="company_id" ref="base.main_company"/>
 -                      <field name="state">draft</field>
 -                      <field name="type">in_invoice</field>
 -                      <field name="account_id" ref="account.a_pay"/>
 -                      <field eval="0" name="reconciled"/>
 -                      <field name="date_invoice">2011-05-01</field>
 -                      <field eval="1400.0" name="amount_untaxed"/>
 -                      <field eval="1400.0" name="amount_total"/>
 -                      <field name="partner_id" ref="base.res_partner_desertic_hispafuentes"/>
 -              </record>
 -              <record id="account_invoice_line_pccompletepcwithperipherals0" model="account.invoice.line">
 -                      <field name="uos_id" ref="product.product_uom_unit"/>
 -                      <field name="account_id" ref="account.a_expense"/>
 -                      <field model="account.invoice" name="invoice_id" search="[('name', '=', False)]"/>
 -                      <field eval="500.0" name="price_unit"/>
 -                      <field eval="500.0" name="price_subtotal"/>
 -                      <field name="company_id" ref="base.main_company"/>
 -                      <field eval="[(6,0,[])]" name="invoice_line_tax_id"/>
 -                      <field name="product_id" ref="product.product_product_23"/>
 -                      <field eval="1.0" name="quantity"/>
 -                      <field name="partner_id" ref="base.res_partner_desertic_hispafuentes"/>
 -                      <field name="name">[PC0] Complete PC With Peripherals</field>
 -              </record>
 -              <record id="account_invoice_line_pcbasicpc0" model="account.invoice.line">
 -                      <field name="uos_id" ref="product.product_uom_unit"/>
 -                      <field name="account_id" ref="account.a_expense"/>
 -                      <field model="account.invoice" name="invoice_id" search="[('name', '=', False)]"/>
 -                      <field eval="300.0" name="price_unit"/>
 -                      <field eval="300.0" name="price_subtotal"/>
 -                      <field name="company_id" ref="base.main_company"/>
 -                      <field eval="[(6,0,[])]" name="invoice_line_tax_id"/>
 -                      <field name="product_id" ref="product.product_product_pc1"/>
 -                      <field eval="1.0" name="quantity"/>
 -                      <field name="partner_id" ref="base.res_partner_desertic_hispafuentes"/>
 -                      <field name="name">[PC1] Basic PC</field>
 -              </record>
 -              <record id="account_invoice_line_pcmediumpc0" model="account.invoice.line">
 -                      <field name="uos_id" ref="product.product_uom_unit"/>
 -                      <field name="account_id" ref="account.a_expense"/>
 -                      <field model="account.invoice" name="invoice_id" search="[('name', '=', False)]"/>
 -                      <field eval="600.0" name="price_unit"/>
 -                      <field eval="600.0" name="price_subtotal"/>
 -                      <field name="company_id" ref="base.main_company"/>
 -                      <field eval="[(6,0,[])]" name="invoice_line_tax_id"/>
 -                      <field name="product_id" ref="product.product_product_pc3"/>
 -                      <field eval="1.0" name="quantity"/>
 -                      <field name="partner_id" ref="base.res_partner_desertic_hispafuentes"/>
 -                      <field name="name">[PC3] Medium PC</field>
 -              </record>
 -      </data>
 -      <data noupdate="1">
 -              <record id="account_invoice_2" model="account.invoice">
 -                      <field name="date_due">2011-04-25</field>
 -                      <field eval="60.0" name="check_total"/>
 -                      <field name="number">exj/2011/0001</field>
 -                      <field name="journal_id" ref="account.refund_expenses_journal"/>
 -                      <field name="currency_id" ref="base.EUR"/>
 -                      <field name="address_invoice_id" ref="base.res_partner_address_tang"/>
 -                      <field name="user_id" ref="base.user_admin"/>
 -                      <field name="address_contact_id" ref="base.res_partner_address_tang"/>
 -                      <field name="reference_type">none</field>
 -                      <field name="company_id" ref="base.main_company"/>
 -                      <field name="state">open</field>
 -                      <field name="type">in_invoice</field>
 -                      <field name="internal_number">exj/2011/0001</field>
 -                      <field name="account_id" ref="account.a_pay"/>
 -                      <field eval="0" name="reconciled"/>
 -                      <field eval="60.0" name="residual"/>
 -                      <field name="move_name">/</field>
 -                      <field name="date_invoice">2011-04-01</field>
 -                      <field name="period_id" ref="account.period_4"/>
 -                      <field eval="60.0" name="amount_untaxed"/>
 -                      <field model="account.move" name="move_id" search="[('name', '=', u'exj/2011/0001')]"/>
 -                      <field eval="60.0" name="amount_total"/>
 -                      <field name="partner_id" ref="base.res_partner_asus"/>
 -              </record>
 -              <record id="account_invoice_line_mbmainboardasustekanx0" model="account.invoice.line">
 -                      <field name="uos_id" ref="product.product_uom_unit"/>
 -                      <field name="account_id" ref="account.a_expense"/>
 -                      <field model="account.invoice" name="invoice_id" search="[('name', '=', False)]"/>
 -                      <field eval="54.0" name="price_unit"/>
 -                      <field eval="54.0" name="price_subtotal"/>
 -                      <field name="company_id" ref="base.main_company"/>
 -                      <field eval="[(6,0,[])]" name="invoice_line_tax_id"/>
 -                      <field name="product_id" ref="product.product_product_mb1"/>
 -                      <field eval="1.0" name="quantity"/>
 -                      <field name="partner_id" ref="base.res_partner_asus"/>
 -                      <field name="name">[MB1] Mainboard ASUStek A7N8X</field>
 -              </record>
 -              <record id="account_invoice_line_metcmetalcleats0" model="account.invoice.line">
 -                      <field name="uos_id" ref="product.product_uom_unit"/>
 -                      <field name="account_id" ref="account.a_expense"/>
 -                      <field model="account.invoice" name="invoice_id" search="[('name', '=', False)]"/>
 -                      <field eval="1.0" name="price_unit"/>
 -                      <field eval="1.0" name="price_subtotal"/>
 -                      <field name="company_id" ref="base.main_company"/>
 -                      <field eval="[(6,0,[])]" name="invoice_line_tax_id"/>
 -                      <field name="product_id" ref="product.product_product_metalcleats0"/>
 -                      <field eval="1.0" name="quantity"/>
 -                      <field name="partner_id" ref="base.res_partner_asus"/>
 -                      <field name="name">[METC000] Metal Cleats</field>
 -              </record>
 -              <record id="account_invoice_line_moumouse0" model="account.invoice.line">
 -                      <field name="uos_id" ref="product.product_uom_unit"/>
 -                      <field name="account_id" ref="account.a_expense"/>
 -                      <field model="account.invoice" name="invoice_id" search="[('name', '=', False)]"/>
 -                      <field eval="5.0" name="price_unit"/>
 -                      <field eval="5.0" name="price_subtotal"/>
 -                      <field name="company_id" ref="base.main_company"/>
 -                      <field eval="[(6,0,[])]" name="invoice_line_tax_id"/>
 -                      <field name="product_id" ref="product.product_product_25"/>
 -                      <field eval="1.0" name="quantity"/>
 -                      <field name="partner_id" ref="base.res_partner_asus"/>
 -                      <field name="name">[MOU] Mouse</field>
 -              </record>
 -      </data>
 -      <data noupdate="1">
 -              <record id="account_invoice_3" model="account.invoice">
 -                      <field name="date_due">2011-03-30</field>
 -                      <field name="payment_term" ref="account.account_payment_term"/>
 -                      <field name="journal_id" ref="account.refund_expenses_journal"/>
 -                      <field name="currency_id" ref="base.EUR"/>
 -                      <field name="address_invoice_id" ref="base.res_partner_address_1"/>
 -                      <field name="user_id" ref="base.user_admin"/>
 -                      <field name="address_contact_id" ref="base.res_partner_address_1"/>
 -                      <field name="reference_type">none</field>
 -                      <field name="company_id" ref="base.main_company"/>
 -                      <field name="state">draft</field>
 -                      <field name="type">out_invoice</field>
 -                      <field name="account_id" ref="account.a_pay"/>
 -                      <field eval="0" name="reconciled"/>
 -                      <field name="date_invoice">2011-03-01</field>
 -                      <field eval="15.0" name="amount_untaxed"/>
 -                      <field eval="15.0" name="amount_total"/>
 -                      <field name="partner_id" ref="base.res_partner_fabiendupont0"/>
 -              </record>
 -              <record id="account_invoice_line_hothotelexpenses0" model="account.invoice.line">
 -                      <field name="uos_id" ref="product.product_uom_unit"/>
 -                      <field name="account_id" ref="account.a_expense"/>
 -                      <field model="account.invoice" name="invoice_id" search="[('name', '=', False)]"/>
 -                      <field eval="1.0" name="price_unit"/>
 -                      <field eval="1.0" name="price_subtotal"/>
 -                      <field name="company_id" ref="base.main_company"/>
 -                      <field eval="[(6,0,[])]" name="invoice_line_tax_id"/>
 -                      <field name="product_id" ref="product.product_product_hotelexpenses0"/>
 -                      <field eval="1.0" name="quantity"/>
 -                      <field name="partner_id" ref="base.res_partner_fabiendupont0"/>
 -                      <field name="name">[HOT] Hotel Expenses</field>
 -              </record>
 -              <record id="account_invoice_line_keyakeyboardazerty0" model="account.invoice.line">
 -                      <field name="uos_id" ref="product.product_uom_unit"/>
 -                      <field name="account_id" ref="account.a_expense"/>
 -                      <field model="account.invoice" name="invoice_id" search="[('name', '=', False)]"/>
 -                      <field eval="7.0" name="price_unit"/>
 -                      <field eval="7.0" name="price_subtotal"/>
 -                      <field name="company_id" ref="base.main_company"/>
 -                      <field eval="[(6,0,[])]" name="invoice_line_tax_id"/>
 -                      <field name="product_id" ref="product.product_product_24"/>
 -                      <field eval="1.0" name="quantity"/>
 -                      <field name="partner_id" ref="base.res_partner_fabiendupont0"/>
 -                      <field name="name">[KEYA] Keyboard - AZERTY</field>
 -              </record>
 -              <record id="account_invoice_line_kitkitkeyboardmouse0" model="account.invoice.line">
 -                      <field name="uos_id" ref="product.product_uom_unit"/>
 -                      <field name="account_id" ref="account.a_expense"/>
 -                      <field model="account.invoice" name="invoice_id" search="[('name', '=', False)]"/>
 -                      <field eval="7.0" name="price_unit"/>
 -                      <field eval="7.0" name="price_subtotal"/>
 -                      <field name="company_id" ref="base.main_company"/>
 -                      <field eval="[(6,0,[])]" name="invoice_line_tax_id"/>
 -                      <field name="product_id" ref="product.product_product_26"/>
 -                      <field eval="1.0" name="quantity"/>
 -                      <field name="partner_id" ref="base.res_partner_fabiendupont0"/>
 -                      <field name="name">[KIT0] Kit Keyboard + Mouse</field>
 -              </record>
 -      </data>
 -      <data noupdate="1">
 -              <record id="account_invoice_4" model="account.invoice">
 -                      <field name="date_due">2011-03-31</field>
 -                      <field name="payment_term" ref="account.account_payment_term"/>
 -                      <field name="number">saj/2011/0003</field>
 -                      <field name="journal_id" ref="account.refund_expenses_journal"/>
 -                      <field name="currency_id" ref="base.EUR"/>
 -                      <field name="address_invoice_id" ref="base.res_partner_address_marcdubois0"/>
 -                      <field name="user_id" ref="base.user_admin"/>
 -                      <field name="address_contact_id" ref="base.res_partner_address_marcdubois0"/>
 -                      <field name="reference_type">none</field>
 -                      <field name="company_id" ref="base.main_company"/>
 -                      <field name="state">open</field>
 -                      <field name="type">out_invoice</field>
 -                      <field name="internal_number">saj/2011/0003</field>
 -                      <field name="account_id" ref="account.a_pay"/>
 -                      <field eval="0" name="reconciled"/>
 -                      <field eval="143.5" name="residual"/>
 -                      <field name="move_name">/</field>
 -                      <field name="date_invoice">2011-02-01</field>
 -                      <field name="period_id" ref="account.period_2"/>
 -                      <field eval="143.5" name="amount_untaxed"/>
 -                      <field model="account.move" name="move_id" search="[('name', '=', u'saj/2011/0003')]"/>
 -                      <field eval="143.5" name="amount_total"/>
 -                      <field name="partner_id" ref="base.res_partner_duboissprl0"/>
 -              </record>
 -              <record id="account_invoice_line_fansilentfan0" model="account.invoice.line">
 -                      <field name="uos_id" ref="product.product_uom_unit"/>
 -                      <field name="account_id" ref="account.a_expense"/>
 -                      <field model="account.invoice" name="invoice_id" search="[('name', '=', False)]"/>
 -                      <field eval="18.5" name="price_unit"/>
 -                      <field eval="18.5" name="price_subtotal"/>
 -                      <field name="company_id" ref="base.main_company"/>
 -                      <field eval="[(6,0,[])]" name="invoice_line_tax_id"/>
 -                      <field name="product_id" ref="product.product_product_fan2"/>
 -                      <field eval="1.0" name="quantity"/>
 -                      <field name="partner_id" ref="base.res_partner_duboissprl0"/>
 -                      <field name="name">[FAN2] Silent fan</field>
 -              </record>
 -              <record id="account_invoice_line_hddhddseagategb0" model="account.invoice.line">
 -                      <field name="uos_id" ref="product.product_uom_unit"/>
 -                      <field name="account_id" ref="account.a_expense"/>
 -                      <field model="account.invoice" name="invoice_id" search="[('name', '=', False)]"/>
 -                      <field eval="50.0" name="price_unit"/>
 -                      <field eval="50.0" name="price_subtotal"/>
 -                      <field name="company_id" ref="base.main_company"/>
 -                      <field eval="[(6,0,[])]" name="invoice_line_tax_id"/>
 -                      <field name="product_id" ref="product.product_product_hdd1"/>
 -                      <field eval="1.0" name="quantity"/>
 -                      <field name="partner_id" ref="base.res_partner_duboissprl0"/>
 -                      <field name="name">[HDD1] HDD Seagate 7200.8 80GB</field>
 -              </record>
 -              <record id="account_invoice_line_hddhddseagategb1" model="account.invoice.line">
 -                      <field name="uos_id" ref="product.product_uom_unit"/>
 -                      <field name="account_id" ref="account.a_expense"/>
 -                      <field model="account.invoice" name="invoice_id" search="[('name', '=', False)]"/>
 -                      <field eval="75.0" name="price_unit"/>
 -                      <field eval="75.0" name="price_subtotal"/>
 -                      <field name="company_id" ref="base.main_company"/>
 -                      <field eval="[(6,0,[])]" name="invoice_line_tax_id"/>
 -                      <field name="product_id" ref="product.product_product_hdd2"/>
 -                      <field eval="1.0" name="quantity"/>
 -                      <field name="partner_id" ref="base.res_partner_duboissprl0"/>
 -                      <field name="name">[HDD2] HDD Seagate 7200.8 120GB</field>
 -              </record>
 -      </data>
 -      <data noupdate="1">
 -              <record id="account_invoice_5" model="account.invoice">
 -                      <field name="date_due">2011-02-28</field>
 -                      <field name="payment_term" ref="account.account_payment_term"/>
 -                      <field name="number">saj/2011/0002</field>
 -                      <field name="journal_id" ref="account.refund_expenses_journal"/>
 -                      <field name="currency_id" ref="base.EUR"/>
 -                      <field name="address_invoice_id" ref="base.res_partner_address_zen"/>
 -                      <field name="user_id" ref="base.user_admin"/>
 -                      <field name="address_contact_id" ref="base.res_partner_address_zen"/>
 -                      <field name="reference_type">none</field>
 -                      <field name="company_id" ref="base.main_company"/>
 -                      <field name="state">open</field>
 -                      <field name="type">out_invoice</field>
 -                      <field name="internal_number">saj/2011/0002</field>
 -                      <field name="account_id" ref="account.a_pay"/>
 -                      <field eval="0" name="reconciled"/>
 -                      <field eval="508.0" name="residual"/>
 -                      <field name="move_name">/</field>
 -                      <field name="date_invoice">2011-01-16</field>
 -                      <field name="period_id" ref="account.period_1"/>
 -                      <field eval="508.0" name="amount_untaxed"/>
 -                      <field model="account.move" name="move_id" search="[('name', '=', u'saj/2011/0002')]"/>
 -                      <field eval="508.0" name="amount_total"/>
 -                      <field name="partner_id" ref="base.res_partner_3"/>
 -              </record>
 -              <record id="account_invoice_line_cpugenregularprocessorconfig0" model="account.invoice.line">
 -                      <field name="uos_id" ref="product.product_uom_unit"/>
 -                      <field name="account_id" ref="account.a_expense"/>
 -                      <field model="account.invoice" name="invoice_id" search="[('name', '=', False)]"/>
 -                      <field eval="300.0" name="price_unit"/>
 -                      <field eval="300.0" name="price_subtotal"/>
 -                      <field name="company_id" ref="base.main_company"/>
 -                      <field eval="[(6,0,[])]" name="invoice_line_tax_id"/>
 -                      <field name="product_id" ref="product.product_product_cpu_gen"/>
 -                      <field eval="1.0" name="quantity"/>
 -                      <field name="partner_id" ref="base.res_partner_3"/>
 -                      <field name="name">[CPU_GEN] Regular processor config</field>
 -              </record>
 -              <record id="account_invoice_line_emplemployee0" model="account.invoice.line">
 -                      <field name="uos_id" ref="product.uom_hour"/>
 -                      <field name="account_id" ref="account.a_expense"/>
 -                      <field model="account.invoice" name="invoice_id" search="[('name', '=', False)]"/>
 -                      <field eval="200.0" name="price_unit"/>
 -                      <field eval="200.0" name="price_subtotal"/>
 -                      <field name="company_id" ref="base.main_company"/>
 -                      <field eval="[(6,0,[])]" name="invoice_line_tax_id"/>
 -                      <field name="product_id" ref="product.product_product_employee0"/>
 -                      <field eval="1.0" name="quantity"/>
 -                      <field name="partner_id" ref="base.res_partner_3"/>
 -                      <field name="name">[EMPL] Employee</field>
 -              </record>
 -              <record id="account_invoice_line_fanregularcasefanmm0" model="account.invoice.line">
 -                      <field name="uos_id" ref="product.product_uom_unit"/>
 -                      <field name="account_id" ref="account.a_expense"/>
 -                      <field model="account.invoice" name="invoice_id" search="[('name', '=', False)]"/>
 -                      <field eval="8.0" name="price_unit"/>
 -                      <field eval="8.0" name="price_subtotal"/>
 -                      <field name="company_id" ref="base.main_company"/>
 -                      <field eval="[(6,0,[])]" name="invoice_line_tax_id"/>
 -                      <field name="product_id" ref="product.product_product_fan"/>
 -                      <field eval="1.0" name="quantity"/>
 -                      <field name="partner_id" ref="base.res_partner_3"/>
 -                      <field name="name">[FAN] Regular case fan 80mm</field>
 -              </record>
 -      </data>
 -      <data noupdate="1">
 -              <record id="account_invoice_6" model="account.invoice">
 -                      <field name="date_due">2011-01-31</field>
 -                      <field name="payment_term" ref="account.account_payment_term"/>
 -                      <field name="number">saj/2011/0001</field>
 -                      <field name="journal_id" ref="account.refund_expenses_journal"/>
 -                      <field name="currency_id" ref="base.EUR"/>
 -                      <field name="address_invoice_id" ref="base.res_partner_address_9"/>
 -                      <field name="user_id" ref="base.user_admin"/>
 -                      <field name="address_contact_id" ref="base.res_partner_address_9"/>
 -                      <field name="reference_type">none</field>
 -                      <field name="company_id" ref="base.main_company"/>
 -                      <field name="state">open</field>
 -                      <field name="type">out_invoice</field>
 -                      <field name="internal_number">saj/2011/0001</field>
 -                      <field name="account_id" ref="account.a_pay"/>
 -                      <field eval="0" name="reconciled"/>
 -                      <field eval="675.0" name="residual"/>
 -                      <field name="move_name">/</field>
 -                      <field name="date_invoice">2011-01-01</field>
 -                      <field name="period_id" ref="account.period_1"/>
 -                      <field eval="675.0" name="amount_untaxed"/>
 -                      <field model="account.move" name="move_id" search="[('name', '=', u'saj/2011/0001')]"/>
 -                      <field eval="675.0" name="amount_total"/>
 -                      <field name="partner_id" ref="base.res_partner_2"/>
 -              </record>
 -              <record id="account_invoice_line_cpuprocessoramdathlonxp0" model="account.invoice.line">
 -                      <field name="uos_id" ref="product.product_uom_unit"/>
 -                      <field name="account_id" ref="account.a_expense"/>
 -                      <field model="account.invoice" name="invoice_id" search="[('name', '=', False)]"/>
 -                      <field eval="75.0" name="price_unit"/>
 -                      <field eval="75.0" name="price_subtotal"/>
 -                      <field name="company_id" ref="base.main_company"/>
 -                      <field eval="[(6,0,[])]" name="invoice_line_tax_id"/>
 -                      <field name="product_id" ref="product.product_product_cpu1"/>
 -                      <field eval="1.0" name="quantity"/>
 -                      <field name="partner_id" ref="base.res_partner_2"/>
 -                      <field name="name">[CPU1] Processor AMD Athlon XP 1800+</field>
 -              </record>
 -              <record id="account_invoice_line_cpuhighspeedprocessorconfig0" model="account.invoice.line">
 -                      <field name="uos_id" ref="product.product_uom_unit"/>
 -                      <field name="account_id" ref="account.a_expense"/>
 -                      <field model="account.invoice" name="invoice_id" search="[('name', '=', False)]"/>
 -                      <field eval="450.0" name="price_unit"/>
 -                      <field eval="450.0" name="price_subtotal"/>
 -                      <field name="company_id" ref="base.main_company"/>
 -                      <field eval="[(6,0,[])]" name="invoice_line_tax_id"/>
 -                      <field name="product_id" ref="product.product_product_cpu2"/>
 -                      <field eval="1.0" name="quantity"/>
 -                      <field name="partner_id" ref="base.res_partner_2"/>
 -                      <field name="name">[CPU2] High speed processor config</field>
 -              </record>
 -              <record id="account_invoice_line_cpuprocessoramdathlonxp1" model="account.invoice.line">
 -                      <field name="uos_id" ref="product.product_uom_unit"/>
 -                      <field name="account_id" ref="account.a_expense"/>
 -                      <field model="account.invoice" name="invoice_id" search="[('name', '=', False)]"/>
 -                      <field eval="150.0" name="price_unit"/>
 -                      <field eval="150.0" name="price_subtotal"/>
 -                      <field name="company_id" ref="base.main_company"/>
 -                      <field eval="[(6,0,[])]" name="invoice_line_tax_id"/>
 -                      <field name="product_id" ref="product.product_product_cpu3"/>
 -                      <field eval="1.0" name="quantity"/>
 -                      <field name="partner_id" ref="base.res_partner_2"/>
 -                      <field name="name">[CPU3] Processor AMD Athlon XP 2200+</field>
 -              </record>
 -      </data>
 -      <data noupdate="1">
 -              <record id="account_invoice_po0" model="account.invoice">
 -                      <field name="origin">PO00002</field>
 -                      <field eval="900.0" name="check_total"/>
 -                      <field name="journal_id" ref="account.expenses_journal"/>
 -                      <field name="currency_id" ref="base.EUR"/>
 -                      <field name="address_invoice_id" ref="base.res_partner_address_zen"/>
 -                      <field name="user_id" ref="base.user_admin"/>
 -                      <field name="reference">PO00002</field>
 -                      <field name="address_contact_id" ref="base.res_partner_address_zen"/>
 -                      <field name="reference_type">none</field>
 -                      <field name="company_id" ref="base.main_company"/>
 -                      <field name="state">draft</field>
 -                      <field name="type">in_invoice</field>
 -                      <field name="account_id" ref="account.a_pay"/>
 -                      <field eval="0" name="reconciled"/>
 -                      <field eval="900.0" name="amount_untaxed"/>
 -                      <field eval="900.0" name="amount_total"/>
 -                      <field name="partner_id" ref="base.res_partner_3"/>
 -                      <field name="name">PO00002</field>
 -              </record>
 -              <record id="account_invoice_line_pcmediumpc1" model="account.invoice.line">
 -                      <field name="uos_id" ref="product.product_uom_unit"/>
 -                      <field name="account_id" ref="account.a_expense"/>
 -                      <field model="account.invoice" name="invoice_id" search="[('name', '=', u'PO00002')]"/>
 -                      <field eval="900.0" name="price_unit"/>
 -                      <field eval="900.0" name="price_subtotal"/>
 -                      <field name="company_id" ref="base.main_company"/>
 -                      <field eval="[(6,0,[])]" name="invoice_line_tax_id"/>
 -                      <field name="product_id" ref="product.product_product_pc3"/>
 -                      <field eval="1.0" name="quantity"/>
 -                      <field name="partner_id" ref="base.res_partner_3"/>
 -                      <field name="name">[PC3] Medium PC</field>
 -              </record>
 -      </data>
 -      <data noupdate="1">
 -              <record id="account_invoice_line_pcmediumpc2" model="account.invoice.line">
 -                      <field name="uos_id" ref="product.product_uom_unit"/>
 -                      <field name="account_id" ref="account.a_expense"/>
 -                      <field name="invoice_id" ref="account_invoice_po0"/>
 -                      <field eval="900.0" name="price_unit"/>
 -                      <field eval="900.0" name="price_subtotal"/>
 -                      <field name="company_id" ref="base.main_company"/>
 -                      <field eval="[(6,0,[])]" name="invoice_line_tax_id"/>
 -                      <field name="product_id" ref="product.product_product_pc3"/>
 -                      <field eval="1.0" name="quantity"/>
 -                      <field name="partner_id" ref="base.res_partner_3"/>
 -                      <field name="name">[PC3] Medium PC</field>
 -              </record>
 -      </data>
 -      <data noupdate="1">
 -              <record id="account_invoice_line_cpuprocessoramdathlonxp2" model="account.invoice.line">
 -                      <field name="uos_id" ref="product.product_uom_unit"/>
 -                      <field name="account_id" ref="account.a_expense"/>
 -                      <field name="invoice_id" ref="account_invoice_6"/>
 -                      <field eval="75.0" name="price_unit"/>
 -                      <field eval="75.0" name="price_subtotal"/>
 -                      <field name="company_id" ref="base.main_company"/>
 -                      <field eval="[(6,0,[])]" name="invoice_line_tax_id"/>
 -                      <field name="product_id" ref="product.product_product_cpu1"/>
 -                      <field eval="1.0" name="quantity"/>
 -                      <field name="partner_id" ref="base.res_partner_2"/>
 -                      <field name="name">[CPU1] Processor AMD Athlon XP 1800+</field>
 -              </record>
 -      </data>
 -      <data noupdate="1">
 -              <record id="account_invoice_line_cpuhighspeedprocessorconfig1" model="account.invoice.line">
 -                      <field name="uos_id" ref="product.product_uom_unit"/>
 -                      <field name="account_id" ref="account.a_expense"/>
 -                      <field name="invoice_id" ref="account_invoice_6"/>
 -                      <field eval="450.0" name="price_unit"/>
 -                      <field eval="450.0" name="price_subtotal"/>
 -                      <field name="company_id" ref="base.main_company"/>
 -                      <field eval="[(6,0,[])]" name="invoice_line_tax_id"/>
 -                      <field name="product_id" ref="product.product_product_cpu2"/>
 -                      <field eval="1.0" name="quantity"/>
 -                      <field name="partner_id" ref="base.res_partner_2"/>
 -                      <field name="name">[CPU2] High speed processor config</field>
 -              </record>
 -      </data>
 -      <data noupdate="1">
 -              <record id="account_invoice_line_cpuprocessoramdathlonxp3" model="account.invoice.line">
 -                      <field name="uos_id" ref="product.product_uom_unit"/>
 -                      <field name="account_id" ref="account.a_expense"/>
 -                      <field name="invoice_id" ref="account_invoice_6"/>
 -                      <field eval="150.0" name="price_unit"/>
 -                      <field eval="150.0" name="price_subtotal"/>
 -                      <field name="company_id" ref="base.main_company"/>
 -                      <field eval="[(6,0,[])]" name="invoice_line_tax_id"/>
 -                      <field name="product_id" ref="product.product_product_cpu3"/>
 -                      <field eval="1.0" name="quantity"/>
 -                      <field name="partner_id" ref="base.res_partner_2"/>
 -                      <field name="name">[CPU3] Processor AMD Athlon XP 2200+</field>
 -              </record>
 -      </data>
 -      <data noupdate="1">
 -              <record id="account_invoice_line_cpugenregularprocessorconfig1" model="account.invoice.line">
 -                      <field name="uos_id" ref="product.product_uom_unit"/>
 -                      <field name="account_id" ref="account.a_expense"/>
 -                      <field name="invoice_id" ref="account_invoice_5"/>
 -                      <field eval="300.0" name="price_unit"/>
 -                      <field eval="300.0" name="price_subtotal"/>
 -                      <field name="company_id" ref="base.main_company"/>
 -                      <field eval="[(6,0,[])]" name="invoice_line_tax_id"/>
 -                      <field name="product_id" ref="product.product_product_cpu_gen"/>
 -                      <field eval="1.0" name="quantity"/>
 -                      <field name="partner_id" ref="base.res_partner_3"/>
 -                      <field name="name">[CPU_GEN] Regular processor config</field>
 -              </record>
 -      </data>
 -      <data noupdate="1">
 -              <record id="account_invoice_line_emplemployee1" model="account.invoice.line">
 -                      <field name="uos_id" ref="product.uom_hour"/>
 -                      <field name="account_id" ref="account.a_expense"/>
 -                      <field name="invoice_id" ref="account_invoice_5"/>
 -                      <field eval="200.0" name="price_unit"/>
 -                      <field eval="200.0" name="price_subtotal"/>
 -                      <field name="company_id" ref="base.main_company"/>
 -                      <field eval="[(6,0,[])]" name="invoice_line_tax_id"/>
 -                      <field name="product_id" ref="product.product_product_employee0"/>
 -                      <field eval="1.0" name="quantity"/>
 -                      <field name="partner_id" ref="base.res_partner_3"/>
 -                      <field name="name">[EMPL] Employee</field>
 -              </record>
 -      </data>
 -      <data noupdate="1">
 -              <record id="account_invoice_line_fanregularcasefanmm1" model="account.invoice.line">
 -                      <field name="uos_id" ref="product.product_uom_unit"/>
 -                      <field name="account_id" ref="account.a_expense"/>
 -                      <field name="invoice_id" ref="account_invoice_5"/>
 -                      <field eval="8.0" name="price_unit"/>
 -                      <field eval="8.0" name="price_subtotal"/>
 -                      <field name="company_id" ref="base.main_company"/>
 -                      <field eval="[(6,0,[])]" name="invoice_line_tax_id"/>
 -                      <field name="product_id" ref="product.product_product_fan"/>
 -                      <field eval="1.0" name="quantity"/>
 -                      <field name="partner_id" ref="base.res_partner_3"/>
 -                      <field name="name">[FAN] Regular case fan 80mm</field>
 -              </record>
 -      </data>
 -      <data noupdate="1">
 -              <record id="account_invoice_line_fansilentfan1" model="account.invoice.line">
 -                      <field name="uos_id" ref="product.product_uom_unit"/>
 -                      <field name="account_id" ref="account.a_expense"/>
 -                      <field name="invoice_id" ref="account_invoice_4"/>
 -                      <field eval="18.5" name="price_unit"/>
 -                      <field eval="18.5" name="price_subtotal"/>
 -                      <field name="company_id" ref="base.main_company"/>
 -                      <field eval="[(6,0,[])]" name="invoice_line_tax_id"/>
 -                      <field name="product_id" ref="product.product_product_fan2"/>
 -                      <field eval="1.0" name="quantity"/>
 -                      <field name="partner_id" ref="base.res_partner_duboissprl0"/>
 -                      <field name="name">[FAN2] Silent fan</field>
 -              </record>
 -      </data>
 -      <data noupdate="1">
 -              <record id="account_invoice_line_hddhddseagategb2" model="account.invoice.line">
 -                      <field name="uos_id" ref="product.product_uom_unit"/>
 -                      <field name="account_id" ref="account.a_expense"/>
 -                      <field name="invoice_id" ref="account_invoice_4"/>
 -                      <field eval="50.0" name="price_unit"/>
 -                      <field eval="50.0" name="price_subtotal"/>
 -                      <field name="company_id" ref="base.main_company"/>
 -                      <field eval="[(6,0,[])]" name="invoice_line_tax_id"/>
 -                      <field name="product_id" ref="product.product_product_hdd1"/>
 -                      <field eval="1.0" name="quantity"/>
 -                      <field name="partner_id" ref="base.res_partner_duboissprl0"/>
 -                      <field name="name">[HDD1] HDD Seagate 7200.8 80GB</field>
 -              </record>
 -      </data>
 -      <data noupdate="1">
 -              <record id="account_invoice_line_hddhddseagategb3" model="account.invoice.line">
 -                      <field name="uos_id" ref="product.product_uom_unit"/>
 -                      <field name="account_id" ref="account.a_expense"/>
 -                      <field name="invoice_id" ref="account_invoice_4"/>
 -                      <field eval="75.0" name="price_unit"/>
 -                      <field eval="75.0" name="price_subtotal"/>
 -                      <field name="company_id" ref="base.main_company"/>
 -                      <field eval="[(6,0,[])]" name="invoice_line_tax_id"/>
 -                      <field name="product_id" ref="product.product_product_hdd2"/>
 -                      <field eval="1.0" name="quantity"/>
 -                      <field name="partner_id" ref="base.res_partner_duboissprl0"/>
 -                      <field name="name">[HDD2] HDD Seagate 7200.8 120GB</field>
 -              </record>
 -      </data>
 -      <data noupdate="1">
 -              <record id="account_invoice_line_hothotelexpenses1" model="account.invoice.line">
 -                      <field name="uos_id" ref="product.product_uom_unit"/>
 -                      <field name="account_id" ref="account.a_expense"/>
 -                      <field name="invoice_id" ref="account_invoice_3"/>
 -                      <field eval="1.0" name="price_unit"/>
 -                      <field eval="1.0" name="price_subtotal"/>
 -                      <field name="company_id" ref="base.main_company"/>
 -                      <field eval="[(6,0,[])]" name="invoice_line_tax_id"/>
 -                      <field name="product_id" ref="product.product_product_hotelexpenses0"/>
 -                      <field eval="1.0" name="quantity"/>
 -                      <field name="partner_id" ref="base.res_partner_fabiendupont0"/>
 -                      <field name="name">[HOT] Hotel Expenses</field>
 -              </record>
 -      </data>
 -      <data noupdate="1">
 -              <record id="account_invoice_line_keyakeyboardazerty1" model="account.invoice.line">
 -                      <field name="uos_id" ref="product.product_uom_unit"/>
 -                      <field name="account_id" ref="account.a_expense"/>
 -                      <field name="invoice_id" ref="account_invoice_3"/>
 -                      <field eval="7.0" name="price_unit"/>
 -                      <field eval="7.0" name="price_subtotal"/>
 -                      <field name="company_id" ref="base.main_company"/>
 -                      <field eval="[(6,0,[])]" name="invoice_line_tax_id"/>
 -                      <field name="product_id" ref="product.product_product_24"/>
 -                      <field eval="1.0" name="quantity"/>
 -                      <field name="partner_id" ref="base.res_partner_fabiendupont0"/>
 -                      <field name="name">[KEYA] Keyboard - AZERTY</field>
 -              </record>
 -      </data>
 -      <data noupdate="1">
 -              <record id="account_invoice_line_kitkitkeyboardmouse1" model="account.invoice.line">
 -                      <field name="uos_id" ref="product.product_uom_unit"/>
 -                      <field name="account_id" ref="account.a_expense"/>
 -                      <field name="invoice_id" ref="account_invoice_3"/>
 -                      <field eval="7.0" name="price_unit"/>
 -                      <field eval="7.0" name="price_subtotal"/>
 -                      <field name="company_id" ref="base.main_company"/>
 -                      <field eval="[(6,0,[])]" name="invoice_line_tax_id"/>
 -                      <field name="product_id" ref="product.product_product_26"/>
 -                      <field eval="1.0" name="quantity"/>
 -                      <field name="partner_id" ref="base.res_partner_fabiendupont0"/>
 -                      <field name="name">[KIT0] Kit Keyboard + Mouse</field>
 -              </record>
 -      </data>
 -      <data noupdate="1">
 -              <record id="account_invoice_line_mbmainboardasustekanx1" model="account.invoice.line">
 -                      <field name="uos_id" ref="product.product_uom_unit"/>
 -                      <field name="account_id" ref="account.a_expense"/>
 -                      <field name="invoice_id" ref="account_invoice_2"/>
 -                      <field eval="54.0" name="price_unit"/>
 -                      <field eval="54.0" name="price_subtotal"/>
 -                      <field name="company_id" ref="base.main_company"/>
 -                      <field eval="[(6,0,[])]" name="invoice_line_tax_id"/>
 -                      <field name="product_id" ref="product.product_product_mb1"/>
 -                      <field eval="1.0" name="quantity"/>
 -                      <field name="partner_id" ref="base.res_partner_asus"/>
 -                      <field name="name">[MB1] Mainboard ASUStek A7N8X</field>
 -              </record>
 -      </data>
 -      <data noupdate="1">
 -              <record id="account_invoice_line_metcmetalcleats1" model="account.invoice.line">
 -                      <field name="uos_id" ref="product.product_uom_unit"/>
 -                      <field name="account_id" ref="account.a_expense"/>
 -                      <field name="invoice_id" ref="account_invoice_2"/>
 -                      <field eval="1.0" name="price_unit"/>
 -                      <field eval="1.0" name="price_subtotal"/>
 -                      <field name="company_id" ref="base.main_company"/>
 -                      <field eval="[(6,0,[])]" name="invoice_line_tax_id"/>
 -                      <field name="product_id" ref="product.product_product_metalcleats0"/>
 -                      <field eval="1.0" name="quantity"/>
 -                      <field name="partner_id" ref="base.res_partner_asus"/>
 -                      <field name="name">[METC000] Metal Cleats</field>
 -              </record>
 -      </data>
 -      <data noupdate="1">
 -              <record id="account_invoice_line_moumouse1" model="account.invoice.line">
 -                      <field name="uos_id" ref="product.product_uom_unit"/>
++              <record id="demo_invoice_0_line_rpanrearpanelshe0" model="account.invoice.line">
++                      <field name="invoice_id" ref="demo_invoice_0"/>
+                       <field name="account_id" ref="account.a_expense"/>
 -                      <field name="invoice_id" ref="account_invoice_2"/>
 -                      <field eval="5.0" name="price_unit"/>
 -                      <field eval="5.0" name="price_subtotal"/>
 -                      <field name="company_id" ref="base.main_company"/>
 -                      <field eval="[(6,0,[])]" name="invoice_line_tax_id"/>
 -                      <field name="product_id" ref="product.product_product_25"/>
 -                      <field eval="1.0" name="quantity"/>
 -                      <field name="partner_id" ref="base.res_partner_asus"/>
 -                      <field name="name">[MOU] Mouse</field>
 -              </record>
 -      </data>
 -      <data noupdate="1">
 -              <record id="account_invoice_line_pccompletepcwithperipherals1" model="account.invoice.line">
+                       <field name="uos_id" ref="product.product_uom_unit"/>
 -                      <field name="account_id" ref="account.a_expense"/>
 -                      <field name="invoice_id" ref="account_invoice_1"/>
 -                      <field eval="500.0" name="price_unit"/>
 -                      <field eval="500.0" name="price_subtotal"/>
++                      <field name="price_unit" eval="10.0" />
++                      <field name="price_subtotal" eval="10.0" />
+                       <field name="company_id" ref="base.main_company"/>
 -                      <field eval="[(6,0,[])]" name="invoice_line_tax_id"/>
 -                      <field name="product_id" ref="product.product_product_23"/>
 -                      <field eval="1.0" name="quantity"/>
 -                      <field name="partner_id" ref="base.res_partner_desertic_hispafuentes"/>
 -                      <field name="name">[PC0] Complete PC With Peripherals</field>
 -              </record>
 -      </data>
 -      <data noupdate="1">
 -              <record id="account_invoice_line_pcbasicpc1" model="account.invoice.line">
 -                      <field name="uos_id" ref="product.product_uom_unit"/>
 -                      <field name="account_id" ref="account.a_expense"/>
 -                      <field name="invoice_id" ref="account_invoice_1"/>
 -                      <field eval="300.0" name="price_unit"/>
 -                      <field eval="300.0" name="price_subtotal"/>
 -                      <field name="company_id" ref="base.main_company"/>
 -                      <field eval="[(6,0,[])]" name="invoice_line_tax_id"/>
 -                      <field name="product_id" ref="product.product_product_pc1"/>
 -                      <field eval="1.0" name="quantity"/>
 -                      <field name="partner_id" ref="base.res_partner_desertic_hispafuentes"/>
 -                      <field name="name">[PC1] Basic PC</field>
 -              </record>
 -      </data>
 -      <data noupdate="1">
 -              <record id="account_invoice_line_pcmediumpc3" model="account.invoice.line">
 -                      <field name="uos_id" ref="product.product_uom_unit"/>
 -                      <field name="account_id" ref="account.a_expense"/>
 -                      <field name="invoice_id" ref="account_invoice_1"/>
 -                      <field eval="600.0" name="price_unit"/>
 -                      <field eval="600.0" name="price_subtotal"/>
 -                      <field name="company_id" ref="base.main_company"/>
 -                      <field eval="[(6,0,[])]" name="invoice_line_tax_id"/>
 -                      <field name="product_id" ref="product.product_product_pc3"/>
 -                      <field eval="1.0" name="quantity"/>
 -                      <field name="partner_id" ref="base.res_partner_desertic_hispafuentes"/>
 -                      <field name="name">[PC3] Medium PC</field>
 -              </record>
 -      </data>
 -      <data noupdate="1">
 -              <record id="account_invoice_line_rpanrearpanelshe1" model="account.invoice.line">
 -                      <field name="uos_id" ref="product.product_uom_unit"/>
 -                      <field name="account_id" ref="account.a_expense"/>
 -                      <field name="invoice_id" ref="account_invoice_0"/>
 -                      <field eval="10.0" name="price_unit"/>
 -                      <field eval="10.0" name="price_subtotal"/>
 -                      <field name="company_id" ref="base.main_company"/>
 -                      <field eval="[(6,0,[])]" name="invoice_line_tax_id"/>
++                      <field name="invoice_line_tax_id" eval="[(6,0,[])]"/>
+                       <field name="product_id" ref="product.product_product_rearpanelarm0"/>
 -                      <field eval="1.0" name="quantity"/>
++                      <field name="quantity" eval="1.0" />
+                       <field name="partner_id" ref="base.res_partner_maxtor"/>
+                       <field name="name">[RPAN100] Rear Panel SHE100</field>
+               </record>
 -      </data>
 -      <data noupdate="1">
 -              <record id="account_invoice_line_rckrackcm2" model="account.invoice.line">
 -                      <field name="uos_id" ref="product.product_uom_unit"/>
++              <record id="demo_invoice_0_line_rckrackcm0" model="account.invoice.line">
++                      <field name="invoice_id" ref="demo_invoice_0"/>
+                       <field name="account_id" ref="account.a_expense"/>
 -                      <field name="invoice_id" ref="account_invoice_0"/>
 -                      <field eval="4.0" name="price_unit"/>
 -                      <field eval="4.0" name="price_subtotal"/>
 -                      <field name="company_id" ref="base.main_company"/>
 -                      <field eval="[(6,0,[])]" name="invoice_line_tax_id"/>
 -                      <field name="product_id" ref="product.product_product_shelf1"/>
 -                      <field eval="1.0" name="quantity"/>
 -                      <field name="partner_id" ref="base.res_partner_maxtor"/>
 -                      <field name="name">[RCK200] Rack 200cm</field>
 -              </record>
 -      </data>
 -      <data noupdate="1">
 -              <record id="account_invoice_line_rckrackcm3" model="account.invoice.line">
+                       <field name="uos_id" ref="product.product_uom_unit"/>
 -                      <field name="account_id" ref="account.a_expense"/>
 -                      <field name="invoice_id" ref="account_invoice_0"/>
 -                      <field eval="4.0" name="price_unit"/>
 -                      <field eval="4.0" name="price_subtotal"/>
++                      <field name="price_unit" eval="4.0"/>
++                      <field name="price_subtotal" eval="4.0"/>
+                       <field name="company_id" ref="base.main_company"/>
 -                      <field eval="[(6,0,[])]" name="invoice_line_tax_id"/>
++                      <field name="invoice_line_tax_id" eval="[(6,0,[])]"/>
+                       <field name="product_id" ref="product.product_product_shelf1"/>
 -                      <field eval="1.0" name="quantity"/>
++                      <field name="quantity" eval="1.0" />
+                       <field name="partner_id" ref="base.res_partner_maxtor"/>
+                       <field name="name">[RCK200] Rack 200cm</field>
+               </record>
+       </data>
+ </openerp>

diff --cc addons/crm/report/crm_lead_report_view.xml
Simple merge

diff --cc addons/hr/hr_demo.xml
index 91b78dd,9c45b66..dbfead7
--- 1/addons/hr/hr_demo.xml
--- 2/addons/hr/hr_demo.xml
+++ b/addons/hr/hr_demo.xml
@@@ -11,6 -11,6 +11,21 @@@
              <field name="name">Experience</field>
          </record>
  
++        <record id="category_sr_exec" model="hr.employee.category">
++            <field name="name">Senior (5 years)</field>
++            <field name="parent_id" ref="category_experience"/>
++        </record>
++
++        <record id="category_jr_exec" model="hr.employee.category">
++            <field name="name">Junior (6 months)</field>
++            <field name="parent_id" ref="category_experience"/>
++        </record>
++
++        <record id="category_trainee" model="hr.employee.category">
++            <field name="name">Trainee</field>
++            <field name="parent_id" ref="category_experience"/>
++        </record>
++
          <record id="category_ranking" model="hr.employee.category">
              <field name="name">Ranking</field>
          </record>
@@@ -20,42 -20,42 +35,16 @@@
              <field name="parent_id" ref="category_ranking"/>
          </record>
  
--        <record id="category_cto" model="hr.employee.category">
--            <field name="name">CTO</field>
--            <field name="parent_id" ref="category_ceo"/>
--        </record>
--
          <record id="category_managers" model="hr.employee.category">
--            <field name="name">Managers (Tech. Heads)</field>
--            <field name="parent_id" ref="category_cto"/>
--        </record>
--
--        <record id="category_project_managers" model="hr.employee.category">
--            <field name="name">Project Managers</field>
--            <field name="parent_id" ref="category_managers"/>
++            <field name="name">Executive Managers</field>
++            <field name="parent_id" ref="category_ranking"/>
          </record>
  
          <record id="category_employee" model="hr.employee.category">
              <field name="name">Employees</field>
--            <field name="parent_id" ref="category_project_managers"/>
--        </record>
--
--        <record id="category_sr_exec" model="hr.employee.category">
--            <field name="name">Sr. Executives (5 years)</field>
--            <field name="parent_id" ref="category_experience"/>
--        </record>
--
--        <record id="category_jr_exec" model="hr.employee.category">
--            <field name="name">Jr. Executives (6 months)</field>
--            <field name="parent_id" ref="category_experience"/>
--        </record>
--
--        <record id="category_trainee" model="hr.employee.category">
--            <field name="name">Trainee</field>
--            <field name="parent_id" ref="category_experience"/>
++            <field name="parent_id" ref="category_ranking"/>
          </record>
  
--
          <!-- Example employee -->
  
          <record id="employee1" model="hr.employee">
@@@ -76,9 -76,36 +65,9 @@@
              <field name="name">Antoine Philippe</field>
              <field name="calendar_id" ref="resource.timesheet_group1"/>
              <field name="user_id" ref="base.user_root"/>
--            <field name="category_ids" eval="[(6, 0, [ref('category_trainee')])]"/>
 -        </record>
 -
 -        <record id="employee4" model="hr.employee">
 -            <field name="name">Laith Jubair</field>
 -            <field name="calendar_id" ref="resource.timesheet_group1"/>
 -            <field name="user_id" ref="base.user_root"/>
 -            <field name="category_ids" eval="[(6, 0, [ref('category_sr_exec'),ref('category_ceo')])]"/>
 -        </record>
 -
 -        <record id="employee5" model="hr.employee">
 -            <field name="name">Alexendar</field>
 -            <field name="calendar_id" ref="resource.timesheet_group1"/>
 -            <field name="user_id" ref="base.user_root"/>
 -            <field name="category_ids" eval="[(6, 0, [ref('category_sr_exec'),ref('category_ceo')])]"/>
++            <field name="category_ids" eval="[(6, 0, [ref('category_trainee'),ref('category_employee')])]"/>
          </record>
  
 -        <record id="employee6" model="hr.employee">
 -            <field name="name">Leonidas Micheal</field>
 -            <field name="calendar_id" ref="resource.timesheet_group1"/>
 -            <field name="user_id" ref="base.user_demo"/>
 -            <field name="category_ids" eval="[(6, 0, [ref('category_sr_exec'),ref('category_ceo')])]"/>
 -        </record>
 -
 -        <record id="employee7" model="hr.employee">
 -            <field name="name">Xexers Botha</field>
 -            <field name="calendar_id" ref="resource.timesheet_group1"/>
 -            <field name="user_id" ref="base.user_demo"/>
 -            <field name="category_ids" eval="[(6, 0, [ref('category_sr_exec'),ref('category_ceo')])]"/>
 -        </record>
          <record id="ir_ui_view_sc_employees_demo" model="ir.ui.view_sc">
              <field name="name">Employees</field>
              <field name="resource">ir.ui.menu</field>

diff --cc addons/sale/sale_demo.xml
index 0e3126d,7b8908a..4fcce85
--- 1/addons/sale/sale_demo.xml
--- 2/addons/sale/sale_demo.xml
+++ b/addons/sale/sale_demo.xml
@@@ -178,6 -178,73 +178,73 @@@
          </record>
          <workflow action="order_confirm" model="sale.order" ref="order5"/>
  
+         <!--Resource: sale.order-->
+ 
+         <record id="order6" model="sale.order">
+             <field name="shop_id" ref="shop"/>
+             <field model="product.pricelist" name="pricelist_id" search="[]"/>
+             <field name="user_id" ref="base.user_demo"/>
+             <field name="partner_id" ref="base.res_partner_maxtor"/>
+             <field name="partner_invoice_id" ref="base.res_partner_address_wong"/>
+             <field name="partner_shipping_id" ref="base.res_partner_address_wong"/>
+             <field name="partner_order_id" ref="base.res_partner_address_wong"/>
+         </record>
 -        <record id="line10" model="sale.order.line">
++        <record id="order6_line0" model="sale.order.line">
+             <field name="order_id" ref="order6"/>
+             <field name="name">Onsite Senior Intervention</field>
+             <field name="product_id" ref="product.product_product_0"/>
+             <field name="product_uom" ref="product.product_uom_unit"/>
+             <field name="product_uom_qty">4</field>
+             <field name="price_unit">250</field>
+             <field name="type">make_to_order</field>
+             <field name="delay">15</field>
+         </record>
 -        <record id="line11" model="sale.order.line">
++        <record id="order6_line1" model="sale.order.line">
+             <field name="order_id" ref="order6"/>
+             <field name="name">Onsite Intervention</field>
+             <field name="product_id" ref="product.product_product_1"/>
+             <field name="product_uom" ref="product.product_uom_unit"/>
+             <field name="product_uom_qty">4</field>
+             <field name="price_unit">500</field>
+             <field name="type">make_to_order</field>
+             <field name="delay">15</field>
+         </record>
+         <workflow action="order_confirm" model="sale.order" ref="order6"/>
+         <workflow action="manual_invoice" model="sale.order" ref="order6"/>
+ 
+         <!--Resource: sale.order-->
+ 
+         <record id="order7" model="sale.order">
+             <field name="shop_id" ref="shop"/>
+             <field model="product.pricelist" name="pricelist_id" search="[]"/>
+             <field name="user_id" ref="base.user_demo"/>
+             <field name="partner_id" ref="base.res_partner_desertic_hispafuentes"/>
+             <field name="partner_invoice_id" ref="base.res_partner_address_3000"/>
+             <field name="partner_shipping_id" ref="base.res_partner_address_3000"/>
+             <field name="partner_order_id" ref="base.res_partner_address_3000"/>
+         </record>
 -        <record id="line12" model="sale.order.line">
++        <record id="order7_line0" model="sale.order.line">
+             <field name="order_id" ref="order7"/>
+             <field name="name">[MB1] Mainboard ASUStek A7N8X</field>
+             <field name="product_id" ref="product.product_product_mb1"/>
+             <field name="product_uom" ref="product.product_uom_unit"/>
+             <field name="product_uom_qty">4</field>
+             <field name="price_unit">250</field>
+             <field name="type">make_to_order</field>
+             <field name="delay">15</field>
+         </record>
 -        <record id="line13" model="sale.order.line">
++        <record id="order7_line1" model="sale.order.line">
+             <field name="order_id" ref="order7"/>
 -            <field name="name">[MB2 Mainboard ASUStek A7N8X</field>
++            <field name="name">[MB2] Mainboard ASUStek A7V8X-X</field>
+             <field name="product_id" ref="product.product_product_mb2"/>
+             <field name="product_uom" ref="product.product_uom_unit"/>
+             <field name="product_uom_qty">4</field>
+             <field name="price_unit">500</field>
+             <field name="type">make_to_order</field>
+             <field name="delay">15</field>
+         </record>
+         <workflow action="order_confirm" model="sale.order" ref="order7"/>
+         <workflow action="manual_invoice" model="sale.order" ref="order7"/>
          <!-- Run all schedulers -->
          <function model="procurement.order" name="run_scheduler"/>