From 02ebd11c1f253b0fccdf27404575a11245a65ad6 Mon Sep 17 00:00:00 2001 From: Mantavya Gajjar Date: Sat, 21 Aug 2010 00:27:46 +0530 Subject: [PATCH] [REM]: remove account_voucher_paymet as this module merged with the account_voucher [FIX]: fix a problem of onchange_move_line_id on sales payment [FIX]: solve the problem of default_get on account_voucher_line bzr revid: mga@tinyerp.com-20100820185746-mh8ucho9i2bjywgg --- addons/account/account_installer.xml | 2 +- addons/account/account_move_line.py | 2 +- addons/account/installer.py | 6 +- addons/account_voucher/voucher.py | 71 ++++- .../voucher_payment_receipt_view.xml | 4 +- addons/account_voucher_payment/__init__.py | 24 -- addons/account_voucher_payment/__openerp__.py | 53 ---- .../account_voucher_payment.py | 280 ------------------ .../account_voucher_payment_view.xml | 72 ----- .../i18n/account_voucher_payment.pot | 82 ----- addons/account_voucher_payment/i18n/ca.po | 95 ------ addons/account_voucher_payment/i18n/ca_ES.po | 81 ----- addons/account_voucher_payment/i18n/el.po | 93 ------ addons/account_voucher_payment/i18n/es.po | 94 ------ addons/account_voucher_payment/i18n/es_ES.po | 81 ----- addons/account_voucher_payment/i18n/et.po | 86 ------ addons/account_voucher_payment/i18n/fr_BE.po | 77 ----- addons/account_voucher_payment/i18n/pt_BR.po | 89 ------ addons/account_voucher_payment/i18n/sl.po | 88 ------ addons/account_voucher_payment/i18n/zh_CN.po | 90 ------ .../security/ir.model.access.csv | 1 - .../test/account_voucher_payment.yml | 118 -------- .../wizard/__init__.py | 24 -- .../wizard/account_voucher_unreconcile.py | 63 ---- .../account_voucher_unreconcile_view.xml | 31 -- 25 files changed, 66 insertions(+), 1641 deletions(-) delete mode 100755 addons/account_voucher_payment/__init__.py delete mode 100755 addons/account_voucher_payment/__openerp__.py delete mode 100755 addons/account_voucher_payment/account_voucher_payment.py delete mode 100755 addons/account_voucher_payment/account_voucher_payment_view.xml delete mode 100644 addons/account_voucher_payment/i18n/account_voucher_payment.pot delete mode 100644 addons/account_voucher_payment/i18n/ca.po delete mode 100644 addons/account_voucher_payment/i18n/ca_ES.po delete mode 100644 addons/account_voucher_payment/i18n/el.po delete mode 100644 addons/account_voucher_payment/i18n/es.po delete mode 100644 addons/account_voucher_payment/i18n/es_ES.po delete mode 100644 addons/account_voucher_payment/i18n/et.po delete mode 100644 addons/account_voucher_payment/i18n/fr_BE.po delete mode 100644 addons/account_voucher_payment/i18n/pt_BR.po delete mode 100644 addons/account_voucher_payment/i18n/sl.po delete mode 100644 addons/account_voucher_payment/i18n/zh_CN.po delete mode 100644 addons/account_voucher_payment/security/ir.model.access.csv delete mode 100644 addons/account_voucher_payment/test/account_voucher_payment.yml delete mode 100644 addons/account_voucher_payment/wizard/__init__.py delete mode 100644 addons/account_voucher_payment/wizard/account_voucher_unreconcile.py delete mode 100644 addons/account_voucher_payment/wizard/account_voucher_unreconcile_view.xml diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml index 77130168561..b0a0e8e059e 100644 --- a/addons/account/account_installer.xml +++ b/addons/account/account_installer.xml @@ -85,7 +85,7 @@ - + diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py index 4e6c2cb5d8d..148227b8082 100644 --- a/addons/account/account_move_line.py +++ b/addons/account/account_move_line.py @@ -29,7 +29,7 @@ import tools class account_move_line(osv.osv): _name = "account.move.line" - _description = "Entry Lines" + _description = "Journal Items" def _query_get(self, cr, uid, obj='l', context={}): fiscalyear_obj = self.pool.get('account.fiscalyear') diff --git a/addons/account/installer.py b/addons/account/installer.py index d019ba89b2d..a9d7e12ff72 100644 --- a/addons/account/installer.py +++ b/addons/account/installer.py @@ -610,9 +610,9 @@ class account_installer_modules(osv.osv_memory): 'account_voucher':fields.boolean('Voucher Management', help="Account Voucher module includes all the basic requirements of " "Voucher Entries for Bank, Cash, Sales, Purchase, Expanse, Contra, etc... "), - 'account_voucher_payment':fields.boolean('Voucher and Reconcile Management', - help="Extension Account Voucher module includes allows to link payment / receipt " - "entries with voucher, also automatically reconcile during the payment and receipt entries."), +# 'account_voucher_payment':fields.boolean('Voucher and Reconcile Management', +# help="Extension Account Voucher module includes allows to link payment / receipt " +# "entries with voucher, also automatically reconcile during the payment and receipt entries."), } account_installer_modules() diff --git a/addons/account_voucher/voucher.py b/addons/account_voucher/voucher.py index c1db4d60de7..efc6ac1dca2 100644 --- a/addons/account_voucher/voucher.py +++ b/addons/account_voucher/voucher.py @@ -173,7 +173,7 @@ class account_voucher(osv.osv): ('sale','Sale'), ('purchase','Purchase'), ],'Type', select=True, readonly=True), - 'name':fields.char('Memo', size=256, required=False, readonly=True, states={'draft':[('readonly',False)]}), + 'name':fields.char('Memo', size=256, readonly=True, states={'draft':[('readonly',False)]}), 'date':fields.date('Date', readonly=True, states={'draft':[('readonly',False)]}, help="Effective date for accounting entries"), 'journal_id':fields.many2one('account.journal', 'Journal', required=True, readonly=True, states={'draft':[('readonly',False)]}), 'account_id':fields.many2one('account.account', 'Account', required=True, readonly=True, states={'draft':[('readonly',False)]}), @@ -229,7 +229,6 @@ class account_voucher(osv.osv): 'amount':False } tax_pool = self.pool.get('account.tax') - total = 0.0 for line in payment_ids: @@ -241,7 +240,7 @@ class account_voucher(osv.osv): tax_amount = total * tax_amount and tax_amount or tax.amount if tax.type == 'fixed': tax_amount = tax_amount and tax_amount or tax.amount - + res.update({ 'amount':total + tax_amount, 'tax_amount':tax_amount @@ -373,7 +372,7 @@ class account_voucher(osv.osv): search_type = 'credit' account_type = 'payable' - ids = move_line_pool.search(cr, uid, [('account_id.type','=', account_type), ('reconcile_id','=', False), ('partner_id','=',partner_id)], context=context) + ids = move_line_pool.search(cr, uid, [('account_id.type','=', account_type), ('reconcile_id','=', False), ('partner_id','=',partner_id), (search_type,'>',0)], context=context) total = 0.0 for line in move_line_pool.browse(cr, uid, ids): rs = move_line_pool.default_get(cr, uid, move_line_pool._columns.keys(), context=context) @@ -752,7 +751,7 @@ class account_voucher(osv.osv): res['fields']['journal_id']['selection'] = journal_list return res - + account_voucher() class account_voucher_line(osv.osv): @@ -765,10 +764,9 @@ class account_voucher_line(osv.osv): 'account_id':fields.many2one('account.account','Account', required=True, domain=[('type','<>','view')]), 'partner_id':fields.related('voucher_id', 'partner_id', type='many2one', relation='res.partner', string='Partner'), 'amount':fields.float('Amount'), - 'type':fields.selection([('dr','Debit'),('cr','Credit')], 'Cr/Dr'), +# 'type':fields.selection([('dr','Debit'),('cr','Credit')], 'Cr/Dr'), 'ref':fields.char('Reference', size=32), 'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic Account'), - 'is_tax':fields.boolean('Tax ?', required=False), 'stype':fields.selection([('service','Service'),('other','Other')], 'Product Type'), 'move_line_id': fields.many2one('account.move.line', 'Journal Item'), 'date_original': fields.related('move_line_id','date', type='date', relation='account.move.line', string='Date', readonly="1"), @@ -781,10 +779,59 @@ class account_voucher_line(osv.osv): 'move_id' : fields.many2one('account.move','Bill / Invoice'), } _defaults = { - 'type': lambda *a: 'cr', - 'name': lambda *a: 'Payment' + 'name': lambda *a: '/' } +# def create(self, cr, user, vals, context={}): +# """ +# Create a new record for a model account_voucher_line +# @param cr: A database cursor +# @param user: ID of the user currently logged in +# @param vals: provides data for new record +# @param context: context arguments, like lang, time zone +# +# @return: Returns an id of the new record +# """ +# if vals.get('account_id') +# res_id = super(account_voucher_line, self).create(cr, user, vals, context) +# return res_id + + def onchange_move_line_id(self, cr, user, ids, move_line_id, context={}): + """ + Returns a dict that contains new values and context + + @param cr: A database cursor + @param user: ID of the user currently logged in + @param move_line_id: latest value from user input for field move_line_id + @param args: other arguments + @param context: context arguments, like lang, time zone + + @return: Returns a dict which contains new values, and context + """ + res = {} + move_line_pool = self.pool.get('account.move.line') + if move_line_id: + move_line = move_line_pool.browse(cr, user, move_line_id) + + move_id = move_line.move_id.id + amount = move_line.credit and move_line.credit or move_line.debit + account_id = move_line.account_id.id + + res.update({ + 'move_id':move_id, + 'amount':amount, + 'account_id':account_id + }) + context.update({ + 'journal_id':move_line.journal_id.id, + 'partner_id':move_line.partner_id.id, + 'account_id':account_id + }) + return { + 'value':res, + 'context':context, + } + def default_get(self, cr, user, fields_list, context=None): """ Returns default values for fields @@ -816,9 +863,9 @@ class account_voucher_line(osv.osv): account_id = partner.property_account_receivable and partner.property_account_receivable.id or False elif ttype == 'payment' and partner: account_id = partner.property_account_receivable and partner.property_account_payable.id or False - else: - account_id = False - + + if not account_id: + raise osv.except_osv(_('Invalid Error !'), _('Please change partner and try again !')) values.update({ 'account_id':account_id }) diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml index ff0f2eb7023..b204896917c 100644 --- a/addons/account_voucher/voucher_payment_receipt_view.xml +++ b/addons/account_voucher/voucher_payment_receipt_view.xml @@ -94,9 +94,9 @@ - + - + diff --git a/addons/account_voucher_payment/__init__.py b/addons/account_voucher_payment/__init__.py deleted file mode 100755 index ad7558e11ee..00000000000 --- a/addons/account_voucher_payment/__init__.py +++ /dev/null @@ -1,24 +0,0 @@ -# -*- encoding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2004-2009 Tiny SPRL (). -# -# 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 . -# -############################################################################## -import account_voucher_payment -import wizard - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account_voucher_payment/__openerp__.py b/addons/account_voucher_payment/__openerp__.py deleted file mode 100755 index 04dc4f08945..00000000000 --- a/addons/account_voucher_payment/__openerp__.py +++ /dev/null @@ -1,53 +0,0 @@ -# -*- encoding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2004-2009 Tiny SPRL (). -# -# 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 . -# -############################################################################## -{ - "name" : "Invoice Payment/Receipt by Vouchers.", - "version" : "1.0", - "author" : 'OpenERP SA & Axelor', - "description": """Extension Account Voucher module includes allows to link payment / receipt - entries with voucher, also automatically reconcile during the payment and receipt entries - """, - "category" : "Generic Modules/Accounting", - "website" : "http://www.openerp.com", - "depends" : [ - "base", - "account", - "account_voucher", - ], - "init_xml" : [ - ], - - "demo_xml" : [], - "update_xml" : [ - "security/ir.model.access.csv", - "wizard/account_voucher_unreconcile_view.xml", - "account_voucher_payment_view.xml", - - ], - "test" : [ - "test/account_voucher_payment.yml", - ], - - "active": False, - "installable": True, -} - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account_voucher_payment/account_voucher_payment.py b/addons/account_voucher_payment/account_voucher_payment.py deleted file mode 100755 index 6e57e0efc12..00000000000 --- a/addons/account_voucher_payment/account_voucher_payment.py +++ /dev/null @@ -1,280 +0,0 @@ -# -*- encoding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2004-2009 Tiny SPRL (). -# -# 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 . -# -############################################################################## - -from osv import fields, osv -from tools.translate import _ - -#class account_move_line(osv.osv): -# _inherit = "account.move.line" -# _columns = { -# 'voucher_invoice': fields.many2one('account.invoice', 'Invoice', readonly=True), -# } -#account_move_line() - -class account_voucher(osv.osv): - _inherit = 'account.voucher' - - _columns = { - 'payment_ids':fields.one2many('account.voucher.line', 'voucher_id', 'Voucher Lines', readonly=True, states={'draft':[('readonly',False)]}), - } - - def action_move_line_create(self, cr, uid, ids, *args): - - journal_pool = self.pool.get('account.journal') - sequence_pool = self.pool.get('ir.sequence') - move_pool = self.pool.get('account.move') - move_line_pool = self.pool.get('account.move.line') - analytic_pool = self.pool.get('account.analytic.line') - currency_pool = self.pool.get('res.currency') - invoice_pool = self.pool.get('account.invoice') - invoice_pool = self.pool.get('account.invoice') - - for inv in self.browse(cr, uid, ids): - - if inv.move_id: - continue - - if not inv.payment_ids: - raise osv.except_osv(_('Error !'), _('Please define lines on voucher !')) - - journal = journal_pool.browse(cr, uid, inv.journal_id.id) - if journal.sequence_id: - name = sequence_pool.get_id(cr, uid, journal.sequence_id.id) - else: - raise osv.except_osv(_('Error !'), _('Please define sequence on journal !')) - - ref = False - if inv.type in ('purchase', 'receipt'): - ref = inv.reference - else: - ref = invoice_pool._convert_ref(cr, uid, name) - - company_currency = inv.company_id.currency_id.id - diff_currency_p = inv.currency_id.id <> company_currency - - move = { - 'name' : name, - 'journal_id': journal.id, - 'type' : inv.type, - 'narration' : inv.narration and inv.narration or inv.name, - 'date':inv.date, - 'ref':ref - } - - if inv.period_id: - move.update({ - 'period_id': inv.period_id.id - }) - - move_id = move_pool.create(cr, uid, move) - - #create the first line manually - move_line = { - 'name':inv.name, - 'debit':False, - 'credit':False, - 'account_id':inv.account_id.id or False, - 'move_id':move_id , - 'journal_id':inv.journal_id.id, - 'period_id':inv.period_id.id, - 'partner_id':inv.partner_id.id, - 'ref':ref, - 'date':inv.date - } - if diff_currency_p: - amount_currency = currency_pool.compute(cr, uid, inv.currency_id.id, company_currency, inv.amount) - inv.amount = amount_currency - move_line.update({ - 'amount_currency':amount_currency, - 'currency_id':inv.currency_id.id - }) - - if inv.type in ('receipt', 'purchase'): - move_line['debit'] = inv.amount - else: - move_line['credit'] = inv.amount - - line_ids = [] - line_ids += [move_line_pool.create(cr, uid, move_line)] - rec_ids = [] - - if inv.type == 'sale' and inv.pay_now == 'pay_now': - #create the payment line manually - move_line = { - 'name':inv.name, - 'debit':inv.pay_amount, - 'credit':False, - 'account_id':inv.pay_account_id.id or False, - 'move_id':move_id , - 'journal_id':inv.pay_journal_id.id, - 'period_id':inv.period_id.id, - 'partner_id':inv.partner_id.id, - 'ref':ref, - 'date':inv.date - } - line_ids += [move_line_pool.create(cr, uid, move_line)] - else: - for line in inv.payment_ids: - - amount=0.0 - - if inv.type in ('payment'): - ref = line.ref - - move_line = { - 'name':line.name, - 'debit':False, - 'credit':False, - 'account_id':line.account_id.id or False, - 'move_id':move_id , - 'journal_id':inv.journal_id.id, - 'period_id':inv.period_id.id, - 'partner_id':line.partner_id.id or False, - 'ref':ref, - 'date':inv.date, - 'analytic_account_id':False - } - - if diff_currency_p: - amount_currency = currency_pool.compute(cr, uid, inv.currency_id.id, company_currency, line.amount) - line.amount = amount_currency - move_line.update({ - 'amount_currency':amount_currency, - 'currency_id':inv.currency_id.id - }) - - if line.account_analytic_id: - move_line.update({ - 'analytic_account_id':line.account_analytic_id.id - }) - - if line.type == 'dr': - move_line.update({ - 'debit': line.amount or False - }) - - elif line.type == 'cr': - move_line.update({ - 'credit': line.amount or False - }) - - move_line_id = move_line_pool.create(cr, uid, move_line) - line_ids += [move_line_id] - - if line.move_id and inv.type in ('payment', 'receipt'): - rec_ids += [move_line_id] - for move_line in line.move_id.line_id: - if line.account_id.id == move_line.account_id.id: - rec_ids += [move_line.id] - - if rec_ids: - move_line_pool.reconcile_partial(cr, uid, rec_ids) - - rec = { - 'move_id': move_id - } - - message = _('Voucher ') + " '" + inv.name + "' "+ _("is confirm") - self.log(cr, uid, inv.id, message) - - self.write(cr, uid, [inv.id], rec) - move_pool.post(cr, uid, [move_id], context={}) - - return True - -account_voucher() - -class account_voucher_line(osv.osv): - _inherit = 'account.voucher.line' - - def default_get(self, cr, uid, fields, context={}): - data = super(account_voucher_line, self).default_get(cr, uid, fields, context) - self.voucher_context = context - return data - - _columns = { - 'move_id' : fields.many2one('account.move','Bill / Invoice'), - } - - def move_line_get_item(self, cr, uid, line, context={}): - res = super(account_voucher_line, self).move_line_get_item(cr, uid, line, context) - res['invoice'] = line.invoice_id or False - return res - - def onchange_invoice_id(self, cr, uid, ids, invoice_id, currency_id): - currency_pool = self.pool.get('res.currency') - invoice_pool = self.pool.get('account.move') - res = { - - } - if not invoice_id: - return { - 'value':res - } - else: - invoice = invoice_pool.browse(cr, uid, invoice_id) - residual = invoice.amount - - company_currency = self.pool.get('res.users').browse(cr, uid, uid).company_id.currency_id.id - currency_diff = company_currency != currency_id - - if currency_diff: - residual = currency_pool.compute(cr, uid, company_currency, currency_id, residual) - - if residual > 0: - res.update({ - 'amount': residual, - 'ref':invoice.name - }) - - return { - 'value':res - } - - def onchange_line_account(self, cr, uid, ids, account_id, type, type1): - if not account_id: - return {'value' : {'account_id' : False, 'type' : False ,'amount':False}} - obj = self.pool.get('account.account') - acc_id = False - - if type1 in ('receipt'): - acc_id = obj.browse(cr, uid, account_id) - balance = acc_id.credit - type = 'cr' - elif type1 in ('payment') : - acc_id = obj.browse(cr, uid, account_id) - balance = acc_id.debit - type = 'dr' - elif type1 in ('sale') : - acc_id = obj.browse(cr, uid, account_id) - balance = acc_id.credit - type = 'dr' - elif type1 in ('purchase') : - acc_id = obj.browse(cr, uid, account_id) - balance = acc_id.debit - type = 'cr' - - return { - 'value' : {'type' : type, 'amount':balance} - } -account_voucher_line() - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account_voucher_payment/account_voucher_payment_view.xml b/addons/account_voucher_payment/account_voucher_payment_view.xml deleted file mode 100755 index 894229f26e7..00000000000 --- a/addons/account_voucher_payment/account_voucher_payment_view.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - account.voucher.form.payment.unreconcile - account.voucher - form - - - - - - - - account.voucher.form.receipt.unreconcile - account.voucher - form - - - - - - - diff --git a/addons/account_voucher_payment/i18n/account_voucher_payment.pot b/addons/account_voucher_payment/i18n/account_voucher_payment.pot deleted file mode 100644 index 0a6e050af91..00000000000 --- a/addons/account_voucher_payment/i18n/account_voucher_payment.pot +++ /dev/null @@ -1,82 +0,0 @@ -# Translation of OpenERP Server. -# This file contains the translation of the following modules: -# * account_voucher_payment -# -msgid "" -msgstr "" -"Project-Id-Version: OpenERP Server 6.0dev\n" -"Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2009-05-13 20:11:36+0000\n" -"PO-Revision-Date: 2009-05-13 20:11:36+0000\n" -"Last-Translator: <>\n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: \n" - -#. module: account_voucher_payment -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "" - -#. module: account_voucher_payment -#: wizard_view:account.voucher.unreconcile,init:0 -msgid "Unreconciliation transactions" -msgstr "" - -#. module: account_voucher_payment -#: model:ir.module.module,description:account_voucher_payment.module_name_translation -msgid "This module includes :\n" -" * It reconcile the invoice (supplier, customer) while paying through \n" -" Accounting Vouchers\n" -" " -msgstr "" - -#. module: account_voucher_payment -#: wizard_view:account.voucher.unreconcile,init:0 -msgid "If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable" -msgstr "" - -#. module: account_voucher_payment -#: view:account.voucher:0 -#: field:account.voucher,voucher_line_ids:0 -msgid "Voucher Lines" -msgstr "" - -#. module: account_voucher_payment -#: model:ir.module.module,shortdesc:account_voucher_payment.module_name_translation -msgid "Invoice Payment/Receipt by Vouchers." -msgstr "" - -#. module: account_voucher_payment -#: model:ir.actions.wizard,name:account_voucher_payment.wizard_unreconcile_voucher -msgid "Unreconcile entries" -msgstr "" - -#. module: account_voucher_payment -#: field:account.move.line,voucher_invoice:0 -#: field:account.voucher.line,invoice_id:0 -msgid "Invoice" -msgstr "" - -#. module: account_voucher_payment -#: wizard_button:account.voucher.unreconcile,init,end:0 -msgid "Cancel" -msgstr "" - -#. module: account_voucher_payment -#: field:account.voucher,partner_id:0 -msgid "Partner" -msgstr "" - -#. module: account_voucher_payment -#: wizard_button:account.voucher.unreconcile,init,unrec:0 -msgid "Unreconcile" -msgstr "" - -#. module: account_voucher_payment -#: wizard_view:account.voucher.unreconcile,init:0 -msgid "Unreconciliation" -msgstr "" - diff --git a/addons/account_voucher_payment/i18n/ca.po b/addons/account_voucher_payment/i18n/ca.po deleted file mode 100644 index 225da8f9e95..00000000000 --- a/addons/account_voucher_payment/i18n/ca.po +++ /dev/null @@ -1,95 +0,0 @@ -# Catalan 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-05-13 20:11+0000\n" -"PO-Revision-Date: 2010-08-10 15:03+0000\n" -"Last-Translator: Jordi Esteve (www.zikzakmedia.com) " -"\n" -"Language-Team: Catalan \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-12 04:08+0000\n" -"X-Generator: Launchpad (build Unknown)\n" - -#. module: account_voucher_payment -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "XML invàlid per a la definició de la vista!" - -#. module: account_voucher_payment -#: wizard_view:account.voucher.unreconcile,init:0 -msgid "Unreconciliation transactions" -msgstr "Trenca conciliació de transaccions" - -#. module: account_voucher_payment -#: model:ir.module.module,description:account_voucher_payment.module_name_translation -msgid "" -"This module includes :\n" -" * It reconcile the invoice (supplier, customer) while paying through \n" -" Accounting Vouchers\n" -" " -msgstr "" -"Aquest mòdul inclou:\n" -" * Concilia factures de proveïdors i clients mentre són pagades " -"mitjançant \n" -" comprovants comptables\n" -" " - -#. module: account_voucher_payment -#: wizard_view:account.voucher.unreconcile,init:0 -msgid "" -"If you unreconciliate transactions, you must also verify all the actions " -"that are linked to those transactions because they will not be disable" -msgstr "" -"Si trenqueu conciliació de transaccions, també heu de comprovar totes les " -"accions que estan relacionades amb aquestes transaccions ja que no seran " -"eliminades" - -#. module: account_voucher_payment -#: view:account.voucher:0 -#: field:account.voucher,voucher_line_ids:0 -msgid "Voucher Lines" -msgstr "Línies de comprovant" - -#. module: account_voucher_payment -#: model:ir.module.module,shortdesc:account_voucher_payment.module_name_translation -msgid "Invoice Payment/Receipt by Vouchers." -msgstr "Pagaments i rebuts de factures per comprovant." - -#. module: account_voucher_payment -#: model:ir.actions.wizard,name:account_voucher_payment.wizard_unreconcile_voucher -msgid "Unreconcile entries" -msgstr "Trenca conciliació entrades" - -#. module: account_voucher_payment -#: field:account.move.line,voucher_invoice:0 -#: field:account.voucher.line,invoice_id:0 -msgid "Invoice" -msgstr "Factura" - -#. module: account_voucher_payment -#: wizard_button:account.voucher.unreconcile,init,end:0 -msgid "Cancel" -msgstr "Cancel·la" - -#. module: account_voucher_payment -#: field:account.voucher,partner_id:0 -msgid "Partner" -msgstr "" - -#. module: account_voucher_payment -#: wizard_button:account.voucher.unreconcile,init,unrec:0 -msgid "Unreconcile" -msgstr "Trenca conciliació" - -#. module: account_voucher_payment -#: wizard_view:account.voucher.unreconcile,init:0 -msgid "Unreconciliation" -msgstr "Trenca conciliació" diff --git a/addons/account_voucher_payment/i18n/ca_ES.po b/addons/account_voucher_payment/i18n/ca_ES.po deleted file mode 100644 index 6bafc34d136..00000000000 --- a/addons/account_voucher_payment/i18n/ca_ES.po +++ /dev/null @@ -1,81 +0,0 @@ -# Translation of OpenERP Server. -# This file contains the translation of the following modules: -# * account_voucher_payment -# -msgid "" -msgstr "" -"Project-Id-Version: OpenERP Server 6.0dev\n" -"Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2009-05-13 19:47:47+0000\n" -"PO-Revision-Date: 2009-05-16 18:57+0100\n" -"Last-Translator: Jordi Esteve \n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: \n" - -#. module: account_voucher_payment -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "XML invàlid per a la definició de la vista!" - -#. module: account_voucher_payment -#: wizard_view:account.voucher.unreconcile,init:0 -msgid "Unreconciliation transactions" -msgstr "Trenca conciliació de transaccions" - -#. module: account_voucher_payment -#: field:account.move.line,voucher_invoice:0 -#: field:account.voucher.line,invoice_id:0 -msgid "Invoice" -msgstr "Factura" - -#. module: account_voucher_payment -#: wizard_view:account.voucher.unreconcile,init:0 -msgid "If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable" -msgstr "Si trenqueu conciliació de transaccions, també heu de comprovar totes les accions que estan relacionades amb aquestes transaccions ja que no seran eliminades" - -#. module: account_voucher_payment -#: view:account.voucher:0 -#: field:account.voucher,voucher_line_ids:0 -msgid "Voucher Lines" -msgstr "Línies de comprovant" - -#. module: account_voucher_payment -#: model:ir.module.module,shortdesc:account_voucher_payment.module_name_translation -msgid "Invoice Payment/Receipt by Vouchers." -msgstr "Pagaments i rebuts de factures per comprovant." - -#. module: account_voucher_payment -#: model:ir.actions.wizard,name:account_voucher_payment.wizard_unreconcile_voucher -msgid "Unreconcile entries" -msgstr "Trenca conciliació entrades" - -#. module: account_voucher_payment -#: model:ir.module.module,description:account_voucher_payment.module_name_translation -msgid "" -"This module includes :\n" -" * It reconcile the invoice (supplier, customer) while paying through \n" -" Accounting Vouchers\n" -" " -msgstr "" -"Aquest mòdul inclou:\n" -" * Concilia factures de proveïdors i clients mentre són pagades mitjançant \n" -" comprovants comptables\n" - -#. module: account_voucher_payment -#: wizard_button:account.voucher.unreconcile,init,end:0 -msgid "Cancel" -msgstr "Cancel·la" - -#. module: account_voucher_payment -#: wizard_button:account.voucher.unreconcile,init,unrec:0 -msgid "Unreconcile" -msgstr "Trenca conciliació" - -#. module: account_voucher_payment -#: wizard_view:account.voucher.unreconcile,init:0 -msgid "Unreconciliation" -msgstr "Trenca conciliació" - diff --git a/addons/account_voucher_payment/i18n/el.po b/addons/account_voucher_payment/i18n/el.po deleted file mode 100644 index 5531e87022f..00000000000 --- a/addons/account_voucher_payment/i18n/el.po +++ /dev/null @@ -1,93 +0,0 @@ -# Greek 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-05-13 20:11+0000\n" -"PO-Revision-Date: 2010-06-22 05:05+0000\n" -"Last-Translator: Panayiotis Konstantinidis \n" -"Language-Team: Greek \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-12 04:08+0000\n" -"X-Generator: Launchpad (build Unknown)\n" - -#. module: account_voucher_payment -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "Λανθασμένο XML για αρχιτεκτονική όψης!" - -#. module: account_voucher_payment -#: wizard_view:account.voucher.unreconcile,init:0 -msgid "Unreconciliation transactions" -msgstr "Ασυμβίβαστες συναλλαγές" - -#. module: account_voucher_payment -#: model:ir.module.module,description:account_voucher_payment.module_name_translation -msgid "" -"This module includes :\n" -" * It reconcile the invoice (supplier, customer) while paying through \n" -" Accounting Vouchers\n" -" " -msgstr "" -"Αυτή η μονάδα περιλαμβάνει :\n" -" * Εναρμονίζει το τιμολόγιο ( προμηθευτή, πελάτη ) καθώς πληρώνει απο τον " -"\n" -" Λογαριασμό Παραστατικών\n" -" " - -#. module: account_voucher_payment -#: wizard_view:account.voucher.unreconcile,init:0 -msgid "" -"If you unreconciliate transactions, you must also verify all the actions " -"that are linked to those transactions because they will not be disable" -msgstr "" -"Αν ακυρώσετε συμφωνημένες συναλλαγές θα πρέπει να ελέγξετε όλες τις " -"ενέργειες που συνδέονται με αυτές διότι δεν θα διαγραφούν." - -#. module: account_voucher_payment -#: view:account.voucher:0 -#: field:account.voucher,voucher_line_ids:0 -msgid "Voucher Lines" -msgstr "Γραμμές Παραστατικού" - -#. module: account_voucher_payment -#: model:ir.module.module,shortdesc:account_voucher_payment.module_name_translation -msgid "Invoice Payment/Receipt by Vouchers." -msgstr "Πληρωμή Τιμολογίου/ Απόδειξη απο Παραστατικό" - -#. module: account_voucher_payment -#: model:ir.actions.wizard,name:account_voucher_payment.wizard_unreconcile_voucher -msgid "Unreconcile entries" -msgstr "Ασυμβίβαστες εγγραφές" - -#. module: account_voucher_payment -#: field:account.move.line,voucher_invoice:0 -#: field:account.voucher.line,invoice_id:0 -msgid "Invoice" -msgstr "Τιμολόγιο" - -#. module: account_voucher_payment -#: wizard_button:account.voucher.unreconcile,init,end:0 -msgid "Cancel" -msgstr "Ακύρωση" - -#. module: account_voucher_payment -#: field:account.voucher,partner_id:0 -msgid "Partner" -msgstr "Συνεργάτης" - -#. module: account_voucher_payment -#: wizard_button:account.voucher.unreconcile,init,unrec:0 -msgid "Unreconcile" -msgstr "Ακυρώνω" - -#. module: account_voucher_payment -#: wizard_view:account.voucher.unreconcile,init:0 -msgid "Unreconciliation" -msgstr "Ακύρωση" diff --git a/addons/account_voucher_payment/i18n/es.po b/addons/account_voucher_payment/i18n/es.po deleted file mode 100644 index 134c11751e9..00000000000 --- a/addons/account_voucher_payment/i18n/es.po +++ /dev/null @@ -1,94 +0,0 @@ -# Spanish 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-05-13 20:11+0000\n" -"PO-Revision-Date: 2010-08-11 05:38+0000\n" -"Last-Translator: Jordi Esteve (www.zikzakmedia.com) " -"\n" -"Language-Team: Spanish \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-12 04:08+0000\n" -"X-Generator: Launchpad (build Unknown)\n" - -#. module: account_voucher_payment -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "¡XML inválido para la definición de la vista!" - -#. module: account_voucher_payment -#: wizard_view:account.voucher.unreconcile,init:0 -msgid "Unreconciliation transactions" -msgstr "Romper conciliación de transacciones" - -#. module: account_voucher_payment -#: model:ir.module.module,description:account_voucher_payment.module_name_translation -msgid "" -"This module includes :\n" -" * It reconcile the invoice (supplier, customer) while paying through \n" -" Accounting Vouchers\n" -" " -msgstr "" -"Este módulo incluye :\n" -" * Concilia facturas de proveedores y clientes mientras son pagadas " -"mediante \n" -" comprobantes contables\n" -" " - -#. module: account_voucher_payment -#: wizard_view:account.voucher.unreconcile,init:0 -msgid "" -"If you unreconciliate transactions, you must also verify all the actions " -"that are linked to those transactions because they will not be disable" -msgstr "" -"Si rompe conciliación de transacciones, también debe verificar todas las " -"acciones que están enlazadas a estas transacciones porque no serán eliminadas" - -#. module: account_voucher_payment -#: view:account.voucher:0 -#: field:account.voucher,voucher_line_ids:0 -msgid "Voucher Lines" -msgstr "Líneas de comprobante" - -#. module: account_voucher_payment -#: model:ir.module.module,shortdesc:account_voucher_payment.module_name_translation -msgid "Invoice Payment/Receipt by Vouchers." -msgstr "Pagos y recibos de facturas por comprobantes." - -#. module: account_voucher_payment -#: model:ir.actions.wizard,name:account_voucher_payment.wizard_unreconcile_voucher -msgid "Unreconcile entries" -msgstr "Romper concilación entradas" - -#. module: account_voucher_payment -#: field:account.move.line,voucher_invoice:0 -#: field:account.voucher.line,invoice_id:0 -msgid "Invoice" -msgstr "Factura" - -#. module: account_voucher_payment -#: wizard_button:account.voucher.unreconcile,init,end:0 -msgid "Cancel" -msgstr "Cancelar" - -#. module: account_voucher_payment -#: field:account.voucher,partner_id:0 -msgid "Partner" -msgstr "Compañero" - -#. module: account_voucher_payment -#: wizard_button:account.voucher.unreconcile,init,unrec:0 -msgid "Unreconcile" -msgstr "Romper conciliación" - -#. module: account_voucher_payment -#: wizard_view:account.voucher.unreconcile,init:0 -msgid "Unreconciliation" -msgstr "Romper conciliación" diff --git a/addons/account_voucher_payment/i18n/es_ES.po b/addons/account_voucher_payment/i18n/es_ES.po deleted file mode 100644 index 28765ce533a..00000000000 --- a/addons/account_voucher_payment/i18n/es_ES.po +++ /dev/null @@ -1,81 +0,0 @@ -# Translation of OpenERP Server. -# This file contains the translation of the following modules: -# * account_voucher_payment -# -msgid "" -msgstr "" -"Project-Id-Version: OpenERP Server 6.0dev\n" -"Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2009-05-13 19:47:47+0000\n" -"PO-Revision-Date: 2009-05-16 18:57+0100\n" -"Last-Translator: Jordi Esteve \n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: \n" - -#. module: account_voucher_payment -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "¡XML inválido para la definición de la vista!" - -#. module: account_voucher_payment -#: wizard_view:account.voucher.unreconcile,init:0 -msgid "Unreconciliation transactions" -msgstr "Romper conciliación de transacciones" - -#. module: account_voucher_payment -#: field:account.move.line,voucher_invoice:0 -#: field:account.voucher.line,invoice_id:0 -msgid "Invoice" -msgstr "Factura" - -#. module: account_voucher_payment -#: wizard_view:account.voucher.unreconcile,init:0 -msgid "If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable" -msgstr "Si rompe conciliación de transacciones, también debe verificar todas las acciones que están enlazadas a estas transacciones porque no serán eliminadas" - -#. module: account_voucher_payment -#: view:account.voucher:0 -#: field:account.voucher,voucher_line_ids:0 -msgid "Voucher Lines" -msgstr "Líneas de comprobante" - -#. module: account_voucher_payment -#: model:ir.module.module,shortdesc:account_voucher_payment.module_name_translation -msgid "Invoice Payment/Receipt by Vouchers." -msgstr "Pagos y recibos de facturas por comprobantes." - -#. module: account_voucher_payment -#: model:ir.actions.wizard,name:account_voucher_payment.wizard_unreconcile_voucher -msgid "Unreconcile entries" -msgstr "Romper concilación entradas" - -#. module: account_voucher_payment -#: model:ir.module.module,description:account_voucher_payment.module_name_translation -msgid "" -"This module includes :\n" -" * It reconcile the invoice (supplier, customer) while paying through \n" -" Accounting Vouchers\n" -" " -msgstr "" -"Este módulo incluye :\n" -" * Concilia facturas de proveedores y clientes mientras son pagadas mediante \n" -" comprobantes contables\n" - -#. module: account_voucher_payment -#: wizard_button:account.voucher.unreconcile,init,end:0 -msgid "Cancel" -msgstr "Cancelar" - -#. module: account_voucher_payment -#: wizard_button:account.voucher.unreconcile,init,unrec:0 -msgid "Unreconcile" -msgstr "Romper conciliación" - -#. module: account_voucher_payment -#: wizard_view:account.voucher.unreconcile,init:0 -msgid "Unreconciliation" -msgstr "Romper conciliación" - diff --git a/addons/account_voucher_payment/i18n/et.po b/addons/account_voucher_payment/i18n/et.po deleted file mode 100644 index ff959abf935..00000000000 --- a/addons/account_voucher_payment/i18n/et.po +++ /dev/null @@ -1,86 +0,0 @@ -# Estonian 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-05-13 20:11+0000\n" -"PO-Revision-Date: 2010-06-08 17:42+0000\n" -"Last-Translator: lyyser \n" -"Language-Team: Estonian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-12 04:08+0000\n" -"X-Generator: Launchpad (build Unknown)\n" - -#. module: account_voucher_payment -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "Vigane XML vaate arhitektuurile!" - -#. module: account_voucher_payment -#: wizard_view:account.voucher.unreconcile,init:0 -msgid "Unreconciliation transactions" -msgstr "Mittesobivad tehingud" - -#. module: account_voucher_payment -#: model:ir.module.module,description:account_voucher_payment.module_name_translation -msgid "" -"This module includes :\n" -" * It reconcile the invoice (supplier, customer) while paying through \n" -" Accounting Vouchers\n" -" " -msgstr "" - -#. module: account_voucher_payment -#: wizard_view:account.voucher.unreconcile,init:0 -msgid "" -"If you unreconciliate transactions, you must also verify all the actions " -"that are linked to those transactions because they will not be disable" -msgstr "" - -#. module: account_voucher_payment -#: view:account.voucher:0 -#: field:account.voucher,voucher_line_ids:0 -msgid "Voucher Lines" -msgstr "Tähiku read" - -#. module: account_voucher_payment -#: model:ir.module.module,shortdesc:account_voucher_payment.module_name_translation -msgid "Invoice Payment/Receipt by Vouchers." -msgstr "" - -#. module: account_voucher_payment -#: model:ir.actions.wizard,name:account_voucher_payment.wizard_unreconcile_voucher -msgid "Unreconcile entries" -msgstr "Kooskõlastamatta kirjed" - -#. module: account_voucher_payment -#: field:account.move.line,voucher_invoice:0 -#: field:account.voucher.line,invoice_id:0 -msgid "Invoice" -msgstr "Arve" - -#. module: account_voucher_payment -#: wizard_button:account.voucher.unreconcile,init,end:0 -msgid "Cancel" -msgstr "Katkesta" - -#. module: account_voucher_payment -#: field:account.voucher,partner_id:0 -msgid "Partner" -msgstr "Partner" - -#. module: account_voucher_payment -#: wizard_button:account.voucher.unreconcile,init,unrec:0 -msgid "Unreconcile" -msgstr "" - -#. module: account_voucher_payment -#: wizard_view:account.voucher.unreconcile,init:0 -msgid "Unreconciliation" -msgstr "" diff --git a/addons/account_voucher_payment/i18n/fr_BE.po b/addons/account_voucher_payment/i18n/fr_BE.po deleted file mode 100644 index 07044b31a84..00000000000 --- a/addons/account_voucher_payment/i18n/fr_BE.po +++ /dev/null @@ -1,77 +0,0 @@ -# Translation of OpenERP Server. -# This file contains the translation of the following modules: -# * account_voucher_payment -# -msgid "" -msgstr "" -"Project-Id-Version: OpenERP Server 6.0dev\n" -"Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2009-11-26 06:54:11+0000\n" -"PO-Revision-Date: 2009-11-26 06:54:11+0000\n" -"Last-Translator: <>\n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: \n" - -#. module: account_voucher_payment -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "" - -#. module: account_voucher_payment -#: wizard_view:account.voucher.unreconcile,init:0 -msgid "Unreconciliation transactions" -msgstr "" - -#. module: account_voucher_payment -#: field:account.move.line,voucher_invoice:0 -#: field:account.voucher.line,invoice_id:0 -msgid "Invoice" -msgstr "" - -#. module: account_voucher_payment -#: wizard_view:account.voucher.unreconcile,init:0 -msgid "If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable" -msgstr "" - -#. module: account_voucher_payment -#: view:account.voucher:0 -#: field:account.voucher,voucher_line_ids:0 -msgid "Voucher Lines" -msgstr "" - -#. module: account_voucher_payment -#: model:ir.module.module,shortdesc:account_voucher_payment.module_meta_information -msgid "Invoice Payment/Receipt by Vouchers." -msgstr "" - -#. module: account_voucher_payment -#: model:ir.actions.wizard,name:account_voucher_payment.wizard_unreconcile_voucher -msgid "Unreconcile entries" -msgstr "" - -#. module: account_voucher_payment -#: model:ir.module.module,description:account_voucher_payment.module_meta_information -msgid "This module includes :\n" -" * It reconcile the invoice (supplier, customer) while paying through \n" -" Accounting Vouchers\n" -" " -msgstr "" - -#. module: account_voucher_payment -#: wizard_button:account.voucher.unreconcile,init,end:0 -msgid "Cancel" -msgstr "" - -#. module: account_voucher_payment -#: wizard_button:account.voucher.unreconcile,init,unrec:0 -msgid "Unreconcile" -msgstr "" - -#. module: account_voucher_payment -#: wizard_view:account.voucher.unreconcile,init:0 -msgid "Unreconciliation" -msgstr "" - diff --git a/addons/account_voucher_payment/i18n/pt_BR.po b/addons/account_voucher_payment/i18n/pt_BR.po deleted file mode 100644 index 65d8341d436..00000000000 --- a/addons/account_voucher_payment/i18n/pt_BR.po +++ /dev/null @@ -1,89 +0,0 @@ -# Brazilian Portuguese 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-05-13 20:11+0000\n" -"PO-Revision-Date: 2010-07-28 14:21+0000\n" -"Last-Translator: Leandro Chaves \n" -"Language-Team: Brazilian Portuguese \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-12 04:08+0000\n" -"X-Generator: Launchpad (build Unknown)\n" - -#. module: account_voucher_payment -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "XML inválido para a arquitetura de exibição" - -#. module: account_voucher_payment -#: wizard_view:account.voucher.unreconcile,init:0 -msgid "Unreconciliation transactions" -msgstr "Transações não conciliadas" - -#. module: account_voucher_payment -#: model:ir.module.module,description:account_voucher_payment.module_name_translation -msgid "" -"This module includes :\n" -" * It reconcile the invoice (supplier, customer) while paying through \n" -" Accounting Vouchers\n" -" " -msgstr "" - -#. module: account_voucher_payment -#: wizard_view:account.voucher.unreconcile,init:0 -msgid "" -"If you unreconciliate transactions, you must also verify all the actions " -"that are linked to those transactions because they will not be disable" -msgstr "" -"Se você desfazer a reconciliação de transações, você deve também verificar " -"todas as ações que estão ligadas a essas operações, porque elas não serão " -"desfeitas pelo sistema" - -#. module: account_voucher_payment -#: view:account.voucher:0 -#: field:account.voucher,voucher_line_ids:0 -msgid "Voucher Lines" -msgstr "Linhas de Comprovantes" - -#. module: account_voucher_payment -#: model:ir.module.module,shortdesc:account_voucher_payment.module_name_translation -msgid "Invoice Payment/Receipt by Vouchers." -msgstr "" - -#. module: account_voucher_payment -#: model:ir.actions.wizard,name:account_voucher_payment.wizard_unreconcile_voucher -msgid "Unreconcile entries" -msgstr "Anular reconciliação de lançamentos" - -#. module: account_voucher_payment -#: field:account.move.line,voucher_invoice:0 -#: field:account.voucher.line,invoice_id:0 -msgid "Invoice" -msgstr "Fatura" - -#. module: account_voucher_payment -#: wizard_button:account.voucher.unreconcile,init,end:0 -msgid "Cancel" -msgstr "Cancelar" - -#. module: account_voucher_payment -#: field:account.voucher,partner_id:0 -msgid "Partner" -msgstr "Parceiro" - -#. module: account_voucher_payment -#: wizard_button:account.voucher.unreconcile,init,unrec:0 -msgid "Unreconcile" -msgstr "Não concilidado" - -#. module: account_voucher_payment -#: wizard_view:account.voucher.unreconcile,init:0 -msgid "Unreconciliation" -msgstr "Desconciliação" diff --git a/addons/account_voucher_payment/i18n/sl.po b/addons/account_voucher_payment/i18n/sl.po deleted file mode 100644 index f090b7071f9..00000000000 --- a/addons/account_voucher_payment/i18n/sl.po +++ /dev/null @@ -1,88 +0,0 @@ -# Slovenian 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-05-13 20:11+0000\n" -"PO-Revision-Date: 2010-07-28 12:23+0000\n" -"Last-Translator: Simon Vidmar \n" -"Language-Team: Slovenian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-12 04:08+0000\n" -"X-Generator: Launchpad (build Unknown)\n" - -#. module: account_voucher_payment -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "Neveljaven XML za arhitekturo pogleda!" - -#. module: account_voucher_payment -#: wizard_view:account.voucher.unreconcile,init:0 -msgid "Unreconciliation transactions" -msgstr "Preklic uskladitve transakcij" - -#. module: account_voucher_payment -#: model:ir.module.module,description:account_voucher_payment.module_name_translation -msgid "" -"This module includes :\n" -" * It reconcile the invoice (supplier, customer) while paying through \n" -" Accounting Vouchers\n" -" " -msgstr "" - -#. module: account_voucher_payment -#: wizard_view:account.voucher.unreconcile,init:0 -msgid "" -"If you unreconciliate transactions, you must also verify all the actions " -"that are linked to those transactions because they will not be disable" -msgstr "" -"Če prekličete uskladitev transakcij, morate tudi preveriti vse akcije, ki so " -"povezane s temi transakcijami, kajti le te ne bodo onemogočene." - -#. module: account_voucher_payment -#: view:account.voucher:0 -#: field:account.voucher,voucher_line_ids:0 -msgid "Voucher Lines" -msgstr "" - -#. module: account_voucher_payment -#: model:ir.module.module,shortdesc:account_voucher_payment.module_name_translation -msgid "Invoice Payment/Receipt by Vouchers." -msgstr "" - -#. module: account_voucher_payment -#: model:ir.actions.wizard,name:account_voucher_payment.wizard_unreconcile_voucher -msgid "Unreconcile entries" -msgstr "Prekliči uskladitev vknjižb" - -#. module: account_voucher_payment -#: field:account.move.line,voucher_invoice:0 -#: field:account.voucher.line,invoice_id:0 -msgid "Invoice" -msgstr "Račun" - -#. module: account_voucher_payment -#: wizard_button:account.voucher.unreconcile,init,end:0 -msgid "Cancel" -msgstr "Prekliči" - -#. module: account_voucher_payment -#: field:account.voucher,partner_id:0 -msgid "Partner" -msgstr "Partner" - -#. module: account_voucher_payment -#: wizard_button:account.voucher.unreconcile,init,unrec:0 -msgid "Unreconcile" -msgstr "Prekliči uskladitev" - -#. module: account_voucher_payment -#: wizard_view:account.voucher.unreconcile,init:0 -msgid "Unreconciliation" -msgstr "Preklic uskladitve" diff --git a/addons/account_voucher_payment/i18n/zh_CN.po b/addons/account_voucher_payment/i18n/zh_CN.po deleted file mode 100644 index 00ccf4661a2..00000000000 --- a/addons/account_voucher_payment/i18n/zh_CN.po +++ /dev/null @@ -1,90 +0,0 @@ -# Chinese (Simplified) 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-05-13 20:11+0000\n" -"PO-Revision-Date: 2010-07-14 03:27+0000\n" -"Last-Translator: Black Jack \n" -"Language-Team: Chinese (Simplified) \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-12 04:08+0000\n" -"X-Generator: Launchpad (build Unknown)\n" - -#. module: account_voucher_payment -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "无效XML视图结构!" - -#. module: account_voucher_payment -#: wizard_view:account.voucher.unreconcile,init:0 -msgid "Unreconciliation transactions" -msgstr "取消对账" - -#. module: account_voucher_payment -#: model:ir.module.module,description:account_voucher_payment.module_name_translation -msgid "" -"This module includes :\n" -" * It reconcile the invoice (supplier, customer) while paying through \n" -" Accounting Vouchers\n" -" " -msgstr "" -"这模块包括:\n" -" *在支付时核销发票(供应商, 客户) \n" -" 原始凭证\n" -" " - -#. module: account_voucher_payment -#: wizard_view:account.voucher.unreconcile,init:0 -msgid "" -"If you unreconciliate transactions, you must also verify all the actions " -"that are linked to those transactions because they will not be disable" -msgstr "如果取消交易的核销, 你必须检验链接该交易的所有操作. 因为他们不会被禁止." - -#. module: account_voucher_payment -#: view:account.voucher:0 -#: field:account.voucher,voucher_line_ids:0 -msgid "Voucher Lines" -msgstr "原始凭证明细" - -#. module: account_voucher_payment -#: model:ir.module.module,shortdesc:account_voucher_payment.module_name_translation -msgid "Invoice Payment/Receipt by Vouchers." -msgstr "发票付款/ 收入的原始凭证" - -#. module: account_voucher_payment -#: model:ir.actions.wizard,name:account_voucher_payment.wizard_unreconcile_voucher -msgid "Unreconcile entries" -msgstr "取消核销" - -#. module: account_voucher_payment -#: field:account.move.line,voucher_invoice:0 -#: field:account.voucher.line,invoice_id:0 -msgid "Invoice" -msgstr "发票" - -#. module: account_voucher_payment -#: wizard_button:account.voucher.unreconcile,init,end:0 -msgid "Cancel" -msgstr "取消" - -#. module: account_voucher_payment -#: field:account.voucher,partner_id:0 -msgid "Partner" -msgstr "业务伙伴" - -#. module: account_voucher_payment -#: wizard_button:account.voucher.unreconcile,init,unrec:0 -msgid "Unreconcile" -msgstr "取消核销" - -#. module: account_voucher_payment -#: wizard_view:account.voucher.unreconcile,init:0 -msgid "Unreconciliation" -msgstr "取消对账" diff --git a/addons/account_voucher_payment/security/ir.model.access.csv b/addons/account_voucher_payment/security/ir.model.access.csv deleted file mode 100644 index 0343f29f43a..00000000000 --- a/addons/account_voucher_payment/security/ir.model.access.csv +++ /dev/null @@ -1 +0,0 @@ -"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" diff --git a/addons/account_voucher_payment/test/account_voucher_payment.yml b/addons/account_voucher_payment/test/account_voucher_payment.yml deleted file mode 100644 index 8bcea6a23a4..00000000000 --- a/addons/account_voucher_payment/test/account_voucher_payment.yml +++ /dev/null @@ -1,118 +0,0 @@ -- - In order to test account_voucher_payment module in OpenERP I create an invoice and paid it through voucher -- - I create a customer invoice record -- - !record {model: account.invoice, id: account_invoice_voucher_payment}: - account_id: account.a_recv - address_contact_id: base.res_partner_address_3000 - address_invoice_id: base.res_partner_address_3000 - company_id: base.main_company - currency_id: base.EUR - invoice_line: - - account_id: account.a_sale - name: '[PC1] Basic PC' - price_unit: 450.0 - quantity: 1.0 - product_id: product.product_product_pc1 - uos_id: product.product_uom_unit - journal_id: account.sales_journal - partner_id: base.res_partner_desertic_hispafuentes - reference_type: none - -- - I check that Initially customer invoice is in the "Draft" state -- - !assert {model: account.invoice, id: account_invoice_voucher_payment}: - - state == 'draft' -- - I change the state of invoice to "Proforma2" by clicking PRO-FORMA button -- - !workflow {model: account.invoice, action: invoice_proforma2, ref: account_invoice_voucher_payment} -- - I check that the invoice state is now "Proforma2" -- - !assert {model: account.invoice, id: account_invoice_voucher_payment}: - - state == 'proforma2' -- - I create invoice by clicking on Create button -- - !workflow {model: account.invoice, action: invoice_open, ref: account_invoice_voucher_payment} -- - I check that the invoice state is "Open" -- - !assert {model: account.invoice, id: account_invoice_voucher_payment}: - - state == 'open' - -- - I create a voucher record for above invoice -- - !record {model: account.voucher, id: account_voucher_voucherforaxelor1}: - account_id: account.cash - company_id: base.main_company - currency_id: base.EUR - journal_id: account.bank_journal - name: Voucher for Axelor - narration: Basic Pc - payment_ids: - - account_id: account.a_recv - amount: 450.0 - name: Voucher for Axelor - partner_id: base.res_partner_desertic_hispafuentes - invoice_id: account_invoice_voucher_payment - type: cr - period_id: account.period_6 - reference_type: none - -- - I check that Initially customer voucher is in the "Draft" state -- - !assert {model: account.voucher, id: account_voucher_voucherforaxelor1}: - - state == 'draft' -- - I change the state of voucher to "proforma" by clicking PRO-FORMA button -- - !workflow {model: account.voucher, action: open_voucher, ref: account_voucher_voucherforaxelor1} -- - I check that the voucher state is now "proforma" -- - !assert {model: account.voucher, id: account_voucher_voucherforaxelor1}: - - state == 'proforma' -- - I create voucher by clicking on Create button -- - !workflow {model: account.voucher, action: proforma_voucher, ref: account_voucher_voucherforaxelor1} -- - I check that the voucher state is "Waiting for re-checking" -- - !assert {model: account.voucher, id: account_voucher_voucherforaxelor1}: - - state == 'recheck' -- - I clicked on Validate Button -- - !workflow {model: account.voucher, action: recheck_voucher, ref: account_voucher_voucherforaxelor1} -- - I check that the voucher state is "posted" -- - !assert {model: account.voucher, id: account_voucher_voucherforaxelor1}: - - state == 'posted' - -- - I check that Moves get created for this voucher -- - !python {model: account.voucher}: | - acc_id=self.browse(cr, uid, ref("account_voucher_voucherforaxelor1")) - assert(acc_id.move_id) - -- - I check that the invoice state is now Done -- - !assert {model: account.invoice, id: account_invoice_voucher_payment}: - - state == 'paid' - - - - - - - diff --git a/addons/account_voucher_payment/wizard/__init__.py b/addons/account_voucher_payment/wizard/__init__.py deleted file mode 100644 index 32ab938c5a6..00000000000 --- a/addons/account_voucher_payment/wizard/__init__.py +++ /dev/null @@ -1,24 +0,0 @@ -# -*- encoding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2004-2009 Tiny SPRL (). -# -# 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 . -# -############################################################################## - -import account_voucher_unreconcile - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account_voucher_payment/wizard/account_voucher_unreconcile.py b/addons/account_voucher_payment/wizard/account_voucher_unreconcile.py deleted file mode 100644 index d12bee51894..00000000000 --- a/addons/account_voucher_payment/wizard/account_voucher_unreconcile.py +++ /dev/null @@ -1,63 +0,0 @@ -# -*- encoding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2004-2009 Tiny SPRL (). -# -# 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 . -# -############################################################################## - -import netsvc -from osv import osv -from osv import fields - -class account_voucher_unreconcile(osv.osv_memory): - _name = "account.voucher.unreconcile" - _description = "Account voucher unreconcile" - - _columns = { - 'remove':fields.boolean('Want to remove accounting entries too ?', required=False), - } - - _defaults = { - 'remove': lambda *a: True, - } - - def trans_unrec(self, cr, uid, ids, context=None): - res = self.browse(cr, uid, ids[0]) - if context is None: - context = {} - voucher_pool = self.pool.get('account.voucher') - reconcile_pool = self.pool.get('account.move.reconcile') - if context.get('active_id'): - voucher = voucher_pool.browse(cr, uid, context.get('active_id'), context) - recs = [] - for line in voucher.move_ids: - if line.reconcile_id: - recs = [line.reconcile_id.id] - - for rec in recs: - reconcile_pool.unlink(cr, uid, rec) - - if res.remove: - voucher_pool.cancel_voucher(cr, uid, [context.get('active_id')], context) -# wf_service = netsvc.LocalService("workflow") -# wf_service.trg_validate(uid, 'account.voucher', context.get('active_id'), 'cancel_voucher', cr) - - return {} - -account_voucher_unreconcile() - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account_voucher_payment/wizard/account_voucher_unreconcile_view.xml b/addons/account_voucher_payment/wizard/account_voucher_unreconcile_view.xml deleted file mode 100644 index d88a2943811..00000000000 --- a/addons/account_voucher_payment/wizard/account_voucher_unreconcile_view.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - Account voucher unreconcile - account.voucher.unreconcile - form - -
- -