diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py index e6f356e0a44..82763723a81 100644 --- a/addons/account/__openerp__.py +++ b/addons/account/__openerp__.py @@ -107,6 +107,7 @@ module named account_voucher. 'partner_view.xml', 'data/account_data.xml', 'data/data_account_type.xml', + 'data/configurable_account_chart.xml', 'account_invoice_workflow.xml', 'project/project_view.xml', 'project/project_report.xml', diff --git a/addons/account/account.py b/addons/account/account.py index f32c6b7b853..629f01f9f01 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -2911,7 +2911,7 @@ class account_fiscal_position_template(osv.osv): obj_fiscal_position = self.pool.get('account.fiscal.position') fp_ids = self.search(cr, uid, [('chart_template_id', '=', chart_temp_id)]) for position in self.browse(cr, uid, fp_ids, context=context): - new_fp = obj_fiscal_position.create(cr, uid, {'company_id': company_id, 'name': position.name}) + new_fp = obj_fiscal_position.create(cr, uid, {'company_id': company_id, 'name': position.name, 'note': position.note}) for tax in position.tax_ids: obj_tax_fp.create(cr, uid, { 'tax_src_id': tax_template_ref[tax.tax_src_id.id], diff --git a/addons/account/account_analytic_line.py b/addons/account/account_analytic_line.py index da0bc96bda9..280b813380f 100644 --- a/addons/account/account_analytic_line.py +++ b/addons/account/account_analytic_line.py @@ -27,7 +27,7 @@ class account_analytic_line(osv.osv): _inherit = 'account.analytic.line' _description = 'Analytic Line' _columns = { - 'product_uom_id': fields.many2one('product.uom', 'UoM'), + 'product_uom_id': fields.many2one('product.uom', 'Unit of Measure'), 'product_id': fields.many2one('product.product', 'Product'), 'general_account_id': fields.many2one('account.account', 'General Account', required=True, ondelete='restrict'), 'move_id': fields.many2one('account.move.line', 'Move Line', ondelete='cascade', select=True), diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py index 17120ee265e..573b8f17524 100644 --- a/addons/account/account_move_line.py +++ b/addons/account/account_move_line.py @@ -474,7 +474,7 @@ class account_move_line(osv.osv): _columns = { 'name': fields.char('Name', size=64, required=True), 'quantity': fields.float('Quantity', digits=(16,2), help="The optional quantity expressed by this line, eg: number of product sold. The quantity is not a legal requirement but is very useful for some reports."), - 'product_uom_id': fields.many2one('product.uom', 'UoM'), + 'product_uom_id': fields.many2one('product.uom', 'Unit of Measure'), 'product_id': fields.many2one('product.product', 'Product'), 'debit': fields.float('Debit', digits_compute=dp.get_precision('Account')), 'credit': fields.float('Credit', digits_compute=dp.get_precision('Account')), diff --git a/addons/account/configurable_account_chart.xml b/addons/account/data/configurable_account_chart.xml similarity index 100% rename from addons/account/configurable_account_chart.xml rename to addons/account/data/configurable_account_chart.xml diff --git a/addons/account/i18n/hu.po b/addons/account/i18n/hu.po index 81a1875b648..ed742309114 100644 --- a/addons/account/i18n/hu.po +++ b/addons/account/i18n/hu.po @@ -7,21 +7,20 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-02-08 00:35+0000\n" -"PO-Revision-Date: 2012-05-10 18:07+0000\n" -"Last-Translator: NOVOTRADE RENDSZERHÁZ ( novotrade.hu ) " -"\n" +"PO-Revision-Date: 2012-05-17 13:09+0000\n" +"Last-Translator: Peter \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-11 04:49+0000\n" -"X-Generator: Launchpad (build 15225)\n" +"X-Launchpad-Export-Date: 2012-05-18 04:40+0000\n" +"X-Generator: Launchpad (build 15259)\n" #. module: account #: view:account.invoice.report:0 #: view:analytic.entries.report:0 msgid "last month" -msgstr "" +msgstr "előző hónap" #. module: account #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 @@ -3962,7 +3961,7 @@ msgstr "Gyűjtőkód karton" #. module: account #: model:account.financial.report,name:account.account_financial_report_assets0 msgid "Assets" -msgstr "" +msgstr "Eszközök" #. module: account #: view:account.invoice.confirm:0 @@ -6825,7 +6824,7 @@ msgstr "" #: report:account.third_party_ledger:0 #: report:account.third_party_ledger_other:0 msgid "JRNL" -msgstr "" +msgstr "Napló" #. module: account #: view:account.partner.balance:0 diff --git a/addons/account/i18n/ja.po b/addons/account/i18n/ja.po index f6f1429b445..9f2bc798696 100644 --- a/addons/account/i18n/ja.po +++ b/addons/account/i18n/ja.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-02-08 00:35+0000\n" -"PO-Revision-Date: 2012-05-15 01:20+0000\n" +"PO-Revision-Date: 2012-05-15 06:17+0000\n" "Last-Translator: Akira Hiyama \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-15 04:51+0000\n" -"X-Generator: Launchpad (build 15238)\n" +"X-Launchpad-Export-Date: 2012-05-16 04:50+0000\n" +"X-Generator: Launchpad (build 15247)\n" #. module: account #: view:account.invoice.report:0 @@ -457,7 +457,7 @@ msgid "" "it comes to 'Printed' state. When all transactions are done, it comes in " "'Done' state." msgstr "" -"仕訳帳期間が作成される場合、その状態はドラフトです。レポートが印刷された場合は、印刷済状態になります。全ての取引が終了すると終了状態となります。" +"仕訳帳期間が作成される場合、その状態はドラフトです。レポートが印刷された場合は、印刷済状態になります。全ての取引が完了すると完了状態となります。" #. module: account #: model:ir.actions.act_window,help:account.action_account_tax_chart @@ -1527,7 +1527,7 @@ msgstr "仕入先返金" #: selection:account.fiscalyear,state:0 #: selection:account.period,state:0 msgid "Closed" -msgstr "閉鎖" +msgstr "閉じた" #. module: account #: model:ir.ui.menu,name:account.menu_finance_recurrent_entries @@ -3387,7 +3387,7 @@ msgstr "ドラフト請求書" msgid "" "Selected Invoice(s) cannot be cancelled as they are already in 'Cancelled' " "or 'Done' state!" -msgstr "選択した請求書は既にキャンセルあるいは終了状態であるためキャンセルできません。" +msgstr "選択した請求書は既にキャンセルあるいは完了状態であるためキャンセルできません。" #. module: account #: view:account.invoice.line:0 @@ -4218,7 +4218,7 @@ msgid "" "* When all the payments are done it will be in 'Valid' state." msgstr "" "新しい移動行が作成された時はドラフト状態になります。\n" -"・ 全ての支払いが終了した時に、有効状態になります。" +"・ 全ての支払いが完了した時に、有効状態になります。" #. module: account #: field:account.journal,view_id:0 @@ -5961,7 +5961,7 @@ msgstr "（今期を使う場合は空のままとして下さい）" msgid "" "As soon as the reconciliation is done, the invoice's state turns to “done” " "(i.e. paid) in the system." -msgstr "消し込みを終了するや否や、請求書の状態はシステム内で終了（すなわち支払済）となります。" +msgstr "消し込みを完了するや否や、請求書の状態はシステム内で完了（すなわち支払済）となります。" #. module: account #: view:account.chart.template:0 @@ -6931,7 +6931,7 @@ msgstr "仕訳帳カラム" #: selection:account.subscription,state:0 #: selection:report.invoice.created,state:0 msgid "Done" -msgstr "終了" +msgstr "完了" #. module: account #: model:ir.actions.act_window,help:account.action_bank_tree @@ -7957,7 +7957,7 @@ msgstr "このアカウントが仕訳帳項目の消し込みを許す場合は msgid "" "When monthly periods are created. The state is 'Draft'. At the end of " "monthly period it is in 'Done' state." -msgstr "月次の期間が作成される時はその状態はドラフトです。月次の期間の終わりには状態は終了になります。" +msgstr "月次の期間が作成される時はその状態はドラフトです。月次の期間の終わりには状態は完了になります。" #. module: account #: report:account.analytic.account.inverted.balance:0 @@ -10045,7 +10045,7 @@ msgstr "償却の移動" #. module: account #: model:process.node,note:account.process_node_paidinvoice0 msgid "Invoice's state is Done" -msgstr "請求書は終了状態です。" +msgstr "請求書は完了状態です。" #. module: account #: model:ir.model,name:account.model_report_account_sales @@ -10542,12 +10542,12 @@ msgstr "原価元帳（数量のみ）" #. module: account #: model:process.node,note:account.process_node_supplierpaidinvoice0 msgid "Invoice's state is Done." -msgstr "請求書は終了状態です。" +msgstr "請求書は完了状態です。" #. module: account #: model:process.transition,note:account.process_transition_reconcilepaid0 msgid "As soon as the reconciliation is done, the invoice can be paid." -msgstr "できるだけ早く消し込みを終えるために請求書の支払が可能です。" +msgstr "できるだけ早く消し込みを完了するために請求書の支払が可能です。" #. module: account #: view:account.account.template:0 diff --git a/addons/account/installer.py b/addons/account/installer.py index f0111d6645a..dc072787f96 100644 --- a/addons/account/installer.py +++ b/addons/account/installer.py @@ -123,11 +123,6 @@ class account_installer(osv.osv_memory): context = {} fy_obj = self.pool.get('account.fiscalyear') for res in self.read(cr, uid, ids, context=context): - if 'charts' in res and res['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() 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: diff --git a/addons/account/report/account_analytic_entries_report.py b/addons/account/report/account_analytic_entries_report.py index 1b7e7f9a84b..02c1c508237 100644 --- a/addons/account/report/account_analytic_entries_report.py +++ b/addons/account/report/account_analytic_entries_report.py @@ -43,7 +43,7 @@ class analytic_entries_report(osv.osv): 'journal_id': fields.many2one('account.analytic.journal', 'Journal', required=True), 'move_id': fields.many2one('account.move.line', 'Move', required=True), 'product_id': fields.many2one('product.product', 'Product', required=True), - 'product_uom_id': fields.many2one('product.uom', 'Product UOM', required=True), + 'product_uom_id': fields.many2one('product.uom', 'Product Unit of Measure', required=True), 'amount': fields.float('Amount', readonly=True), 'unit_amount': fields.float('Quantity', readonly=True), 'nbr': fields.integer('#Entries', readonly=True), diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml index 9f580e6fc4b..408e76fdcb9 100644 --- a/addons/account/report/account_analytic_entries_report_view.xml +++ b/addons/account/report/account_analytic_entries_report_view.xml @@ -76,7 +76,7 @@ - + diff --git a/addons/account/report/account_entries_report.py b/addons/account/report/account_entries_report.py index 29e40c7d5ad..56085b13453 100644 --- a/addons/account/report/account_entries_report.py +++ b/addons/account/report/account_entries_report.py @@ -50,7 +50,7 @@ class account_entries_report(osv.osv): 'journal_id': fields.many2one('account.journal', 'Journal', readonly=True), 'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal Year', readonly=True), 'product_id': fields.many2one('product.product', 'Product', readonly=True), - 'product_uom_id': fields.many2one('product.uom', 'Product UOM', readonly=True), + 'product_uom_id': fields.many2one('product.uom', 'Product Unit of Measure', readonly=True), 'move_state': fields.selection([('draft','Unposted'), ('posted','Posted')], 'State', readonly=True), 'move_line_state': fields.selection([('draft','Unbalanced'), ('valid','Valid')], 'State of Move Line', readonly=True), 'reconcile_id': fields.many2one('account.move.reconcile', readonly=True), diff --git a/addons/account/report/account_invoice_report.py b/addons/account/report/account_invoice_report.py index 2fbe641dba3..f50ee46d63e 100644 --- a/addons/account/report/account_invoice_report.py +++ b/addons/account/report/account_invoice_report.py @@ -36,7 +36,7 @@ class account_invoice_report(osv.osv): ('10','October'), ('11','November'), ('12','December')], 'Month', readonly=True), 'product_id': fields.many2one('product.product', 'Product', readonly=True), 'product_qty':fields.float('Qty', readonly=True), - 'uom_name': fields.char('Reference UoM', size=128, readonly=True), + 'uom_name': fields.char('Reference Unit of Measure', size=128, readonly=True), 'payment_term': fields.many2one('account.payment.term', 'Payment Term', readonly=True), 'period_id': fields.many2one('account.period', 'Force Period', domain=[('state','<>','done')], readonly=True), 'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position', readonly=True), diff --git a/addons/account/res_config.py b/addons/account/res_config.py index 930655eb125..583b769d315 100644 --- a/addons/account/res_config.py +++ b/addons/account/res_config.py @@ -36,11 +36,11 @@ class account_config_settings(osv.osv_memory): _columns = { 'company_id': fields.many2one('res.company', 'Company', required=True), 'has_default_company': fields.boolean('Has default company', readonly=True), - 'expects_chart_of_accounts': fields.related('company_id', 'expects_chart_of_accounts', type='boolean', - string='Chart of Accounts for this Company'), + string='Chart of Accounts for this Company', + help="""Check this box if this company is a legal entity."""), 'currency_id': fields.related('company_id', 'currency_id', type='many2one', relation='res.currency', required=True, - string='Main currency', help="Main currency of the company."), + string='Default Company Currency', help="Main currency of the company."), '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.)"), 'company_footer': fields.related('company_id', 'rml_footer2', type='char', size=250, readonly=True, @@ -65,31 +65,31 @@ class account_config_settings(osv.osv_memory): 'sale_sequence_prefix': fields.related('sale_journal_id', 'sequence_id', 'prefix', type='char', string='Invoice Sequence'), 'sale_sequence_next': fields.related('sale_journal_id', 'sequence_id', 'number_next', type='integer', string='Next Invoice Number'), 'sale_refund_journal_id': fields.many2one('account.journal', 'Sale Refund Journal'), - 'sale_refund_sequence_prefix': fields.related('sale_refund_journal_id', 'sequence_id', 'prefix', type='char', string='Refund Sequence'), - 'sale_refund_sequence_next': fields.related('sale_refund_journal_id', 'sequence_id', 'number_next', type='integer', string='Next Refund Number'), + 'sale_refund_sequence_prefix': fields.related('sale_refund_journal_id', 'sequence_id', 'prefix', type='char', string='Credit Note Sequence'), + 'sale_refund_sequence_next': fields.related('sale_refund_journal_id', 'sequence_id', 'number_next', type='integer', string='Next Credit Note Number'), 'purchase_journal_id': fields.many2one('account.journal', 'Purchase Journal'), 'purchase_sequence_prefix': fields.related('purchase_journal_id', 'sequence_id', 'prefix', type='char', string='Supplier Invoice Sequence'), 'purchase_sequence_next': fields.related('purchase_journal_id', 'sequence_id', 'number_next', type='integer', string='Next Supplier Invoice Number'), 'purchase_refund_journal_id': fields.many2one('account.journal', 'Purchase Refund Journal'), - 'purchase_refund_sequence_prefix': fields.related('purchase_refund_journal_id', 'sequence_id', 'prefix', type='char', string='Supplier Refund Sequence'), - 'purchase_refund_sequence_next': fields.related('purchase_refund_journal_id', 'sequence_id', 'number_next', type='integer', string='Next Supplier Refund Number'), + '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('Support Check Writings', + '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', - help="""This allows you to access all the accounting features, like the journal items and the chart of accounts. - This installs the module account_accountant."""), + 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', 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."""), - 'module_account_budget': fields.boolean('Budgets Management', + 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', 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('Supplier 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. @@ -97,17 +97,10 @@ class account_config_settings(osv.osv_memory): 'module_account_voucher': fields.boolean('Manage 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('Customer 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."""), - 'module_account_analytic_plans': fields.boolean('Support Multiple Analytic Plans', - help="""This allows to use several analytic plans, according to the general journal. - This installs the module account_analytic_plans."""), - 'module_account_analytic_default': fields.boolean('Rules for Analytic Assignation', - help="""Set default values for your analytic accounts. - Allows to automatically select analytic accounts based on criteria like product, partner, user, company, date. - This installs the module account_analytic_default."""), - 'module_account_invoice_layout': fields.boolean('Allow notes and subtotals', + 'module_account_invoice_layout': fields.boolean('Allow Notes and Subtotals', help="""This provides some features to improve the layout of invoices. It gives you the possibility to: * order all the lines of an invoice @@ -118,9 +111,10 @@ class account_config_settings(osv.osv_memory): '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'), 'default_purchase_tax': fields.many2one('account.tax', 'Default Purchase Tax'), + 'decimal_precision': fields.integer('Decimal Precision', + help="""Set the decimal precision for rounding results in accounting."""), } def _default_company(self, cr, uid, context=None): @@ -279,4 +273,13 @@ class account_config_settings(osv.osv_memory): elif config.period == '3months': fiscalyear.create_period3(cr, uid, [fiscalyear_id]) + def get_default_dp(self, cr, uid, fields, context=None): + dp = self.pool.get('ir.model.data').get_object(cr, uid, 'product','decimal_account') + return {'decimal_precision': dp.digits} + + def set_default_dp(self, cr, uid, ids, context=None): + config = self.browse(cr, uid, ids[0], context) + dp = self.pool.get('ir.model.data').get_object(cr, uid, 'product','decimal_account') + dp.write({'digits': config.decimal_precision}) + # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account/res_config_view.xml b/addons/account/res_config_view.xml index e0b1b2fbd66..1cf1e40f02b 100644 --- a/addons/account/res_config_view.xml +++ b/addons/account/res_config_view.xml @@ -22,16 +22,17 @@ + -