<record id="view_account_config_settings" model="ir.ui.view">
<field name="name">account settings</field>
<field name="model">account.config.settings</field>
- <field name="type">form</field>
<field name="arch" type="xml">
<form string="Configure Accounting" version="7.0" class="oe_form_configuration">
<header>
<field name="has_fiscal_year" invisible="1"/>
<separator string="Chart of Accounts" groups="base.group_multi_company"/>
<group groups="base.group_multi_company">
-<<<<<<< TREE
- <field name="company_id" string="Select Company" widget="selection"
- on_change="onchange_company_id(company_id)"
- attrs="{'invisible': [('has_default_company', '=', True)]}"/>
- <field name="expects_chart_of_accounts"/>
- </group>
-
- <group string="Select a Chart of Accounts to Install"
- attrs="{'invisible': ['|', ('expects_chart_of_accounts','=',False), ('has_chart_of_accounts','=',True)]}">
- <group>
- <field name="chart_template_id" widget="selection" domain="[('visible','=', True)]"
- on_change="onchange_chart_template_id(chart_template_id)"/>
- <field name="code_digits" groups="account.group_account_user"/>
- <field name="sale_tax" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',False)]}"
- domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('sale','all'))]"/>
- <field name="purchase_tax" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',False)]}"
- domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('purchase', 'all'))]"/>
- <field name="sale_tax_rate" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',True)]}" on_change="onchange_tax_rate(sale_tax_rate)"/>
- <field name="purchase_tax_rate" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',True)]}"/>
- </group>
- <button string="Install More Chart Templates" icon="gtk-go-forward"
- name="%(open_account_charts_modules)d" type="action"/>
- </group>
-
- <group string="No Fiscal Year Defined for This Company"
- attrs="{'invisible': ['|', ('expects_chart_of_accounts','=',False), ('has_fiscal_year','=',True)]}">
- <label for="date_start" string="Date Range"/>
- <div>
- <field name="date_start" on_change="onchange_start_date(date_start)" class="oe_inline"/> -
- <field name="date_stop" class="oe_inline"/>
- </div>
- <field name="period"/>
- </group>
-
- <group>
- <group name="account_config">
- <separator string="Accounting Configuration" colspan="2"/>
- <field name="default_sale_tax" domain="[('type_tax_use','=','sale'), ('company_id','=',company_id)]"
- attrs="{'invisible': [('has_chart_of_accounts','=',False)]}"/>
- <field name="module_account_accountant"/>
- <field name="currency_id"/>
- <field name="decimal_precision"/>
- <field name="default_purchase_tax" domain="[('type_tax_use','=','purchase'), ('company_id','=',company_id)]"
- attrs="{'invisible': [('has_chart_of_accounts','=',False)]}"/>
- <field name="tax_calculation_rounding_method"/>
- <field name="module_account_asset"/>
- <field name="module_account_budget"/>
- <separator string="Customer Invoices" colspan="2"/>
- <label for="sale_sequence_next"/>
- <group>
- <field name="sale_sequence_prefix" class="oe_inline" nolabel="1"
- help='If you put "%%(year)s" in the prefix, it will be replaced by the current year.'/>
- <field name="sale_sequence_next" class="oe_inline" nolabel="1" attrs="{'readonly': [('sale_journal_id','=',False)]}"/>
- </group>
- <label for="sale_refund_sequence_next"/>
- <group>
- <field name="sale_refund_sequence_prefix" class="oe_inline" nolabel="1"
- help='If you put "%%(year)s" in the prefix, it will be replaced by the current year.'/>
- <field name="sale_refund_sequence_next" nolabel="1" class="oe_inline" attrs="{'readonly': [('sale_refund_journal_id','=',False)]}"/>
- </group>
- <field name="module_account_voucher"/>
- <field name="module_account_followup"/>
- <field name="group_proforma_invoices"/>
- <separator name="analytic_accounting" invisible="1" string="Analytic Accounting"/>
- </group>
- <group name="other_cofing">
- <separator string="Supplier Invoices" colspan="2"/>
- <label for="purchase_sequence_next"/>
- <group>
- <field name="purchase_sequence_prefix" class="oe_inline" nolabel="1"
- help='If you put "%%(year)s" in the prefix, it will be replaced by the current year.'/>
- <field name="purchase_sequence_next" nolabel="1" class="oe_inline" attrs="{'readonly': [('purchase_journal_id','=',False)]}"/>
- </group>
- <label for="purchase_refund_sequence_next"/>
- <group>
- <field name="purchase_refund_sequence_prefix" class="oe_inline" nolabel="1"
- help='If you put "%%(year)s" in the prefix, it will be replaced by the current year.'/>
- <field name="purchase_refund_sequence_next" class="oe_inline"
- attrs="{'readonly': [('purchase_refund_journal_id','=',False)]}" nolabel="1"/>
- </group>
- <field name="module_account_payment"/>
- <separator string="Electronic Payments" colspan="2"/>
- <field name="paypal_account" placeholder="e.g. sales@openerp.com"/>
- <separator string="Bank & Cash" colspan="2"/>
- <label for="id" string="Configure Bank Accounts"/>
- <button name="%(action_bank_tree)d" string="Configure Bank Accounts" icon="gtk-go-forward" type="action"/>
- <field name="company_footer"/>
- <field name="module_account_check_writing"/>
- </group>
-=======
<label for="id" string="Chart of Accounts"/>
<div>
<div attrs="{'invisible': [('has_default_company', '=', True)]}">
<label for="company_id" string="Select Company"/>
<field name="company_id"
widget="selection"
- on_change="onchange_company_id(company_id)"
+ on_change="onchange_company_id(company_id, context)"
class="oe_inline"/>
</div>
<div>
</div>
</div>
</group>
- <separator string="Chart of Account and Fiscal Year" attrs="{'invisible': ['|', ('expects_chart_of_accounts','=',False), ('has_chart_of_accounts','=',True)]}"/>
+ <separator string="Chart of Accounts" attrs="{'invisible': ['|', ('expects_chart_of_accounts','=',False), ('has_chart_of_accounts','=',True)]}"/>
<group attrs="{'invisible': ['|', ('expects_chart_of_accounts','=',False), ('has_chart_of_accounts','=',True)]}">
<label for="id" string="Chart of Account"/>
<div>
</div>
</div>
</group>
+ <separator string="Accounting & Finance"/>
+ <group>
+ <label for="id" string="Options"/>
+ <div name="account_config">
+ <div>
+ <label for="currency_id"/>
+ <field name="currency_id" class="oe_inline"/>
+ </div>
+ <div>
+ <label for="decimal_precision"/>
+ <field name="decimal_precision" class="oe_inline"/>
+ </div>
+ <div>
+ <label for="tax_calculation_rounding_method"/>
+ <field name="tax_calculation_rounding_method" class="oe_inline"/>
+ </div>
+ </div>
+ <label for="id" string="Features"/>
+ <div>
+ <div name="group_multi_currency">
+ <field name="group_multi_currency" class="oe_inline"/>
+ <label for="group_multi_currency"/>
+ </div>
+ <div>
+ <field name="module_account_accountant" class="oe_inline"/>
+ <label for="module_account_accountant"/>
+ </div>
+ <div>
+ <field name="group_analytic_accounting" class="oe_inline"/>
+ <label for="group_analytic_accounting"/>
+ </div>
+ <div>
+ <field name="module_account_asset" class="oe_inline"/>
+ <label for="module_account_asset"/>
+ </div>
+ <div>
+ <field name="module_account_budget" class="oe_inline"/>
+ <label for="module_account_budget"/>
+ </div>
+ </div>
+ </group>
<separator string="eInvoicing & Payments"/>
<group>
<label for="id" string="Customer"/>
<field name="module_account_check_writing" class="oe_inline"/>
<label for="module_account_check_writing"/>
</div>
+ <div>
+ <field name="group_check_supplier_invoice_total" class="oe_inline"/>
+ <label for="group_check_supplier_invoice_total"/>
+ </div>
</div>
</group>
<separator string="Bank & Cash"/>
- <group>
+ <group name="bank_cash">
<label for="id" string="Configuration"/>
<div>
<div>
- <label string="Configure your bank accounts"/>
- <button name="%(action_bank_tree)d"
- string="Configure"
- icon="gtk-go-forward"
- type="action"
+ <label for="company_footer"/>
+ <button name="open_company_form" type="object"
+ string="Configure your company bank accounts" icon="gtk-go-forward"
class="oe_inline oe_link"/>
+ <field name="company_footer"/>
</div>
- <p>
- <label for="company_footer"/>: <field name="company_footer" class="oe_inline"/>
- </p>
<div>
<label for="paypal_account"/>
- <field name="paypal_account" placeholder="sales@openerp.com" class="oe_inline"/>
- </div>
- </div>
- </group>
- <separator string="Accounting & Finance"/>
- <group>
- <label for="id" string="Options"/>
- <div name="account_config">
- <div>
- <label for="currency_id"/>
- <field name="currency_id" class="oe_inline"/>
- </div>
- <div>
- <label for="decimal_precision"/>
- <field name="decimal_precision" class="oe_inline"/>
- </div>
- <div>
- <label for="tax_calculation_rounding_method"/>
- <field name="tax_calculation_rounding_method" class="oe_inline"/>
- </div>
- </div>
- <label for="id" string="Features"/>
- <div>
- <div>
- <field name="module_account_accountant" class="oe_inline"/>
- <label for="module_account_accountant"/>
- </div>
- <div>
- <field name="module_account_asset" class="oe_inline"/>
- <label for="module_account_asset"/>
- </div>
- <div>
- <field name="module_account_budget" class="oe_inline"/>
- <label for="module_account_budget"/>
+ <field name="paypal_account" placeholder="e.g. sales@openerp.com" class="oe_inline"/>
</div>
</div>
</group>
<group name="analytic_account_purchase" invisible="1">
<label for="id" string="Purchase"/>
<div/>
->>>>>>> MERGE-SOURCE
</group>
<field name="sale_journal_id" invisible="1"/>
<field name="sale_refund_journal_id" invisible="1"/>
<field name="target">inline</field>
</record>
- <menuitem id="menu_account_config" name="Accounting" parent="base.menu_config"
+ <menuitem id="menu_account_config" name="Invoicing" parent="base.menu_config"
sequence="14" action="action_account_config"/>
</data>
projects / odoo / odoo.git / blobdiff