diff --git a/addons/account/account.py b/addons/account/account.py index 5de913c45a7..8ef5004df04 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -1215,7 +1215,8 @@ class account_move(osv.osv): # # TODO: Check if period is closed ! # - def create(self, cr, uid, vals, context={}): + def create(self, cr, uid, vals, context=None): + context = context or {} if 'line_id' in vals and context.get('copy'): for l in vals['line_id']: if not l[0]: @@ -1256,6 +1257,7 @@ class account_move(osv.osv): return result def copy(self, cr, uid, id, default={}, context={}): + context = context or {} default.update({ 'state':'draft', 'name':'/', @@ -1265,7 +1267,8 @@ class account_move(osv.osv): }) return super(account_move, self).copy(cr, uid, id, default, context) - def unlink(self, cr, uid, ids, context={}, check=True): + def unlink(self, cr, uid, ids, context=None, check=True): + context = context or {} toremove = [] obj_move_line = self.pool.get('account.move.line') for move in self.browse(cr, uid, ids, context): @@ -1605,7 +1608,7 @@ class account_tax_code(osv.osv): if isinstance(ids, (int, long)): ids = [ids] reads = self.read(cr, uid, ids, ['name','code'], context, load='_classic_write') - return [(x['id'], (x['code'] and x['code'] + ' - ' or '') + x['name']) \ + return [(x['id'], (x['code'] and (x['code'] + ' - ') or '') + x['name']) \ for x in reads] def _default_company(self, cr, uid, context={}): @@ -2544,9 +2547,17 @@ class wizard_multi_charts_accounts(osv.osv_memory): if ids: return ids[0] return False + + def _get_default_accounts(self, cr, uid, context=None): + accounts = [{'acc_name':'Current','account_type':'bank'}, + {'acc_name':'Deposit','account_type':'bank'}, + {'acc_name':'Cash','account_type':'cash'}] + return accounts + _defaults = { 'company_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, [uid], c)[0].company_id.id, 'chart_template_id': _get_chart, + 'bank_accounts_id': _get_default_accounts, 'code_digits': 6, 'seq_journal': True } diff --git a/addons/account/account_analytic_line.py b/addons/account/account_analytic_line.py index a982ca51182..f3c2b71122f 100644 --- a/addons/account/account_analytic_line.py +++ b/addons/account/account_analytic_line.py @@ -24,8 +24,6 @@ import time from osv import fields from osv import osv from tools.translate import _ -import tools -from tools import config class account_analytic_line(osv.osv): _inherit = 'account.analytic.line' @@ -82,12 +80,13 @@ class account_analytic_line(osv.osv): return {} product_obj = self.pool.get('product.product') analytic_journal_obj =self.pool.get('account.analytic.journal') + company_obj = self.pool.get('res.company') + product_price_type_obj = self.pool.get('product.price.type') j_id = analytic_journal_obj.browse(cr, uid, journal_id, context=context) prod = product_obj.browse(cr, uid, prod_id) if not company_id: company_id = j_id.company_id.id result = 0.0 - is_purchase = False if j_id.type <> 'sale': a = prod.product_tmpl_id.property_account_expense.id @@ -99,8 +98,6 @@ class account_analytic_line(osv.osv): 'for this product: "%s" (id:%d)') % \ (prod.name, prod.id,)) amount_unit = prod.price_get('standard_price', context)[prod.id] - is_purchase = True - else: a = prod.product_tmpl_id.property_account_income.id if not a: @@ -128,9 +125,8 @@ class account_analytic_line(osv.osv): if pricetype.field == 'list_price': flag = True amount_unit = prod.price_get(pricetype.field, context)[prod.id] - amount = amount_unit*unit_amount or 1.0 prec = self.pool.get('decimal.precision').precision_get(cr, uid, 'Account') - amount = amount_unit*unit_amount or 1.0 + amount = amount_unit*unit or 1.0 result = round(amount, prec) if not flag: result *= -1 diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py index 0b240663943..cf50a1ab62e 100644 --- a/addons/account/account_bank_statement.py +++ b/addons/account/account_bank_statement.py @@ -378,7 +378,7 @@ class account_bank_statement(osv.osv): self.create_move_from_st_line(cr, uid, st_line.id, company_currency_id, st_line_number, context) self.write(cr, uid, [st.id], {'name': st_number}, context=context) - self.log(cr, uid, st.id, 'Statement %s is confirmed and entries are created.' % st_number) + self.log(cr, uid, st.id, _('Statement %s is confirmed, journal items are created.') % (st_number,)) done.append(st.id) return self.write(cr, uid, ids, {'state':'confirm'}, context=context) @@ -501,4 +501,4 @@ class account_bank_statement_line(osv.osv): account_bank_statement_line() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml index 18484a7d1c8..28d2f5a06a6 100644 --- a/addons/account/account_invoice_view.xml +++ b/addons/account/account_invoice_view.xml @@ -430,7 +430,7 @@ [('type','=','out_invoice')] {'type':'out_invoice', 'journal_type': 'sale'} - Most of customer invoices are automatically generated in draft mode by OpenERP flows, following a purchase order for instance. Review, confirm or cancel, pay or refund your customers' invoices here. A manual invoice can be created here. + Customer Invoices allows you create and manage invoices issued to your customers. OpenERP generates draft of invoices automatically so that you only have to confirm them before sending them to your customers. @@ -458,7 +458,7 @@ [('type','=','in_invoice')] {'type':'in_invoice', 'journal_type': 'purchase'} - Proposal for supplier invoices are usually automatically generate by OpenERP, following a procurement order or a production order for instance. To consult and to check for, or to manually create a customer invoice, use this menu. You can review, confirm or cancel, pay or refund an invoice from the view from of the invoices. + Supplier Invoices allows you to enter and manage invoices issued by your suppliers. OpenERP generates draft of supplier invoices automatically so that you can control what you received from your supplier according to what you purchased or received. @@ -471,7 +471,7 @@ [('type','=','out_refund')] {'type':'out_refund', 'journal_type': 'sale_refund'} - A customer refund is a credit note to your customer that cancel invoice or a part of it. + Customer Refunds helps you manage the credit notes issued/to be issued for your customers. A refund invoice is a document that cancels an invoice or a part of it. You can easily generate refunds and reconcile them from the invoice form. @@ -510,22 +510,5 @@ res_model="account.invoice" src_model="account.journal"/> - - - - diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 49de367122b..8217522715e 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -635,6 +635,7 @@ [('journal_id.type', '=', 'bank')] {'journal_type':'bank'} + A bank statement is a summary of all financial transactions occurring over a given period of time on a deposit account, a credit card, or any other type of account. Start by encoding the starting and closing balance, then record all lines of your statement. When you are in the Payment column of the a line, you can press F1 to open the reconciliation form. @@ -956,7 +957,7 @@ [('parent_id','=',False)] tree - Chart of Taxes is a tree view reflecting the structure of the Tax Cases (or tax codes) and shows the current tax situation. The tax chart represents the amount of each area of the tax declaration for your country. It’s presented in a hierarchical structure, which can be modified to fit your needs. + The chart of taxes is used to generate your periodic tax statement. You will see here the taxes with codes related to your legal statement according to your country. diff --git a/addons/account/i18n/mn.po b/addons/account/i18n/mn.po index 7c955886d37..6c82bfecfd2 100644 --- a/addons/account/i18n/mn.po +++ b/addons/account/i18n/mn.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-10-15 03:35+0000\n" -"Last-Translator: sugi \n" +"PO-Revision-Date: 2010-10-16 07:37+0000\n" +"Last-Translator: OpenERP Administrators \n" "Language-Team: Mongolian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n" +"X-Launchpad-Export-Date: 2010-10-17 04:53+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account @@ -647,7 +647,7 @@ msgstr "Харилцагчийн төлбөрийн нөхцөл" #. module: account #: view:account.move.reconcile:0 msgid "Account Entry Reconcile" -msgstr "Дансны бичилт гүйцээлт" +msgstr "Дансны бичилт бууралт" #. module: account #: wizard_button:account.move.bank.reconcile,init,open:0 @@ -3119,7 +3119,7 @@ msgstr "Аналитик Журнал" #. module: account #: rml:account.general.ledger:0 msgid "Entry Label" -msgstr "Бичлэгийн нэр" +msgstr "Гүйлгээний нэр" #. module: account #: model:process.transition,note:account.process_transition_paymentreconcile0 @@ -3498,7 +3498,9 @@ msgstr "Өдрийн огноо" msgid "" "The amount expressed in an optional other currency if it is a multi-currency " "entry." -msgstr "Өөр валютаар илэрхийлсэн дүн байна" +msgstr "" +"Хэрэв энэ гүйлгээ гадаад валютаар хийгдсэн бол гүйлгээний дүнг гадаад " +"валютаар илэрхийлнэ." #. module: account #: field:account.tax,parent_id:0 @@ -3599,7 +3601,7 @@ msgstr "Шинэ нийлүүлэгчийн буцаалт" #. module: account #: view:account.model:0 msgid "Entry Model" -msgstr "Гүйлгээний модель" +msgstr "Гүйлгээний загвар" #. module: account #: wizard_field:account.general.ledger.report,checktype,amount_currency:0 @@ -3764,7 +3766,7 @@ msgstr "Биелэх огноо" #. module: account #: view:account.subscription:0 msgid "Entry Subscription" -msgstr "захиалгын бичилт" +msgstr "Гүйлгээний тэмдэглэл" #. module: account #: selection:account.print.journal.report,init,sort_selection:0 @@ -4126,6 +4128,8 @@ msgid "" "You can check this box to mark the entry line as a litigation with the " "associated partner" msgstr "" +"Журналын бичилт нь холбогдох харилцагчийн хувьд маргаантай гэж үзвэл энэ " +"нүдийг сонгох хэрэгтэй" #. module: account #: model:ir.actions.act_window,name:account.action_invoice_tree1 @@ -4478,7 +4482,7 @@ msgstr "Санхүүгийн жилийн дарааллууд" #. module: account #: view:account.model.line:0 msgid "Entry Model Line" -msgstr "Бүртгэл загвар шугам" +msgstr "Гүйлгээний загварын мөр" #. module: account #: view:account.tax.template:0 @@ -4542,7 +4546,7 @@ msgstr "Дансны бичилт" #. module: account #: model:ir.actions.act_window,name:account.act_account_partner_account_move_unreconciled msgid "Receivables & Payables" -msgstr "Авлагын данс болон төлбөр" +msgstr "Авлага & Өглөг" #. module: account #: rml:account.general.ledger:0 @@ -4625,7 +4629,7 @@ msgstr "Нийлүүлэгчийн санхүү бүртгэл" #. module: account #: view:account.analytic.account:0 msgid "Analytic Account Statistics" -msgstr "" +msgstr "Аналитик санхүүгийн статистик" #. module: account #: view:wizard.multi.charts.accounts:0 @@ -4657,7 +4661,7 @@ msgstr "Аналитик дансны мод" #. module: account #: wizard_field:account.aged.trial.balance,init,result_selection:0 msgid "Filter on Partners" -msgstr "" +msgstr "Харилцагч дээр шүүлт хийх" #. module: account #: field:account.tax,price_include:0 @@ -4837,7 +4841,7 @@ msgstr "А/к дугаар" #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree_month #: model:ir.ui.menu,name:account.report_account_analytic_journal_print_month msgid "Account cost and revenue by journal (This Month)" -msgstr "" +msgstr "Дансны өртөг, орлого журналаар" #. module: account #: selection:account.partner.balance.report,init,result_selection:0 @@ -5036,7 +5040,7 @@ msgstr "Татварын тайлбар" #. module: account #: help:account.invoice,move_id:0 msgid "Link to the automatically generated account moves." -msgstr "" +msgstr "Дансны автомат үүссэн шилжилтүүд рүү холбох" #. module: account #: wizard_field:account.automatic.reconcile,reconcile,reconciled:0 @@ -5058,7 +5062,7 @@ msgstr "/" #: model:process.node,note:account.process_node_invoiceinvoice0 #: model:process.node,note:account.process_node_supplierinvoiceinvoice0 msgid "Have a number and entries are generated" -msgstr "" +msgstr "Үүсгэгдсэн тоо болон бичлэгүүдийг агуулж байна" #. module: account #: rml:account.analytic.account.analytic.check:0 @@ -5094,7 +5098,7 @@ msgstr "Журналын бүтэц" #. module: account #: view:account.subscription.line:0 msgid "Subscription lines" -msgstr "" +msgstr "Бүртгэлийн мөрүүд" #. module: account #: field:account.chart.template,property_account_income:0 @@ -5276,9 +5280,7 @@ msgstr "Томьёолол" #. module: account #: help:account.move.line,currency_id:0 msgid "The optional other currency if it is a multi-currency entry." -msgstr "" -"Тухайн дансны валютаас өөр валютаар бичилт хийх үед хэрэглэгдэх валютын " -"төрөл." +msgstr "Гадаад валютын гүйлгээ бол валютыг сонгоно." #. module: account #: view:account.invoice:0 @@ -5368,7 +5370,7 @@ msgstr "PRO-FORMA" #. module: account #: field:account.move.reconcile,line_partial_ids:0 msgid "Partial Entry lines" -msgstr "" +msgstr "Хэсэгчилсэн журналын бичилт" #. module: account #: help:account.move.line,statement_id:0 @@ -5425,7 +5427,7 @@ msgstr "Төлөлтийн нөхцөл" #. module: account #: selection:account.aged.trial.balance,init,result_selection:0 msgid "Receivable and Payable" -msgstr "" +msgstr "Авлага болон өглөг" #. module: account #: rml:account.account.balance:0 @@ -5528,7 +5530,7 @@ msgstr "Ерөнхий журнал" #: rml:account.third_party_ledger:0 #: rml:account.third_party_ledger_other:0 msgid "Balance" -msgstr "Тэнцэл" +msgstr "Баланс" #. module: account #: rml:account.invoice:0 @@ -5899,7 +5901,7 @@ msgstr "Бичилт тулгах" #. module: account #: field:account.subscription.line,move_id:0 msgid "Entry" -msgstr "Бичилт" +msgstr "Ажил гүйлгээ" #. module: account #: model:process.node,note:account.process_node_paidinvoice0 @@ -6044,7 +6046,7 @@ msgstr "Хэрэглэгч уг дансны гүйлгээг банкны ху #. module: account #: wizard_button:account.subscription.generate,init,generate:0 msgid "Compute Entry Dates" -msgstr "" +msgstr "Гүйлгээний огноо тооцоолол" #. module: account #: view:board.board:0 @@ -6077,7 +6079,7 @@ msgstr "Үнийн нэхэмжлэл" #. module: account #: view:board.board:0 msgid "Aged receivables" -msgstr "Насжилтын авлагын данс" +msgstr "Авлагын насжилт" #. module: account #: model:ir.module.module,shortdesc:account.module_meta_information @@ -6326,7 +6328,7 @@ msgstr "Дансны төрлөөр" #. module: account #: model:ir.model,name:report_account.model_report_aged_receivable msgid "Aged Receivable Till Today" -msgstr "" +msgstr "Өнөөдрийг хүртэлх авлагын насжилт" #. module: account #: model:ir.model,name:report_account.model_report_account_receivable @@ -6368,7 +6370,7 @@ msgstr "Үүсгэх огноо" #: model:ir.actions.act_window,name:report_account.action_aged_receivable_graph #: view:report.aged.receivable:0 msgid "Aged Receivable" -msgstr "Насжилтын авлага" +msgstr "Авлагын насжилт" #. module: account #: view:report.invoice.created:0 diff --git a/addons/account/installer.py b/addons/account/installer.py index b85b2dc21e2..b689697d7a8 100644 --- a/addons/account/installer.py +++ b/addons/account/installer.py @@ -604,8 +604,7 @@ class account_installer(osv.osv_memory): new_paid_tax_code = self.pool.get('account.tax.code').create(cr, uid, vals_paid_tax_code) sales_tax = obj_tax.create(cr, uid, - {'name':'TAX%s%%'%(s_tax*100), - 'description':'TAX%s%%'%(s_tax*100), + {'name':'TAX %s%%'%(s_tax*100), 'amount':s_tax, 'base_code_id':new_tax_code, 'tax_code_id':new_paid_tax_code, @@ -640,8 +639,7 @@ class account_installer(osv.osv_memory): new_paid_tax_code = self.pool.get('account.tax.code').create(cr, uid, vals_paid_tax_code) purchase_tax = obj_tax.create(cr, uid, - {'name':'TAX%s%%'%(p_tax*100), - 'description':'TAX%s%%'%(p_tax*100), + {'name':'TAX %s%%'%(p_tax*100), 'amount':p_tax, 'base_code_id':new_tax_code, 'tax_code_id':new_paid_tax_code, diff --git a/addons/account/invoice.py b/addons/account/invoice.py index 25b2ffffa91..23978296367 100644 --- a/addons/account/invoice.py +++ b/addons/account/invoice.py @@ -351,7 +351,7 @@ class account_invoice(osv.osv): if view_type == 'tree': doc = etree.XML(res['arch']) nodes = doc.xpath("//field[@name='partner_id']") - partner_string = 'Customer' + partner_string = _('Customer') if context.get('type', 'out_invoice') in ('in_invoice', 'in_refund'): partner_string = _('Supplier') for node in nodes: @@ -363,7 +363,7 @@ class account_invoice(osv.osv): try: res = super(account_invoice, self).create(cr, uid, vals, context) for inv_id, name in self.name_get(cr, uid, [res], context=context): - message = _('Invoice ') + " '" + name + "' "+ _("is waiting for validation.") + message = _("Invoice '%s' is waiting for validation.") % name self.log(cr, uid, inv_id, message) return res except Exception, e: @@ -375,6 +375,9 @@ class account_invoice(osv.osv): def confirm_paid(self, cr, uid, ids, context=None): self.write(cr, uid, ids, {'state':'paid'}, context=context) + for inv_id, name in self.name_get(cr, uid, ids, context=context): + message = _("Invoice '%s' is paid.") % name + self.log(cr, uid, inv_id, message) return True def unlink(self, cr, uid, ids, context=None): @@ -674,7 +677,7 @@ class account_invoice(osv.osv): return (ref or '').replace('/','') def _get_analytic_lines(self, cr, uid, id): - inv = self.browse(cr, uid, [id])[0] + inv = self.browse(cr, uid, id) cur_obj = self.pool.get('res.currency') company_currency = inv.company_id.currency_id.id @@ -690,6 +693,8 @@ class account_invoice(osv.osv): ref = inv.reference else: ref = self._convert_ref(cr, uid, inv.number) + if not inv.journal_id.analytic_journal_id: + raise osv.except_osv(_('No Analytic Journal !'),_("You have to define an analytic journal on the '%s' journal!") % (inv.journal_id.name,)) il['analytic_lines'] = [(0,0, { 'name': il['name'], 'date': inv['date_invoice'], @@ -699,7 +704,7 @@ class account_invoice(osv.osv): 'product_id': il['product_id'], 'product_uom_id': il['uos_id'], 'general_account_id': il['account_id'], - 'journal_id': self._get_journal_analytic(cr, uid, inv.type), + 'journal_id': inv.journal_id.analytic_journal_id.id, 'ref': ref, })] return iml @@ -1218,12 +1223,13 @@ class account_invoice(osv.osv): inv_id, name = self.name_get(cr, uid, [invoice.id], context=context)[0] if (not round(total,self.pool.get('decimal.precision').precision_get(cr, uid, 'Account'))) or writeoff_acc_id: - self.log(cr, uid, inv_id, _('Invoice ') + " '" + name + "' "+ _("is totally paid.")) self.pool.get('account.move.line').reconcile(cr, uid, line_ids, 'manual', writeoff_acc_id, writeoff_period_id, writeoff_journal_id, context) else: code = invoice.currency_id.code - amt = str(pay_amount) + code + ' on ' + str(invoice.amount_total) + code + ' (' + str(total) + code + ' remaining)' - self.log(cr, uid, inv_id, _('Invoice ') + " '" + name + "' "+ _("is paid partially: ") + amt) + # TODO: use currency's formatting function + msg = _("Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)") % \ + (name, pay_amount, code, invoice.amount_total, code, total, code) + self.log(cr, uid, inv_id, msg) self.pool.get('account.move.line').reconcile_partial(cr, uid, line_ids, 'manual', context) # Update the stored value (fields.function), so we write to trigger recompute @@ -1289,14 +1295,6 @@ class account_invoice_line(osv.osv): 'price_unit': _price_unit_default, } - def product_id_change_unit_price_inv(self, cr, uid, tax_id, price_unit, qty, address_invoice_id, product, partner_id, context=None): - tax_obj = self.pool.get('account.tax') - if price_unit: - taxes = tax_obj.browse(cr, uid, tax_id) - for tax in tax_obj.compute_inv(cr, uid, taxes, price_unit, qty, address_invoice_id, product, partner_id): - price_unit = price_unit - tax['amount'] - return {'price_unit': price_unit,'invoice_line_tax_id': tax_id} - def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, address_invoice_id=False, currency_id=False, context=None): if context is None: context = {} @@ -1396,8 +1394,7 @@ class account_invoice_line(osv.osv): taxes = res.supplier_taxes_id and res.supplier_taxes_id or (a and self.pool.get('account.account').browse(cr, uid, a).tax_ids or False) tax_id = fpos_obj.map_tax(cr, uid, fpos, taxes) if type in ('in_invoice', 'in_refund'): - to_update = self.product_id_change_unit_price_inv(cr, uid, tax_id, price_unit or res.standard_price, qty, address_invoice_id, product, partner_id, context=context) - result.update(to_update) + result.update( {'price_unit': price_unit or res.standard_price,'invoice_line_tax_id': tax_id} ) else: result.update({'price_unit': res.list_price, 'invoice_line_tax_id': tax_id}) diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml index 6795ae6a0f8..9a482155b4f 100644 --- a/addons/account/project/project_view.xml +++ b/addons/account/project/project_view.xml @@ -129,7 +129,7 @@ tree [('parent_id','=',False)] - Analytic Charts of Accounts allows you to access to reports by analytic accounts (or cost accounts) . From this menu you can access to analytic balance, a report that relates the analytic accounts to the general accounts. It is useful for analyzing the profitability of projects, giving you the profitability of a project for the different operations that you used to carry out the project. + The normal chart of accounts has a structure defined by the legal requirement of the country. The analytic chart of account structure should reflect your own business needs in term of costs/revenues reporting. They are usually structured by contracts, projects, products or departements. Most of the OpenERP operations (invoices, timesheets, expenses, etc) generate analytic entries on the related account. diff --git a/addons/account/report/account_tax_report.py b/addons/account/report/account_tax_report.py index 02ade140d34..d968ee9029e 100644 --- a/addons/account/report/account_tax_report.py +++ b/addons/account/report/account_tax_report.py @@ -37,7 +37,7 @@ class tax_report(rml_parse.rml_parse): 'get_company': self._get_company, 'get_currency': self._get_currency, 'get_lines': self._get_lines, - 'get_years': self.get_years, + 'get_years': self.get_years, }) @@ -51,12 +51,12 @@ class tax_report(rml_parse.rml_parse): if form['periods']: periods_l = self.pool.get('account.period').read(self.cr, self.uid, form['periods'], ['name']) for period in periods_l: - if res['periods']=='': - res['periods'] = period['name'] - else: - res['periods'] += ", "+ period['name'] + if res['periods']=='': + res['periods'] = period['name'] + else: + res['periods'] += ", "+ period['name'] return res - + def _get_lines(self, based_on, period_list, company_id=False, parent=False, level=0, context={}): res = self._get_codes(based_on, company_id, parent, level, period_list, context=context) diff --git a/addons/account/security/ir.model.access.csv b/addons/account/security/ir.model.access.csv index 56e75a3c036..124593ff8f5 100644 --- a/addons/account/security/ir.model.access.csv +++ b/addons/account/security/ir.model.access.csv @@ -31,7 +31,7 @@ "access_account_chart_template","account.chart.template","model_account_chart_template","account.group_account_manager",1,1,1,1 "access_account_tax_template","account.tax.template","model_account_tax_template","account.group_account_manager",1,1,1,1 "access_account_bank_statement","account.bank.statement","model_account_bank_statement","account.group_account_user",1,0,0,0 -"access_account_bank_statement_line","account.bank.statement.line","model_account_bank_statement_line","account.group_account_user",1,0,0,0 +"access_account_bank_statement_line","account.bank.statement.line","model_account_bank_statement_line","account.group_account_user",1,1,1,1 "access_account_analytic_line","account.analytic.line","model_account_analytic_line","account.group_account_user",1,1,1,1 "access_account_analytic_line_manager","account.analytic.line manager","model_account_analytic_line","account.group_account_manager",1,0,0,0 "access_account_analytic_account","account.analytic.account","analytic.model_account_analytic_account","base.group_user",1,0,0,0 @@ -39,7 +39,7 @@ "access_account_invoice_uinvoice","account.invoice","model_account_invoice","account.group_account_invoice",1,1,1,1 "access_account_invoice_line_uinvoice","account.invoice.line","model_account_invoice_line","account.group_account_invoice",1,1,1,1 "access_account_invoice_tax_uinvoice","account.invoice.tax","model_account_invoice_tax","account.group_account_invoice",1,1,1,1 -"access_account_move_uinvoice","account.move","model_account_move","account.group_account_invoice",1,0,0,0 +"access_account_move_uinvoice","account.move","model_account_move","account.group_account_invoice",1,1,1,1 "access_account_move_line_uinvoice","account.move.line invoice","model_account_move_line","account.group_account_invoice",1,1,1,1 "access_account_move_reconcile_uinvoice","account.move.reconcile","model_account_move_reconcile","account.group_account_invoice",1,1,1,1 "access_account_journal_period_uinvoice","account.journal.period","model_account_journal_period","account.group_account_invoice",1,1,1,1 @@ -94,47 +94,12 @@ "access_account_move_line_manager","account.move.line manager","model_account_move_line","account.group_account_manager",1,0,0,0 "access_account_move_manager","account.move manager","model_account_move","account.group_account_manager",1,0,0,0 "access_account_invoice_manager","account.invoice manager","model_account_invoice","account.group_account_manager",1,0,0,0 -"access_account_bank_statement_manager","account.bank.statement manager","model_account_bank_statement","account.group_account_manager",1,0,0,0 +"access_account_bank_statement_manager","account.bank.statement manager","model_account_bank_statement","account.group_account_manager",1,1,1,1 "access_account_entries_report_manager","account.entries.report","model_account_entries_report","account.group_account_manager",1,1,1,1 "access_analytic_entries_report_manager","analytic.entries.report","model_analytic_entries_report","account.group_account_manager",1,0,0,0 -"access_account_cashbox_line","account.cashbox.line","model_account_cashbox_line","account.group_account_manager",1,0,0,0 -"access_account_cashbox_line","account.cashbox.line","model_account_cashbox_line","account.group_account_user",1,0,0,0 -"access_account_move_line_system","account.move.line system","model_account_move_line","base.group_system",1,0,0,0 -"access_account_invoice_system","account.invoice system","model_account_invoice","base.group_system",1,0,0,0 -"access_account_bank_statement_system","account.bank.statement system","model_account_bank_statement","base.group_system",1,0,0,0 -"access_account_move_system","account.move system","model_account_move","base.group_system",1,0,0,0 -"access_account_analytic_line_system","account.analytic.line system","model_account_analytic_line","base.group_system",1,0,0,0 -"access_account_tax_code_system","account.tax.code system","model_account_tax_code","base.group_system",1,1,1,1 -"access_account_journal_system","account.journal system","model_account_journal","base.group_system",1,1,1,1 -"access_account_period_system","account.period system","model_account_period","base.group_system",1,1,1,1 -"access_account_journal_view_system","account.journal.view system","model_account_journal_view","base.group_system",1,1,1,1 -"access_account_account_type_system","account.account.type system","model_account_account_type","base.group_system",1,1,1,1 -"access_account_analytic_journal_system","account.analytic.journal system","model_account_analytic_journal","base.group_system",1,1,1,1 -"access_account_fiscalyear_system","account.fiscalyear system","model_account_fiscalyear","base.group_system",1,1,1,1 -"access_account_tax_system","account.tax system","model_account_tax","base.group_system",1,1,1,1 -"access_account_model_system","account.model system","model_account_model","base.group_system",1,1,1,1 -"access_account_subscription_system","account.subscription system","model_account_subscription","base.group_system",1,1,1,1 -"access_account_journal_column_system","account.journal.column system","model_account_journal_column","base.group_system",1,1,1,1 -"access_account_invoice_report_system","account.invoice.report system","model_account_invoice_report","base.group_system",1,0,0,0 -"access_account_entries_report_system","account.entries.report system","model_account_entries_report","base.group_system",1,0,0,0 -"access_analytic_entries_report_system","analytic.entries.report system","model_analytic_entries_report","base.group_system",1,0,0,0 -"access_account_journal_period_system","account.journal.period system","model_account_journal_period","base.group_system",1,0,0,0 -"access_account_invoice_tax_system","account.invoice.tax system","model_account_invoice_tax","base.group_system",1,0,0,0 -"access_account_tax_code_template_system","account.tax.code.template system","model_account_tax_code_template","base.group_system",1,1,1,1 -"access_account_sequence_fiscal_year_system","account.sequence.fiscalyear system","model_account_sequence_fiscalyear","base.group_system",1,1,1,1 -"access_account_fiscal_position_system","account.fiscal.position system","model_account_fiscal_position","base.group_system",1,1,1,1 -"access_account_move_reconcile_system","account.move.reconcile system","model_account_move_reconcile","base.group_system",1,0,0,0 -"access_account_account_system","account.account system","model_account_account","base.group_system",1,1,1,1 -"access_account_analytic_system","account.analytic.account system","analytic.model_account_analytic_account","base.group_system",1,1,1,1 -"access_account_model_line_system","account.model.line system","model_account_model_line","base.group_system",1,1,1,1 -"access_account_subscription_line_system","account.subscription.line system","model_account_subscription_line","base.group_system",1,1,1,1 -"access_account_payment_term_system","account.payment.term system","model_account_payment_term","base.group_system",1,1,1,1 -"access_account_payment_term_line_system","account.payment.term.line system","model_account_payment_term_line","base.group_system",1,1,1,1 -"access_report_account_receivable_system","report.account.receivable system","model_report_account_receivable","base.group_system",1,1,1,1 -"access_account_fiscal_position_tax_system","account.fiscal.position.tax system","model_account_fiscal_position_tax","base.group_system",1,1,1,1 -"access_account_fiscal_position_account_template_system","account.fiscal.position.account.template system","model_account_fiscal_position_account_template","base.group_system",1,1,1,1 +"access_account_cashbox_line","account.cashbox.line","model_account_cashbox_line","account.group_account_manager",1,1,1,1 +"access_account_cashbox_line","account.cashbox.line","model_account_cashbox_line","account.group_account_user",1,1,1,1 "access_account_journal_view_invoice","account.journal.view invoice","model_account_journal_view","account.group_account_invoice",1,1,1,1 -"access_account_fiscal_position_account_system","account.fiscal.position.account system","model_account_fiscal_position_account","base.group_system",1,1,1,1 "access_account_journal_column_invoice","account.journal.column invoice","model_account_journal_column","account.group_account_invoice",1,1,1,1 "access_account_invoice_tax_manager","account.invoice.tax manager","model_account_invoice_tax","account.group_account_manager",1,0,0,0 "access_account_invoice_tax_accountant","account.invoice.tax accountant","model_account_invoice_tax","account.group_account_user",1,0,0,0 @@ -145,7 +110,6 @@ "access_account_invoice_line_manager","account.invoice.line manager","model_account_invoice_line","account.group_account_manager",1,0,0,0 "access_account_account_invoice","account.account invoice","model_account_account","account.group_account_invoice",1,1,1,1 "access_res_partner_address_invoice","res.partner.address invoice","base.model_res_partner_address","account.group_account_invoice",1,1,1,1 -"access_account_invoice_line_system","account.invoice.line system","model_account_invoice_line","base.group_system",1,0,0,0 "access_account_analytic_accountant","account.analytic.account accountant","analytic.model_account_analytic_account","account.group_account_user",1,1,1,1 "access_account_account_type_invoice","account.account.type invoice","model_account_account_type","account.group_account_invoice",1,1,1,1 "access_report_account_receivable_invoice","report.account.receivable.invoice","model_report_account_receivable","account.group_account_invoice",1,1,1,1 diff --git a/addons/account/test/account_report.yml b/addons/account/test/account_report.yml index 0aae9dbe3d0..d91e4771d6f 100644 --- a/addons/account/test/account_report.yml +++ b/addons/account/test/account_report.yml @@ -67,8 +67,8 @@ import netsvc, tools, os, time import datetime from mx.DateTime import * - import warnings - warnings.filterwarnings('ignore',".*struct integer overflow masking is deprecated*") + import warnings + warnings.filterwarnings('ignore',".*struct integer overflow masking is deprecated*") start = datetime.date.fromtimestamp(time.mktime(time.strptime(time.strftime('%Y-%m-%d'), "%Y-%m-%d"))) start = DateTime(int(start.year), int(start.month), int(start.day)) res = {} diff --git a/addons/account/wizard/account_chart_view.xml b/addons/account/wizard/account_chart_view.xml index f35a2c5480c..f2e278b06ce 100644 --- a/addons/account/wizard/account_chart_view.xml +++ b/addons/account/wizard/account_chart_view.xml @@ -31,6 +31,7 @@ tree,form new + Display your company chart of accounts per fiscal year and filter by period. Have a complete tree view of all journal items per account code by clicking on an account. {'journal_type':'sale','view_mode':False} new + This view is used by accountants in order to record entries massively in OpenERP. If you want to record a customer invoice, select the journal and the period in the search toolbar. Then, start by recording the entry line of the income account. OpenERP will propose to you automatically the Tax related to this account and the counter-part "Account receivable". @@ -31,6 +32,7 @@ {'journal_type':'purchase','view_mode':False} new + This view is used by accountants in order to record entries massively in OpenERP. If you want to record a supplier invoice, start by recording the line of the expense account, OpenERP will propose to you automatically the Tax related to this account and the counter-part "Account Payable". {'journal_type':'bank','view_mode':False} new + This view is used by accountants in order to record entries massively in OpenERP. Journal items are created by OpenERP if you use Bank Statements, Cash Registers, or Customer/Supplier payments. - + diff --git a/addons/account_analytic_analysis/security/ir.model.access.csv b/addons/account_analytic_analysis/security/ir.model.access.csv index 4db9c88f766..80b9f37db1f 100644 --- a/addons/account_analytic_analysis/security/ir.model.access.csv +++ b/addons/account_analytic_analysis/security/ir.model.access.csv @@ -1,5 +1,3 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink access_account_analytic_analysis_summary_user,account_analytic_analysis.summary.user,model_account_analytic_analysis_summary_user,account.group_account_manager,1,0,0,0 access_account_analytic_analysis_summary_month,account_analytic_analysis.summary.month,model_account_analytic_analysis_summary_month,account.group_account_manager,1,0,0,0 -access_account_analytic_account_user,account.analytic.account.user,model_account_analytic_account,base.group_user,1,0,0,0 -access_account_analytic_account_system,account.analytic.account.system,model_account_analytic_account,base.group_system,1,0,0,0 diff --git a/addons/account_analytic_plans/security/ir.model.access.csv b/addons/account_analytic_plans/security/ir.model.access.csv index 708094dc520..f7f141ac15a 100644 --- a/addons/account_analytic_plans/security/ir.model.access.csv +++ b/addons/account_analytic_plans/security/ir.model.access.csv @@ -6,5 +6,3 @@ "access_account_analytic_plan_line_invoice","account.analytic.plan.line.invoice","model_account_analytic_plan_line","account.group_account_user",1,1,1,1 "access_account_analytic_plan_instance_manager","account.analytic.plan.instance manager","model_account_analytic_plan_instance","account.group_account_manager",1,1,1,1 "access_account_analytic_plan_instance_line_manager","account.analytic.plan.instance.line manager","model_account_analytic_plan_instance_line","account.group_account_manager",1,1,1,1 -"access_account_analytic_plan_system","account.analytic.plan system","model_account_analytic_plan","base.group_system",1,1,1,1 -"access_account_analytic_plan_line_system","account.analytic.plan.line system","model_account_analytic_plan_line","base.group_system",1,1,1,1 diff --git a/addons/account_anglo_saxon/i18n/mn.po b/addons/account_anglo_saxon/i18n/mn.po new file mode 100644 index 00000000000..2fd75bcc245 --- /dev/null +++ b/addons/account_anglo_saxon/i18n/mn.po @@ -0,0 +1,66 @@ +# Mongolian translation for openobject-addons +# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2009-11-24 12:50+0000\n" +"PO-Revision-Date: 2010-10-16 09:58+0000\n" +"Last-Translator: OpenERP Administrators \n" +"Language-Team: Mongolian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2010-10-17 04:53+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#. module: account_anglo_saxon +#: view:product.category:0 +msgid " Accounting Property" +msgstr "" + +#. module: account_anglo_saxon +#: model:ir.module.module,description:account_anglo_saxon.module_meta_information +msgid "" +"This module will support the Anglo-Saxons accounting methodology by \n" +" changing the accounting logic with stock transactions. The difference " +"between the Anglo-Saxon accounting countries \n" +" and the Rhine or also called Continental accounting countries is the " +"moment of taking the Cost of Goods Sold versus Cost of Sales. \n" +" Anglo-Saxons accounting does take the cost when sales invoice is " +"created, Continental accounting will take the cost at he moment the goods " +"are shipped.\n" +" This module will add this functionality by using a interim account, to " +"store the value of shipped goods and will contra book this interim account \n" +" when the invoice is created to transfer this amount to the debtor or " +"creditor account." +msgstr "" + +#. module: account_anglo_saxon +#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information +msgid "Stock Account" +msgstr "Агуулахын данс" + +#. module: account_anglo_saxon +#: constraint:ir.ui.view:0 +msgid "Invalid XML for View Architecture!" +msgstr "Дэлгэцийн XML алдаатай!" + +#. module: account_anglo_saxon +#: field:product.category,property_account_creditor_price_difference_categ:0 +#: field:product.template,property_account_creditor_price_difference:0 +msgid "Price Difference Account" +msgstr "Үнийн өөрчлөлтийн данс" + +#. module: account_anglo_saxon +#: help:product.category,property_account_creditor_price_difference_categ:0 +#: help:product.template,property_account_creditor_price_difference:0 +msgid "" +"This account will be used to value price difference between purchase price " +"and cost price." +msgstr "" +"Энэ данс нь худалдан авалтын үнэ болон өртгийн үнийн хоорондох үнийн " +"өөрчлөлтийг дүгнэхийн тулд ашиглагдана." diff --git a/addons/account_budget/i18n/sr.po b/addons/account_budget/i18n/sr.po index 44d9554c859..c98287d9e32 100644 --- a/addons/account_budget/i18n/sr.po +++ b/addons/account_budget/i18n/sr.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-10-14 10:57+0000\n" -"Last-Translator: zmmaj \n" +"PO-Revision-Date: 2010-10-15 08:22+0000\n" +"Last-Translator: OpenERP Administrators \n" "Language-Team: Serbian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n" +"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_budget diff --git a/addons/account_budget/security/ir.model.access.csv b/addons/account_budget/security/ir.model.access.csv index 9e604ed5bee..b2eb33f3d04 100644 --- a/addons/account_budget/security/ir.model.access.csv +++ b/addons/account_budget/security/ir.model.access.csv @@ -4,7 +4,4 @@ "access_account_budget_post","account.budget.post","model_account_budget_post","account.group_account_manager",1,0,0,0 "access_account_budget_post_accountant","account.budget.post accountant","model_account_budget_post","account.group_account_user",1,1,1,1 "access_crossovered_budget_accountant","crossovered.budget accountant","model_crossovered_budget","account.group_account_user",1,1,1,1 -"access_account_budget_post_system","account.budget.post system","model_account_budget_post","base.group_system",1,0,0,0 -"access_crossovered_budget_system","crossovered.budget system","model_crossovered_budget","base.group_system",1,0,0,0 -"access_crossovered_budget_lines_system","crossovered.budget.lines system","model_crossovered_budget_lines","base.group_system",1,1,1,1 "access_crossovered_budget_lines_accountant","crossovered.budget.lines accountant","model_crossovered_budget_lines","account.group_account_user",1,1,1,1 diff --git a/addons/account_cancel/i18n/mn.po b/addons/account_cancel/i18n/mn.po new file mode 100644 index 00000000000..0750c13f415 --- /dev/null +++ b/addons/account_cancel/i18n/mn.po @@ -0,0 +1,37 @@ +# Mongolian translation for openobject-addons +# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2010-08-19 12:03+0000\n" +"PO-Revision-Date: 2010-10-16 08:58+0000\n" +"Last-Translator: OpenERP Administrators \n" +"Language-Team: Mongolian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2010-10-17 04:53+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#. module: account_cancel +#: constraint:ir.ui.view:0 +msgid "Invalid XML for View Architecture!" +msgstr "Дэлгэцийн XML алдаатай!" + +#. module: account_cancel +#: model:ir.module.module,description:account_cancel.module_meta_information +msgid "" +"\n" +" Module adds 'Allow cancelling entries' field on form view of account " +"journal. If set to true it allows user to cancel entries & invoices.\n" +" " +msgstr "" + +#. module: account_cancel +#: model:ir.module.module,shortdesc:account_cancel.module_meta_information +msgid "Account Cancel" +msgstr "Данс цуцлах" diff --git a/addons/account_coda/i18n/hr.po b/addons/account_coda/i18n/hr.po index a7212b53edf..0b56b4f2664 100644 --- a/addons/account_coda/i18n/hr.po +++ b/addons/account_coda/i18n/hr.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-11-24 13:11+0000\n" -"PO-Revision-Date: 2010-10-14 20:51+0000\n" -"Last-Translator: robert \n" +"PO-Revision-Date: 2010-10-15 09:33+0000\n" +"Last-Translator: OpenERP Administrators \n" "Language-Team: Croatian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n" +"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_coda diff --git a/addons/account_coda/i18n/sr.po b/addons/account_coda/i18n/sr.po index 2c8e5a84e9e..c5af7899172 100644 --- a/addons/account_coda/i18n/sr.po +++ b/addons/account_coda/i18n/sr.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-11-24 13:11+0000\n" -"PO-Revision-Date: 2010-10-14 11:15+0000\n" -"Last-Translator: zmmaj \n" +"PO-Revision-Date: 2010-10-15 08:49+0000\n" +"Last-Translator: OpenERP Administrators \n" "Language-Team: Serbian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n" +"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_coda diff --git a/addons/account_coda/security/ir.model.access.csv b/addons/account_coda/security/ir.model.access.csv index df4faec11ee..3ab8dccd4ad 100644 --- a/addons/account_coda/security/ir.model.access.csv +++ b/addons/account_coda/security/ir.model.access.csv @@ -3,4 +3,3 @@ "access_account_coda_manager","account.coda","model_account_coda","account.group_account_manager",1,1,1,1 "access_account_coda_import_manager","account.coda.import","model_account_coda_import","account.group_account_manager",1,1,1,1 "access_account_coda_import_user","account.coda","model_account_coda","account.group_account_user",1,0,0,0 -"access_account_coda_system","account.coda system","model_account_coda","base.group_system",1,0,0,0 diff --git a/addons/account_followup/account_followup_view.xml b/addons/account_followup/account_followup_view.xml index 85b21ff9e4e..e246e3659e1 100644 --- a/addons/account_followup/account_followup_view.xml +++ b/addons/account_followup/account_followup_view.xml @@ -86,7 +86,8 @@ form - + diff --git a/addons/account_followup/i18n/sr.po b/addons/account_followup/i18n/sr.po index 1501c7191d7..d882a65d26a 100644 --- a/addons/account_followup/i18n/sr.po +++ b/addons/account_followup/i18n/sr.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-10-14 11:52+0000\n" -"Last-Translator: zmmaj \n" +"PO-Revision-Date: 2010-10-15 09:03+0000\n" +"Last-Translator: OpenERP Administrators \n" "Language-Team: Serbian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n" +"X-Launchpad-Export-Date: 2010-10-16 04:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_followup diff --git a/addons/account_followup/report/account_followup_print.rml b/addons/account_followup/report/account_followup_print.rml index a87b6e5b46e..fb0f93b4a38 100644 --- a/addons/account_followup/report/account_followup_print.rml +++ b/addons/account_followup/report/account_followup_print.rml @@ -1,6 +1,6 @@ -