[MERGE]merge with latest addons trunk

bzr revid: csn@openerp.com-20121211103429-rmh5qs23rbsxrttk
2012-12-11 11:34:29 +01:00
parent 59b6994924 5d4900faad
commit 8aac6dffd6
2 changed files with 2 additions and 1 deletions
@@ -50,6 +50,7 @@
            <field name="field_parent">child_complete_ids</field>
            <field name="arch" type="xml">
                <tree colors="blue:state=='pending';grey:state in ('close','cancelled');blue:type=='view'" string="Analytic account" toolbar="1">
+                    <field name="name" invisible="1"/>
                    <field name="complete_name"/>
                    <field name="code"/>
                    <field name="debit"/>
@@ -22,7 +22,7 @@
        <!-- Resource: sale.shop -->
        <record id="sale_shop_1" model="sale.shop">
            <field name="company_id" ref="base.main_company"/>
-            <field name="payment_default_id" ref="account.account_payment_term"/>
+            <field name="payment_default_id" ref="account.account_payment_term_net"/>
            <field name="pricelist_id" ref="product.list0"/>

            <!--  Copy the name of any company. Without demo data this will yield