[MERGE] trunk

bzr revid: al@openerp.com-20120514130734-088uai3tznhri9q3

diff --cc openerp/addons/base/ir/ir.xml
Simple merge

diff --cc openerp/addons/base/res/res_company_view.xml
index 6c9d827,0d227e3..98c6994
--- 1/openerp/addons/base/res/res_company_view.xml
--- 2/openerp/addons/base/res/res_company_view.xml
+++ b/openerp/addons/base/res/res_company_view.xml
@@@ -1,114 -1,6 +1,114 @@@
  <?xml version="1.0" encoding="UTF-8"?>
  <openerp>
      <data>
 +        <menuitem id="menu_res_company_global" parent="base.menu_administration" name="Companies" sequence="2"/>
 +
 +        <menuitem id="menu_custom_multicompany" parent="base.menu_custom" name="Multi-Companies" sequence="50"/>
 +
 +        <report id="preview_report" model="res.company" name="preview.report" multi="True" rml="base/report/preview_report.rml" string="Preview Report"/>
 +        <record id="bank_account_update" model="ir.actions.act_window">
 +            <field name="name">Company Bank Accounts</field>
 +            <field name="res_model">res.partner.bank</field>
 +            <field name="view_type">form</field>
 +            <field name="view_mode">tree,form</field>
 +            <field name="context" eval="{'default_partner_id':ref('base.main_partner'), 'company_hide':False, 'default_company_id':ref('base.main_company'), 'search_default_my_bank':1}"/>
 +        </record>
 +        <record id="view_company_form" model="ir.ui.view">
 +            <field name="name">res.company.form</field>
 +            <field name="model">res.company</field>
 +            <field name="type">form</field>
 +            <field name="arch" type="xml">
 +                <form string="Company">
 +                    <group colspan="4" col="6">
 +                        <group colspan="4" col="4">
 +                            <field name="name"/>
 +                            <field name="partner_id" readonly="1" required="0" groups="base.group_no_one"/>
 +                            <field name="parent_id"  groups="base.group_multi_company"/>
 +                        </group>
 +                        <group colspan="2" col="2">
 +                            <field name="logo" nolabel="1" widget="image"/>
 +                        </group>
 +                    </group>
 +                    <notebook colspan="4">
 +                        <page string="General Information">
 +                            <separator string="Address Information" colspan="4"/>
 +                            <field name="street" colspan="4"/>
 +                            <field name="street2" invisible="1"/>
 +                            <field name="zip"/>
 +                            <field name="city"/>
 +                            <field name="country_id"/>
 +                            <field name="state_id"/>
 +                            <field name="phone" on_change="on_change_header(phone, email, fax, website, vat, company_registry)"/>
 +                            <field name="email" on_change="on_change_header(phone, email, fax, website, vat, company_registry)"/>
 +                            <field name="fax" on_change="on_change_header(phone, email, fax, website, vat, company_registry)"/>
 +                            <field name="website" on_change="on_change_header(phone, email, fax, website, vat, company_registry)"/>
 +                            <field name="vat" on_change="on_change_header(phone, email, fax, website, vat, company_registry)"/>
 +                            <field name="company_registry" on_change="on_change_header(phone, email, fax, website, vat, company_registry)"/>
 +                            <separator string="Header/Footer of Reports" colspan="4"/>
 +                            <group colspan="4" col="3">
 +                                <field name="rml_header1" colspan="3"/>
 +                                <newline/>
 +                                <field name="rml_footer1" colspan="3" groups="base.group_no_one"/>
 +                                <newline/>
 +                                <field name="rml_footer2" colspan="2"/>
 +                                <button name="%(bank_account_update)d" string="Set Bank Accounts" type="action" icon="gtk-go-forward"/>
 +                                <newline/>
 +                                <label string="" colspan="2"/>
-                                 <button name="%(preview_report)d" string="Preview Header" type="action" icon="gtk-print"/>
++                                <button name="%(preview_report)d" string="Preview Header/Footer" type="action" icon="gtk-print"/>
 +                            </group>
 +                        </page>
 +                        <page string="Header/Footer" groups="base.group_no_one">
 +                            <group colspan="2" col="4">
 +                               <field name="paper_format" on_change="onchange_paper_format(paper_format)"/>
 +                            </group>
 +                            <field colspan="4" name="rml_header" nolabel="1"/>
 +                        </page>
 +                        <page string="Internal Header/Footer" groups="base.group_no_one">
 +                            <separator string="Portrait" colspan="2"/>
 +                            <separator string="Landscape" colspan="2"/>
 +                            <field colspan="2" name="rml_header2" nolabel="1"/>
 +                            <field colspan="2" name="rml_header3" nolabel="1"/>
 +                        </page>
 +                        <page string="Configuration">
 +                            <separator string="Accounting" colspan="4"/>
 +                            <field name="currency_id" colspan="2"/>
 +                            <newline/>
 +                        </page>
 +                        <page string="Bank Accounts">
 +                          <field name="bank_ids" nolabel="1"/>
 +                        </page>
 +                    </notebook>
 +                </form>
 +            </field>
 +        </record>
 +        <record id="view_company_tree" model="ir.ui.view">
 +            <field name="name">res.company.tree</field>
 +            <field name="model">res.company</field>
 +            <field name="type">tree</field>
 +            <field name="field_parent">child_ids</field>
 +            <field name="arch" type="xml">
 +                <tree string="Companies">
 +                    <field name="name"/>
 +                    <field name="partner_id"/>
 +                </tree>
 +            </field>
 +        </record>
 +        <record id="action_res_company_form" model="ir.actions.act_window">
 +            <field name="name">Companies</field>
 +            <field name="type">ir.actions.act_window</field>
 +            <field name="res_model">res.company</field>
 +            <field name="view_type">form</field>
 +            <field name="help">Create and manage the companies that will be managed by OpenERP from here. Shops or subsidiaries can be created and maintained from here.</field>
 +        </record>
 +        <menuitem action="action_res_company_form" id="menu_action_res_company_form" parent="base.menu_res_company_global"/>
 +        <record id="action_res_company_tree" model="ir.actions.act_window">
 +            <field name="name">Company's Structure</field>
 +            <field name="type">ir.actions.act_window</field>
 +            <field name="res_model">res.company</field>
 +            <field name="domain">[('parent_id','=',False)]</field>
 +            <field name="view_type">tree</field>
 +        </record>
 +        <menuitem action="action_res_company_tree" groups="base.group_multi_company" id="menu_action_res_company_tree" parent="base.menu_res_company_global" sequence="16"/>
  
          <record id="view_inventory_tree" model="ir.ui.view">
              <field name="name">multi_company.default.tree</field>