Randhir Mayatra (OpenERP) has proposed merging
lp:~openerp-commiter/openobject-addons/trunk-config-wizard-apa-accouting-rma
into lp:~openerp-dev/openobject-addons/trunk-config-wizard-apa.
Requested reviews:
Amit Patel (OpenERP) (apa-tiny)
For more details, see:
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-config-wizard-apa-accouting-rma/+merge/115938
Hello sir,
I have make changes into the accounting wizard.
Thank you.
--
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-config-wizard-apa-accouting-rma/+merge/115938
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-config-wizard-apa.
=== modified file 'account/res_config_view.xml'
--- account/res_config_view.xml 2012-07-16 13:43:14 +0000
+++ account/res_config_view.xml 2012-07-20 10:21:48 +0000
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
-
<record id="open_account_charts_modules" model="ir.actions.act_window">
<field name="name">Chart Templates</field>
<field name="res_model">ir.module.module</field>
@@ -9,13 +8,12 @@
<field name="context" eval="{'search_default_category_id': ref('base.module_category_localization_account_charts')}"/>
<field name="search_view_id" ref="base.view_module_filter"/>
</record>
-
<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">
+ <form string="Configure Accounting" version="7.0" class= "oe_form_configuration">
<header>
<button string="Apply" type="object" name="execute" class="oe_highlight"/>
or
@@ -25,105 +23,219 @@
<field name="has_chart_of_accounts" invisible="1"/>
<field name="complete_tax_set" invisible="1"/>
<field name="has_fiscal_year" invisible="1"/>
-
- <group groups="base.group_multi_company">
- <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"/>
+ <separator string="Compnay Selection"/>
+ <group>
+ <label for="base.group_multi_company" string="Manage Company Selection"/>
+ <div>
+ <div>
+ <label for="base.group_multi_company" />
+ <field name="company_id" string="Select Company" widget="selection"
+ on_change="onchange_company_id(company_id)"
+ attrs="{'invisible': [('has_default_company', '=', True)]}" class="oe_inline"/>
+ </div>
+ <div>
+ <field name="expects_chart_of_accounts" class="oe_inline"/>
+ <label for="expects_chart_of_accounts" class="oe_inline"/>
+ </div>
+ </div>
+ </group>
+ <group string="Select a Chart of Accounts to Install"
+ attrs="{'invisible': ['|', ('expects_chart_of_accounts','=',False), ('has_chart_of_accounts','=',True)]}" class="oe_inline"/>
+ <group>
+ <label for="id" string="Account Chart Selection"/>
+ <div>
+ <div>
+ <label for="chart_template_id" />
+ <field name="chart_template_id" widget="selection" domain="[('visible','=', True)]" on_change="onchange_chart_template_id(chart_template_id)" class="oe_inline"/>
+ </div>
+ <div>
+ <label for="id" string="Insert More Charts"/>
+ <button string="Install More Chart Templates" icon="gtk-go-forward"
+ name="%(open_account_charts_modules)d" type="action" class="oe_inline" />
+ </div>
+ <div>
+ <label for="code_digits" />
+ <field name="code_digits" groups="account.group_account_user"/>
+ </div>
+ </div>
</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"/>
+ <group>
+ <label for="id" string="Sales and Purchases Tax Rate"/>
+ <div>
+ <div>
<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'))]"/>
+ domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('sale','all'))]" class="oe_inline"/>
+ </div>
+ <div>
<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"/>
+ domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('purchase', 'all'))]" class="oe_inline"/>
+ </div>
+ <div>
+ <lable for="sale_tax_rate"/>
+ <field name="sale_tax_rate" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',True)]}" on_change="onchange_tax_rate(sale_tax_rate)" class="oe_inline"/>
+ </div>
+ <div>
+ <lable for="purchase_tax_rate"/>
+ <field name="purchase_tax_rate" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',True)]}" class="oe_inline"/>
+ </div>
+ </div>
</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"/>
+ attrs="{'invisible': ['|', ('expects_chart_of_accounts','=',False), ('has_fiscal_year','=',True)]}"/>
+ <group>
+ <label for="id" string="Fiscal Year Setting"/>
+ <div>
+ <div>
+ <label for="date_start"/>
+ <field name="date_start" on_change="onchange_start_date(date_start)" class="oe_inline" />
+ </div>
<div>
- <field name="date_start" on_change="onchange_start_date(date_start)" class="oe_inline"/> -
+ <label for="date_stop"/>
<field name="date_stop" class="oe_inline"/>
</div>
- <field name="period"/>
+ <div>
+ <label for="period"/>
+ <field name="period"/>
+ </div>
+ </div>
</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"
+ <separator string="Accounting Configuration"/>
+ <group >
+ <label for="id" string="Accounting Features"/>
+ <div>
+ <div>
+ <label for="default_sale_tax"/>
+ <field name="default_sale_tax" domain="[('type_tax_use','=','sale'), ('company_id','=',company_id)]" attrs="{'invisible': [('has_chart_of_accounts','=',False)]}" class="oe_inline"/>
+ </div>
+ <div>
+ <field name="module_account_accountant" class="oe_inline"/>
+ <label for="module_account_accountant"/>
+ </div>
+ <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="default_purchase_tax"/>
+ <field name="default_purchase_tax" domain="[('type_tax_use','=','purchase'), ('company_id','=',company_id)]"
+ attrs="{'invisible': [('has_chart_of_accounts','=',False)]}" class="oe_inline"/>
+ </div>
+ <div>
+ <label for="tax_calculation_rounding_method"/>
+ <field name="tax_calculation_rounding_method" class="oe_inline"/>
+ </div>
+ <div>
+ <field name="module_account_asset"/>
+ <label for="module_account_asset"/>
+ </div>
+ <div>
+ <field name="module_account_budget"/>
+ <label for="module_account_budget"/>
+ </div>
+ </div>
+ </group>
+ <separator string="Customer Invoices"/>
+ <group>
+ <label for="id" string="Customer Invoices Settings "/>
+ <div>
+ <div>
+ <label for="sale_sequence_next"/>
+ <field name="sale_sequence_next" class="oe_inline" nolabel="1" attrs="{'readonly': [('sale_journal_id','=',False)]}"/>
+ </div>
+ <div>
+ <label for="sale_refund_sequence_prefix"/>
+ <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.' />
+ </div>
+ <div>
+ <label for="sale_refund_sequence_next"/>
+ <field name="sale_refund_sequence_next" nolabel="1" class="oe_inline" attrs="{'readonly': [('sale_refund_journal_id','=',False)]}"/>
+ </div>
+ <div>
+ <field name="module_account_voucher" class="oe_inline"/>
+ <label for="module_account_voucher"/>
+ </div>
+ <div>
+ <field name="module_account_followup" class="oe_inline"/>
+ <label for="module_account_followup"/>
+ </div>
+ <div>
+ <field name="group_proforma_invoices"/>
+ <label for="group_proforma_invoices"/>
+ </div>
+ </div>
+ </group>
+ <group name="analytic_accounting" invisible="1" string="Analytic Accounting" class="oe_inline">
+ <label for="id" string="Analytic Account Settings" />
+ <div name="analytic_account"/>
+ </group>
+ <separator string="Supplier Invoices" />
+ <group>
+ <label for="id" string="Supplier Invoices Setting"/>
+ <div>
+ <div>
+ <label for="purchase_sequence_prefix"/>
+ <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.'/>
+ </div>
+ <div>
+ <label for="purchase_sequence_next"/>
+ <field name="purchase_sequence_next" nolabel="1" class="oe_inline" attrs="{'readonly': [('purchase_journal_id','=',False)]}"/>
+ </div>
+
+ <div>
+ <label for="purchase_refund_sequence_prefix"/>
+ <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.'/>
+ </div>
+ <div>
+ <label for="purchase_refund_sequence_next"/>
+ <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="[email protected]"/>
- <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>
- </group>
- <field name="sale_journal_id" invisible="1"/>
- <field name="sale_refund_journal_id" invisible="1"/>
- <field name="purchase_journal_id" invisible="1"/>
- <field name="purchase_refund_journal_id" invisible="1"/>
+ </div>
+ <div>
+ <field name="module_account_payment" class="oe_inline"/>
+ <label for="module_account_payment"/>
+ </div>
+ </div>
+ </group>
+ <separator string="Electronic Payments"/>
+ <group >
+ <label for="id" string="Electronic Payments Settings"/>
+ <div>
+ <div>
+ <label for="paypal_account"/>
+ <field name="paypal_account" placeholder="[email protected]" class="oe_inline"/>
+ </div>
+ </div>
+ </group>
+ <separator string="Bank & Cash"/>
+ <group >
+ <label for="id" string="Bank Cash Settings"/>
+ <div>
+ <div>
+ <label for="id" string="Configure Bank Accounts"/>
+ <button name="%(action_bank_tree)d" string="Configure Bank Accounts" icon="gtk-go-forward" type="action" class="oe_inline"/>
+ </div>
+ <div>
+ <label for="company_footer" />
+ <field name="company_footer" class="oe_inline"/>
+ </div>
+ <div>
+ <field name="module_account_check_writing" class="oe_inline"/>
+ <label for="company_footer" />
+ </div>
+ </div>
+ </group>
+ <field name="sale_journal_id" invisible="1" />
+ <field name="sale_refund_journal_id" invisible="1" />
+ <field name="purchase_journal_id" invisible="1"/>
+ <field name="purchase_refund_journal_id" invisible="1" />
</form>
</field>
</record>
-
<record id="action_account_config" model="ir.actions.act_window">
<field name="name">Configure Accounting</field>
<field name="type">ir.actions.act_window</field>
@@ -131,7 +243,6 @@
<field name="view_mode">form</field>
<field name="target">inline</field>
</record>
-
<menuitem id="menu_account_config" name="Accounting" parent="base.menu_config"
sequence="14" action="action_account_config"/>
=== modified file 'purchase/res_config_view.xml'
--- purchase/res_config_view.xml 2012-07-16 13:43:14 +0000
+++ purchase/res_config_view.xml 2012-07-20 10:21:48 +0000
@@ -51,16 +51,22 @@
<field name="inherit_id" ref="account.view_account_config_settings"/>
<field name="priority" eval="18"/>
<field name="arch" type="xml">
- <separator name="analytic_accounting" position="attributes">
+ <group name="analytic_accounting" position="attributes">
<attribute name="invisible">0</attribute>
- <attribute name="colspan">2</attribute>
- </separator>
- <separator name="analytic_accounting" position="after">
- <field name="group_analytic_account_for_purchases"/>
- <field name="module_purchase_analytic_plans" on_change="onchange_purchase_analytic_plans(module_purchase_analytic_plans)"/>
- </separator>
+ <attribute name="colspan">4</attribute>
+ </group>
+ <xpath expr="//div[@name='analytic_account']" position="inside">
+
+ <div>
+ <field name="group_analytic_account_for_purchases" class="oe_inline"/>
+ <label for="group_analytic_account_for_purchases" string="Analytic for Purchases" />
+ </div>
+ <div>
+ <field name="module_purchase_analytic_plans" on_change="onchange_purchase_analytic_plans(module_purchase_analytic_plans)" class="oe_inline"/>
+ <label for="module_purchase_analytic_plans" string="More Analytic on Purchases"/>
+ </div>
+ </xpath>
</field>
</record>
-
</data>
</openerp>
=== modified file 'sale/res_config_view.xml'
--- sale/res_config_view.xml 2012-07-16 13:43:14 +0000
+++ sale/res_config_view.xml 2012-07-20 10:21:48 +0000
@@ -50,14 +50,20 @@
<field name="inherit_id" ref="account.view_account_config_settings"/>
<field name="priority" eval="16"/>
<field name="arch" type="xml">
- <separator name="analytic_accounting" position="attributes">
+ <group name="analytic_accounting" position="attributes">
<attribute name="invisible">0</attribute>
- <attribute name="colspan">2</attribute>
- </separator>
- <separator name="analytic_accounting" position="after">
- <field name="group_analytic_account_for_sales"/>
- <field name="module_sale_analytic_plans" on_change="onchange_sale_analytic_plans(module_sale_analytic_plans)"/>
- </separator>
+ <attribute name="colspan">4</attribute>
+ </group>
+ <xpath expr="//div[@name='analytic_account']" position="inside">
+ <div>
+ <field name="group_analytic_account_for_sales" class="oe_inline"/>
+ <label for="group_analytic_account_for_sales" string="Analytic for Sales Account" />
+ </div>
+ <div>
+ <field name="module_sale_analytic_plans" on_change="onchange_sale_analytic_plans(module_sale_analytic_plans)" class="oe_inline"/>
+ <label for="module_sale_analytic_plans" string="More Analytic on Sales" />
+ </div>
+ </xpath>
</field>
</record>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
