odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[WIP] continue work on accounting config wizard 

bzr revid: abo@openerp.com-20120802153719-7fh9p2qs3f1fxzj5
This commit is contained in:
Antonin Bourguignon 2012-08-02 17:37:19 +02:00
parent b1750a6820
commit c522d94080
4 changed files with 70 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
addons/account/res_config.py
View File

@ -44,7 +44,7 @@ class account_config_settings(osv.osv_memory):
'paypal_account': fields.related('company_id', 'paypal_account', type='char', size=128,
string='Paypal account', help="Paypal account (email) for receiving online payments (credit card, etc.) If you set a paypal account, the customer will be able to pay your invoices or quotations with a button \"Pay with Paypal\" in automated emails or through the OpenERP portal."),
'company_footer': fields.related('company_id', 'rml_footer2', type='char', size=250, readonly=True,
string='Bank accounts on reports', help="Bank accounts as printed in the footer of each customer document. This is for information purpose only, you should configure these bank accounts through the above button \"Configure Bank Accounts\"."),
string='Bank accounts on reports', help="Bank accounts as printed in the footer of each customer document. This is for information purpose only, you should configure these bank accounts through the above button \"Configure Bank Accounts\"."),
'has_chart_of_accounts': fields.boolean('Company has a chart of accounts'),
'chart_template_id': fields.many2one('account.chart.template', 'Template', domain="[('visible','=', True)]"),
@ -79,33 +79,33 @@ class account_config_settings(osv.osv_memory):
'purchase_refund_sequence_prefix': fields.related('purchase_refund_journal_id', 'sequence_id', 'prefix', type='char', string='Supplier credit note sequence'),
'purchase_refund_sequence_next': fields.related('purchase_refund_journal_id', 'sequence_id', 'number_next', type='integer', string='Next supplier credit note number'),
'module_account_check_writing': fields.boolean('Check writing',
'module_account_check_writing': fields.boolean('check writing',
help="""This allows you to check writing and printing.
This installs the module account_check_writing."""),
'module_account_accountant': fields.boolean('Accountant features',
'module_account_accountant': fields.boolean('accountant features',
help="""If you do not check this box, you will be able to do invoicing & payments, but not accounting (Journal Items, Chart of Accounts, ...)"""),
'module_account_asset': fields.boolean('Assets management',
'module_account_asset': fields.boolean('assets management',
help="""This allows you to manage the assets owned by a company or a person.
It keeps track of the depreciation occurred on those assets, and creates account move for those depreciation lines.
This installs the module account_asset. If you do not check this box, you will be able to do invoicing & payments,
but not accounting (Journal Items, Chart of Accounts, ...)"""),
'module_account_budget': fields.boolean('Budget management',
'module_account_budget': fields.boolean('budget management',
help="""This allows accountants to manage analytic and crossovered budgets.
Once the master budgets and the budgets are defined,
the project managers can set the planned amount on each analytic account.
This installs the module account_budget."""),
'module_account_payment': fields.boolean('Manage payment orders',
'module_account_payment': fields.boolean('manage payment orders',
help="""This allows you to create and manage your payment orders, with purposes to
* serve as base for an easy plug-in of various automated payment mechanisms, and
* provide a more efficient way to manage invoice payments.
This installs the module account_payment."""),
'module_account_voucher': fields.boolean('Manage customer payments',
'module_account_voucher': fields.boolean('anage customer payments',
help="""This includes all the basic requirements of voucher entries for bank, cash, sales, purchase, expense, contra, etc.
This installs the module account_voucher."""),
'module_account_followup': fields.boolean('Manage customer payment follow-ups',
'module_account_followup': fields.boolean('manage customer payment follow-ups',
help="""This allows to automate letters for unpaid invoices, with multi-level recalls.
This installs the module account_followup."""),
'group_proforma_invoices': fields.boolean('Allow pro-forma invoices',
'group_proforma_invoices': fields.boolean('allow pro-forma invoices',
implied_group='account.group_proforma_invoices',
help="Allows you to put invoices in pro-forma state."),
'default_sale_tax': fields.many2one('account.tax', 'Default sale tax',

111
addons/account/res_config_view.xml
View File

@ -43,16 +43,18 @@
</div>
</div>
</group>
<separator string="Chart of Account and Fiscal Year"/>
<group attrs="{'invisible': ['|', ('expects_chart_of_accounts','=',False), ('has_chart_of_accounts','=',True)]}">
<label for="id" string="Select Chart"/>
<label for="id" string="Chart of Account"/>
<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"/>
<button string="Install More Chart Templates"
<button string="Install more chart templates"
icon="gtk-go-forward"
name="%(open_account_charts_modules)d"
type="action"
@ -101,36 +103,6 @@
</div>
</div>
</group>
<separator string="Accounting Configuration"/>
<group>
<label for="id" string="Configuration"/>
<div name="account_config">
<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="tax_calculation_rounding_method"/>
<field name="tax_calculation_rounding_method" class="oe_inline"/>
</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 &amp; Payments"/>
<group>
<label for="id" string="Customer"/>
@ -159,6 +131,10 @@
class="oe_inline"
attrs="{'readonly': [('sale_refund_journal_id','=',False)]}"/>
</div>
<div>
<field name="group_proforma_invoices" class="oe_inline"/>
<label for="group_proforma_invoices"/>
</div>
<div>
<field name="module_account_voucher" class="oe_inline"/>
<label for="module_account_voucher"/>
@ -167,11 +143,9 @@
<field name="module_account_followup" class="oe_inline"/>
<label for="module_account_followup"/>
</div>
<div>
<field name="group_proforma_invoices" class="oe_inline"/>
<label for="group_proforma_invoices"/>
</div>
</div>
</group>
<group>
<label for="id" string="Supplier"/>
<div name="other_cofing">
<div attrs="{'invisible': [('has_chart_of_accounts','=',False)]}">
@ -204,22 +178,15 @@
</div>
</div>
</group>
<separator string="Electronic Payments"/>
<group>
<label for="id" string="Payment Settings"/>
<div>
<div>
<label for="paypal_account"/>
<field name="paypal_account" placeholder="sales@openerp.com" class="oe_inline"/>
</div>
</div>
</group>
<separator string="Bank &amp; Cash"/>
<div style="color:grey">
Bank accounts displays on reports: IBAN: XX12 3456 7890 1234 5678 - SWIFT: SWIFTCODE - VAT: Company vat number
</div>
<group>
<label for="id" string="Configuration"/>
<div>
<div>
<label string="Configure Bank Accounts"/>
<label string="Configure your bank accounts"/>
<button name="%(action_bank_tree)d"
string="Configure"
icon="gtk-go-forward"
@ -227,15 +194,48 @@
class="oe_inline oe_link"/>
</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="module_account_check_writing"/>
<label for="paypal_account"/>
<field name="paypal_account" placeholder="sales@openerp.com" class="oe_inline"/>
</div>
</div>
</group>
<separator string="Accounting &amp; 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"/>
</div>
</div>
</group>
<separator string="Electronic Payments"/>
<group>
<label for="id" string="Payment Settings"/>
</group>
<separator name="analytic_account" string="Analytic Accounting" invisible="1"/>
<group name="analytic_account" invisible="1">
<label for="id" string="Settings"/>
@ -245,6 +245,11 @@
<field name="sale_refund_journal_id" invisible="1"/>
<field name="purchase_journal_id" invisible="1"/>
<field name="purchase_refund_journal_id" invisible="1"/>
<separator string="No idea where these should go"/>
<group>
<field name="company_footer"/>
<field name="module_account_check_writing"/>
</group>
</form>
</field>
</record>

2
addons/purchase/res_config.py
View File

@ -82,7 +82,7 @@ class account_config_settings(osv.osv_memory):
_columns = {
'module_purchase_analytic_plans': fields.boolean('use multiple analytic accounts on orders',
help="""This allows install module purchase_analytic_plans."""),
'group_analytic_account_for_purchases': fields.boolean('Analytic Accounting for Purchases',
'group_analytic_account_for_purchases': fields.boolean('analytic accounting for purchases',
implied_group='purchase.group_analytic_accounting',
help="Allows you to specify an analytic account on purchase orders."),
}

4
addons/sale/res_config.py
View File

@ -190,9 +190,9 @@ class sale_configuration(osv.osv_memory):
class account_config_settings(osv.osv_memory):
_inherit = 'account.config.settings'
_columns = {
'module_sale_analytic_plans': fields.boolean('Several Analytic Accounts on Sales',
'module_sale_analytic_plans': fields.boolean('several analytic accounts on sales',
help="""This allows install module sale_analytic_plans."""),
'group_analytic_account_for_sales': fields.boolean('Analytic Accounting for Sales',
'group_analytic_account_for_sales': fields.boolean('analytic accounting for sales',
implied_group='sale.group_analytic_accounting',
help="Allows you to specify an analytic account on sale orders."),
}