Turkesh Patel (openERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-v62_account_tax-tpa into lp:~openerp-dev/openobject-addons/trunk-v62_config_account-uco.
Requested reviews: Ujjvala Collins (OpenERP) (uco-openerp) For more details, see: https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-v62_account_tax-tpa/+merge/97002 Account ======================= --> [IMP] improved code for sale tax and purchase tax field. -- https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-v62_account_tax-tpa/+merge/97002 Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-v62_config_account-uco.
=== modified file 'account/res_config.py' --- account/res_config.py 2012-03-12 08:50:44 +0000 +++ account/res_config.py 2012-03-12 11:48:45 +0000 @@ -1,3 +1,4 @@ +<<<<<<< TREE # -*- coding: utf-8 -*- ############################################################################## # @@ -289,4 +290,257 @@ account_configuration() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:======= +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# +############################################################################## + +import logging +import time +import datetime +from dateutil.relativedelta import relativedelta +from operator import itemgetter +from os.path import join as opj + +from tools.translate import _ +from osv import fields, osv +import netsvc +import tools + +class account_configuration(osv.osv_memory): + _name = 'account.installer' + _inherit = 'res.config.settings' + __logger = logging.getLogger(_name) + + def _get_charts(self, cr, uid, context=None): + modules = self.pool.get('ir.module.module') + # Looking for the module with the 'Account Charts' category + category_name, category_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', 'module_category_localization_account_charts') + ids = modules.search(cr, uid, [('category_id', '=', category_id)], context=context) + charts = list( + sorted(((m.name, m.shortdesc) + for m in modules.browse(cr, uid, ids, context=context)), + key=itemgetter(1))) + charts.insert(0, ('configurable', 'Generic Chart Of Accounts')) + return charts + + _columns = { + 'company_id': fields.many2one('res.company', 'Company'), + 'currency_id': fields.related('company_id', 'currency_id', type='many2one', relation='res.currency', string='Currency', store=True), + 'default_taxes_id': fields.float('Default Sale Tax', default_model='product.product'), + 'default_supplier_taxes_id': fields.float('Default Purchase Tax', default_model='product.product'), + 'charts': fields.selection(_get_charts, 'Chart of Accounts', + required=True, + help="Installs localized accounting charts to match as closely as " + "possible the accounting needs of your company based on your " + "country."), + 'date_start': fields.date('Start Date', required=True), + 'date_stop': fields.date('End Date', required=True), + 'period': fields.selection([('month', 'Monthly'), ('3months','3 Monthly')], 'Periods', required=True), + 'has_default_company' : fields.boolean('Has Default Company', readonly=True), + 'chart_template_id': fields.many2one('account.chart.template', 'Chart Template'), + 'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal Year'), + 'default_paypal_account': fields.char("Your Paypal Account", size=128, help="Paypal username (usually email) for receiving online payments.", default_model='res.company'), + 'company_footer': fields.char("Footer of Reports", size=128, readonly=True), + 'sale_journal_id': fields.many2one('account.journal','Sale Journal'), + 'customer_invoice_sequence_prefix': fields.related('sale_journal_id', 'sequence_id', 'prefix', type='char', relation='ir.sequence', string='Invoice Sequence'), + 'customer_invoice_sequence_next': fields.related('sale_journal_id', 'sequence_id', 'number_next', type='integer', relation='ir.sequence', string='Invoice Sequence Next Number'), + 'sale_refund_journal_id': fields.many2one('account.journal','Sale Refund Journal'), + 'customer_refund_sequence_prefix': fields.related('sale_refund_journal_id', 'sequence_id', 'prefix', type='char', relation='ir.sequence', string='Refund Sequence'), + 'customer_refund_sequence_next': fields.related('sale_refund_journal_id', 'sequence_id', 'number_next', type='integer', relation='ir.sequence', string='Refund Sequence Next Number'), + + 'purchase_journal_id': fields.many2one('account.journal','Purchase Journal'), + 'supplier_invoice_sequence_prefix': fields.related('purchase_journal_id', 'sequence_id', 'prefix', type='char', relation='ir.sequence', string='Supplier Invoice Sequence'), + 'supplier_invoice_sequence_next': fields.related('purchase_journal_id', 'sequence_id', 'number_next', type='integer', relation='ir.sequence', string='Supplier Invoice Sequence Next Number'), + 'purchase_refund_journal_id': fields.many2one('account.journal','Purchase Refund Journal'), + 'supplier_refund_sequence_prefix': fields.related('purchase_refund_journal_id', 'sequence_id', 'prefix', type='char', relation='ir.sequence', string='Supplier Refund Sequence'), + 'supplier_refund_sequence_next': fields.related('purchase_refund_journal_id', 'sequence_id', 'number_next', type='integer', relation='ir.sequence', string='Supplier Refund Sequence Next Number'), + + 'module_account_check_writing': fields.boolean('Support check writings'), + 'module_account_accountant': fields.boolean('Accountant Features'), + 'module_account_asset': fields.boolean('Assets Management'), + 'module_account_budget': fields.boolean('Budgets Management'), + 'module_account_payment': fields.boolean('Supplier Payment Orders'), + 'module_account_voucher': fields.boolean('Manage Customer Payments'), + 'module_account_followup': fields.boolean('Customer Follow-Ups'), + 'module_account_analytic_plans': fields.boolean('Support Multiple Analytic Plans'), + 'module_account_analytic_default': fields.boolean('Rules for Analytic Assignation'), + 'module_account_invoice_layout': fields.boolean('Allow notes and subtotals'), + + 'group_analytic_account_for_sales': fields.boolean('Analytic Accounting for Sales', group='base.group_user', implied_group='base.group_analytic_account_for_sales'), + 'group_analytic_account_for_purchase': fields.boolean('Analytic Accounting for Purchase', group='base.group_user', implied_group='base.group_analytic_account_for_purchase'), + 'group_dates_periods': fields.boolean('Allow dates/periods', group='base.group_user', implied_group='base.group_dates_periods', + help="Allows you to keep the period same as your invoice date when you validate the invoice."\ + "It will add the group 'Allow dates and periods' for all users."), + 'group_proforma_invoices': fields.boolean('Allow Pro-forma Invoices', group='base.group_user', implied_group='base.group_proforma_invoices'), + } + + def _default_company(self, cr, uid, context=None): + user = self.pool.get('res.users').browse(cr, uid, uid, context=context) + return user.company_id and user.company_id.id or False + + def _default_has_default_company(self, cr, uid, context=None): + count = self.pool.get('res.company').search_count(cr, uid, [], context=context) + return bool(count == 1) + + _defaults = { + 'date_start': lambda *a: time.strftime('%Y-01-01'), + 'date_stop': lambda *a: time.strftime('%Y-12-31'), + 'period': 'month', + 'company_id': _default_company, + 'has_default_company': _default_has_default_company, + 'charts': 'configurable', + } + + def _check_default_tax(self, cr, uid, context=None): + ir_values_obj = self.pool.get('ir.values') + taxes = {} + for tax in ir_values_obj.get(cr, uid, 'default', False, ['product.product']): + if tax[1] == 'taxes_id': + taxes.update({'taxes_id': int(tax[2])}) + if tax[1] == 'supplier_taxes_id': + taxes.update({'supplier_taxes_id': int(tax[2])}) + return taxes + + def default_get(self, cr, uid, fields_list, context=None): + ir_values_obj = self.pool.get('ir.values') + chart_template_obj = self.pool.get('account.chart.template') + fiscalyear_obj = self.pool.get('account.fiscalyear') + journal_obj = self.pool.get('account.journal') + res = super(account_configuration, self).default_get(cr, uid, fields_list, context=context) + res.update({'default_taxes_id': 15.0, 'default_supplier_taxes_id': 15.0}) + taxes = self._check_default_tax(cr, uid, context) + chart_template_ids = chart_template_obj.search(cr, uid, [('visible', '=', True)], context=context) + fiscalyear_ids = fiscalyear_obj.search(cr, uid, [('date_start','=',time.strftime('%Y-01-01')),('date_stop','=',time.strftime('%Y-12-31'))]) + + cmp_id = self.pool.get('ir.model.data').get_object(cr, uid, 'base', 'main_company').id + company_data = self.pool.get('res.company').browse(cr, uid, cmp_id) + res.update({'company_footer': company_data.rml_footer2}) + + journal_ids = journal_obj.search(cr, uid, [('company_id', '=', res.get('company_id'))]) + if journal_ids: + for journal in journal_obj.browse(cr, uid, journal_ids, context=context): + if journal.type == 'sale': + res.update({'sale_journal_id': journal.id}) + if journal.type == 'sale_refund': + res.update({'sale_refund_journal_id': journal.id}) + if journal.type == 'purchase': + res.update({'purchase_journal_id': journal.id}) + if journal.type == 'purchase_refund': + res.update({'purchase_refund_journal_id': journal.id}) + + if chart_template_ids: + res.update({'chart_template_id': chart_template_ids[0]}) + if fiscalyear_ids: + res.update({'fiscalyear_id': fiscalyear_ids[0]}) + if taxes: + sale_tax_id = taxes.get('taxes_id') + res.update({'default_taxes_id': sale_tax_id}) + purchase_tax_id = taxes.get('supplier_taxes_id') + res.update({'default_supplier_taxes_id': purchase_tax_id}) + return res + + def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False): + ir_values_obj = self.pool.get('ir.values') + res = super(account_configuration, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar, submenu) + cmp_select = [] + if self._check_default_tax(cr, uid, context): + if res['fields'].get('default_taxes_id') and res['fields'].get('default_supplier_taxes_id'): + res['fields']['default_taxes_id'] = {'domain': [], 'views': {}, 'context': {}, 'selectable': True, 'type': 'many2one', 'relation': 'account.tax', 'string': 'Default Sale Tax'} + res['fields']['default_supplier_taxes_id'] = {'domain': [], 'views': {}, 'context': {}, 'selectable': True, 'type': 'many2one', 'relation': 'account.tax', 'string': 'Default Purchase Tax'} + # display in the widget selection only the companies that haven't been configured yet + unconfigured_cmp = self.get_unconfigured_cmp(cr, uid, context=context) + for field in res['fields']: + if field == 'company_id': + res['fields'][field]['domain'] = [('id','in',unconfigured_cmp)] + res['fields'][field]['selection'] = [('', '')] + if unconfigured_cmp: + cmp_select = [(line.id, line.name) for line in self.pool.get('res.company').browse(cr, uid, unconfigured_cmp)] + res['fields'][field]['selection'] = cmp_select + return res + + def get_unconfigured_cmp(self, cr, uid, context=None): + """ get the list of companies that have not been configured yet + but don't care about the demo chart of accounts """ + cmp_select = [] + company_ids = self.pool.get('res.company').search(cr, uid, [], context=context) + cr.execute("SELECT company_id FROM account_account WHERE active = 't' AND account_account.parent_id IS NULL AND name != %s", ("Chart For Automated Tests",)) + configured_cmp = [r[0] for r in cr.fetchall()] + return list(set(company_ids)-set(configured_cmp)) + + def check_unconfigured_cmp(self, cr, uid, context=None): + """ check if there are still unconfigured companies """ + if not self.get_unconfigured_cmp(cr, uid, context=context): + raise osv.except_osv(_('No unconfigured company !'), _("There are currently no company without chart of account. The wizard will therefore not be executed.")) + + def on_change_start_date(self, cr, uid, id, start_date=False): + if start_date: + start_date = datetime.datetime.strptime(start_date, "%Y-%m-%d") + end_date = (start_date + relativedelta(months=12)) - relativedelta(days=1) + return {'value': {'date_stop': end_date.strftime('%Y-%m-%d')}} + return {} + + def execute(self, cr, uid, ids, context=None): + self.execute_simple(cr, uid, ids, context) + super(account_configuration, self).execute(cr, uid, ids, context=context) + + def execute_simple(self, cr, uid, ids, context=None): + ir_module = self.pool.get('ir.module.module') + if context is None: + context = {} + for res in self.read(cr, uid, ids, context=context): + if res.get('charts') == 'configurable': + #load generic chart of account + fp = tools.file_open(opj('account', 'configurable_account_chart.xml')) + tools.convert_xml_import(cr, 'account', fp, {}, 'init', True, None) + fp.close() + else: + mod_ids = ir_module.search(cr, uid, [('name','=',res.get('charts'))]) + if mod_ids and ir_module.browse(cr, uid, mod_ids[0], context).state == 'uninstalled': + ir_module.button_immediate_install(cr, uid, mod_ids, context) + + def configure_fiscalyear(self, cr, uid, ids, context=None): + if context is None: + context = {} + fy_obj = self.pool.get('account.fiscalyear') + for res in self.read(cr, uid, ids, context=context): + if 'date_start' in res and 'date_stop' in res: + f_ids = fy_obj.search(cr, uid, [('date_start', '<=', res['date_start']), ('date_stop', '>=', res['date_stop']), ('company_id', '=', res['company_id'][0])], context=context) + if not f_ids: + name = code = res['date_start'][:4] + if int(name) != int(res['date_stop'][:4]): + name = res['date_start'][:4] +'-'+ res['date_stop'][:4] + code = res['date_start'][2:4] +'-'+ res['date_stop'][2:4] + vals = { + 'name': name, + 'code': code, + 'date_start': res['date_start'], + 'date_stop': res['date_stop'], + 'company_id': res['company_id'][0] + } + fiscal_id = fy_obj.create(cr, uid, vals, context=context) + if res['period'] == 'month': + fy_obj.create_period(cr, uid, [fiscal_id]) + elif res['period'] == '3months': + fy_obj.create_period3(cr, uid, [fiscal_id]) + +account_configuration() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:>>>>>>> MERGE-SOURCE === modified file 'account/res_config_view.xml' --- account/res_config_view.xml 2012-03-09 12:50:12 +0000 +++ account/res_config_view.xml 2012-03-12 11:48:45 +0000 @@ -1,3 +1,4 @@ +<<<<<<< TREE <?xml version="1.0" encoding="utf-8"?> <openerp> <data> @@ -113,4 +114,120 @@ <menuitem id="menu_account_config" name="Accounting" parent="base.menu_config" sequence="2" action="action_account_config"/> </data> -</openerp> \ No newline at end of file +</openerp>======= +<?xml version="1.0" encoding="utf-8"?> +<openerp> + <data> + + <record id="view_account_config" model="ir.ui.view"> + <field name="name">Accounting Application</field> + <field name="model">account.installer</field> + <field name="type">form</field> + <field name="arch" type="xml"> + <form string="Accounting Applications"> + <field name="chart_template_id" invisible="1"/> + <group col="4" colspan="4" string="Warning" attrs="{'invisible': [('chart_template_id','!=',False)]}"> + <label string="You have no chart of accounts or taxes defined for this company. Select a chart of account to proceed." colspan="4"/> + <field name="charts"/> + <button name="action_next" string="Install Chart of Account" icon="gtk-execute" type="object"/> + </group> + <field name="fiscalyear_id" invisible="1"/> + <group col="4" colspan="4" string="Warning" attrs="{'invisible': [('fiscalyear_id','!=',False)]}"> + <field name="has_default_company" invisible="1" /> + <field name="date_start" on_change="on_change_start_date(date_start)"/> + <field name="date_stop"/> + <field name="period" colspan="4"/> + <newline/> + <label string="You have no fiscal year/period open for this date."/> + <button name="configure_fiscalyear" string="Configure Fiscalyear" icon="gtk-execute" type="object"/> + </group> + <field name="company_id" widget="selection" attrs="{'invisible': [('has_default_company', '=', True)]}"/> + <separator string="Accounting Configuration" colspan="4"/> + <group col="4" colspan="4"> + <group col="2" colspan="2"> + <field name="default_taxes_id"/> + <field name="module_account_accountant"/> + <field name="module_account_asset"/> + <field name="group_dates_periods"/> + </group> + <group col="2" colspan="2"> + <field name="default_supplier_taxes_id"/> + <field name="currency_id" widget="selection"/> + <field name="module_account_budget"/> + </group> + </group> + <group col="2" colspan="2"> + <separator string="Customer Invoices" colspan="2"/> + <group col="4" colspan="2"> + <field name="sale_journal_id" invisible="1"/> + <field name="customer_invoice_sequence_prefix"/> + <field name="customer_invoice_sequence_next" nolabel="1"/> + </group> + <group col="4" colspan="2"> + <field name="sale_refund_journal_id" invisible="1"/> + <field name="customer_refund_sequence_prefix"/> + <field name="customer_refund_sequence_next" nolabel="1"/> + </group> + <field name="module_account_invoice_layout"/> + <newline/> + <field name="module_account_voucher"/> + <newline/> + <field name="module_account_followup"/> + <newline/> + <field name="group_proforma_invoices"/> + </group> + <group col="2" colspan="2"> + <separator string="Supplier Invoices" colspan="2"/> + <group col="4" colspan="2"> + <field name="purchase_journal_id" invisible="1"/> + <field name="supplier_invoice_sequence_prefix"/> + <field name="supplier_invoice_sequence_next" nolabel="1" colspan="1"/> + </group> + <newline/> + <group col="4" colspan="2"> + <field name="purchase_refund_journal_id" invisible="1"/> + <field name="supplier_refund_sequence_prefix"/> + <field name="supplier_refund_sequence_next" nolabel="1"/> + </group> + <field name="module_account_payment"/> + </group> + <group col="2" colspan="2"> + <separator string="Electronic Payments" colspan="2"/> + <field name="default_paypal_account"/> + </group> + <group col="2" colspan="2"> + <separator string="Bank & Cash" colspan="2"/> + <field name="company_footer" nolabel="1" colspan="2"/> + <newline/> + <label string="Setup your bank accounts: "/> + <button name="%(action_bank_tree)d" string="Setup Your Bank Accounts" icon="gtk-execute" type="action"/> + <newline/> + <field name="module_account_check_writing"/> + </group> + <group col="2" colspan="2"> + <separator string="Analytic Accounting" colspan="2"/> + <field name="group_analytic_account_for_sales"/> + <newline/> + <field name="group_analytic_account_for_purchase"/> + <newline/> + <field name="module_account_analytic_plans"/> + <newline/> + <field name="module_account_analytic_default"/> + </group> + </form> + </field> + </record> + + <record id="action_account_config" model="ir.actions.act_window"> + <field name="name">Configure Accounting Application</field> + <field name="type">ir.actions.act_window</field> + <field name="res_model">account.installer</field> + <field name="view_id" ref="view_account_config"/> + <field name="view_type">form</field> + <field name="view_mode">form</field> + </record> + + <menuitem id="menu_account_config" name="Accounting" parent="base.menu_config" sequence="2" action="action_account_config"/> + + </data> +</openerp>>>>>>>> MERGE-SOURCE
_______________________________________________ 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
