Merge lp:~openerp/openobject-addons/5.0-certified-addons into lp:openobject-addons

[Gelson Mata]

[Fabien (Open ERP) (fp-tinyerp)]

Hello,

I think it's better to keep these modules in a separate branch.

Unmerged revisions

13. By Olivier Laurent (Open ERP) on 2011-05-25

[CERT] added certificate numbers to artdeceau modules

12. By Olivier Laurent (Open ERP) on 2011-05-25

[ADD] added artdeceau modules

11. By Olivier Laurent (Open ERP) on 2011-02-28

[CERT] added certificates

10. By Olivier Laurent (Open ERP) on 2011-02-28

[CERT] new certified modules

9. By Stephane Wirtel (OpenERP) on 2010-08-18

[CERTIFICATION] Add the mrp_prodlot_autosplit module from lp:~openerp-commiter/openobject-addons/stable_5.0-extra-addons

8. By Stephane Wirtel (OpenERP) on 2010-08-18

[CERTIFICATION] Add the product_m2mcategories module from lp:~openerp-commiter/openobject-addons/stable_5.0-extra-addons

7. By Stephane Wirtel (OpenERP) on 2010-08-18

[CERTIFICATION] Add the base_external_referentials module from lp:~openerp-commiter/openobject-addons/stable_5.0-extra-addons

6. By Stephane Wirtel (OpenERP) on 2010-08-18

[CERTIFICATION] Add the account_payment_extension module from lp:~openerp-commiter/openobject-addons/stable_5.0-extra-addons

5. By Stephane Wirtel (OpenERP) on 2010-08-18

[CERTIFICATION] Add the base_sale_multichannels module from lp:~openerp-commiter/openobject-addons/stable_5.0-extra-addons

4. By Stephane Wirtel (OpenERP) on 2010-08-18

[CERTIFICATION] Add the product_images_olbs module from lp:~openerp-commiter/openobject-addons/stable_5.0-extra-addons

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2011-07-29 01:35:58 +0000
@@ -0,0 +1,2 @@
+.project
+.pydevproject

=== renamed file '.bzrignore' => '.bzrignore.moved'
=== added file 'README'
=== added directory 'account_invoice_cash_discount'
=== added file 'account_invoice_cash_discount/__init__.py'
--- account_invoice_cash_discount/__init__.py	1970-01-01 00:00:00 +0000
+++ account_invoice_cash_discount/__init__.py	2011-07-29 01:35:58 +0000
@@ -0,0 +1,27 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution	
+#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import wizard
+import account_invoice_cash_discount
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+

=== added file 'account_invoice_cash_discount/__terp__.py'
--- account_invoice_cash_discount/__terp__.py	1970-01-01 00:00:00 +0000
+++ account_invoice_cash_discount/__terp__.py	2011-07-29 01:35:58 +0000
@@ -0,0 +1,48 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+{
+    "name" : "Payment Term with Cash Discount",
+    "version" : "1.0",
+    "depends" : ["account","account_payment_discount_extension"],
+    "author" : "Big Consulting",
+    "website" : "http://www.openbig.org",
+    "category" : "",
+    "description": """
+    Module to add account move lines in case of payment with cash discount conditions in reconcilation form.
+    """,
+    "init_xml" : [
+    ],
+    "demo_xml" : [
+    ],
+    "update_xml" : [
+        "security/ir.model.access.csv",
+        'wizard/account_pay_invoice_view.xml',
+        "account_invoice_cash_discount_wizard.xml",
+        "account_invoice_cash_discount_view.xml",
+    ],
+    "active": False,
+    "installable": True,
+    'certificate': '001146321429795267965',
+
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+

=== added file 'account_invoice_cash_discount/account_invoice_cash_discount.py'
--- account_invoice_cash_discount/account_invoice_cash_discount.py	1970-01-01 00:00:00 +0000
+++ account_invoice_cash_discount/account_invoice_cash_discount.py	2011-07-29 01:35:58 +0000
@@ -0,0 +1,1179 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+from tools import config
+import time
+from tools.translate import _
+import netsvc
+
+class account_payment_term(osv.osv):
+    _name = "account.payment.term"
+    _inherit = "account.payment.term"
+    _columns = {
+        'cash_discount_ids': fields.one2many('account.cash.discount', 'payment_id', 'Cash Discount Terms'),
+    }
+account_payment_term()
+
+class account_cash_discount(osv.osv):
+    _name = "account.cash.discount"
+    _description = "Cash Discount"
+    _order ="delay"
+    _columns = {
+        'name': fields.char('Name', size=32),
+        'delay': fields.integer('Number of Days', required=True),
+        'discount': fields.float('Discount (%)', digits=(16,2), required=True),
+        'discount_account_id': fields.many2one('account.account', 'Customer Discount Account', required=True),
+        'sup_discount_account_id': fields.many2one('account.account', 'Supplier Discount Account', required=True),
+        'payment_id': fields.many2one('account.payment.term', 'Related Payment Term'),
+    }
+account_cash_discount()
+
+class account_payment_term_line(osv.osv):
+    _inherit = "account.payment.term.line"
+    _columns = {
+        'day_tolerance': fields.integer('Tolerance (Days)', digits=(16,0)),
+        'payment_id': fields.many2one('account.payment.term', 'Payment Term', required=False, select=True),
+        'compl_cash_discount': fields.boolean('Use Complete Cash Discount'),
+    }
+    _defaults = {
+        'day_tolerance': lambda *a: 0,
+        }
+account_payment_term_line()
+
+class account_invoice(osv.osv):
+    _inherit = "account.invoice"
+
+    def _get_amount(self, cr, uid, ids, residual_amount, payment_term, context=None):
+        """
+        This function returns the amount to be paid according to the cash discount payment term for the corresponding payment term 
+        """
+        if context is None:
+           context = {}
+        tax_obj = self.pool.get('account.tax')
+        invoice = self.browse(cr, uid, ids[0], context=context)
+
+        date1 = invoice.date_invoice or time.strftime('%Y-%m-%d')
+        date2 = 'date_p' in context and context['date_p'] or time.strftime('%Y-%m-%d')
+        from_dt = time.mktime(time.strptime(date1, '%Y-%m-%d'))
+        to_dt = time.mktime(time.strptime(date2, '%Y-%m-%d'))
+        diff_day = abs(from_dt - to_dt) / (3600 * 24)
+
+        discount = amount = tol_days = 0.0
+        payment_line_found = False
+
+        if payment_term:
+            payment_term_lines = self.pool.get('account.payment.term').browse(cr, uid, payment_term, context=context)
+            if payment_term_lines.line_ids:
+                    res = dis = 0.0
+                    for payment_line in payment_term_lines.line_ids:
+                        if diff_day >= dis and diff_day <= payment_line.days:
+                            if residual_amount:
+                                payment_line_found = True
+                                tol_days = payment_line.day_tolerance
+                                if payment_line.value == 'procent':
+                                    res = round((residual_amount * payment_line.value_amount), int(config['price_accuracy']))
+                                elif payment_line.value == 'fixed':
+                                    res = payment_line.value_amount
+                                else:
+                                    res = residual_amount
+                            amount = res
+                        dis = payment_line.days
+        else:
+            amount = residual_amount
+                        
+        return {'amount': amount, 'tol_days': tol_days, 'found': payment_line_found}
+
+    def _get_payment(self, cr, uid, ids, residual_amount, payment_term, context=None):
+        """
+        This function returns the cash discount according to the cash discount payment term for the corresponding payment term
+        """
+        if context is None:
+           context = {}
+
+        tax_obj = self.pool.get('account.tax')
+        invoice = self.browse(cr, uid, ids[0], context=context)
+
+        date1 = invoice.date_invoice or time.strftime('%Y-%m-%d')
+        date2 = 'date_p' in context and context['date_p'] or time.strftime('%Y-%m-%d')
+        from_dt = time.mktime(time.strptime(date1, '%Y-%m-%d'))
+        to_dt = time.mktime(time.strptime(date2, '%Y-%m-%d'))
+        diff_day = abs(from_dt - to_dt) / (3600 * 24)
+        tolerance = self._get_amount(cr, uid, ids, residual_amount, payment_term, context)
+        tolerance_days = tolerance['tol_days']
+
+        discount = 0.0
+        if payment_term:
+            payment_term_lines = self.pool.get('account.payment.term').browse(cr, uid, payment_term, context=context)
+            if payment_term_lines.cash_discount_ids:
+                    res = dis = 0.0
+                    for discount_line in payment_term_lines.cash_discount_ids:
+                        if diff_day >= dis and diff_day <= discount_line.delay + tolerance_days:
+                            if residual_amount:
+                                res = round((residual_amount * discount_line.discount / 100), int(config['price_accuracy']))
+                            discount = res
+                        dis = discount_line.delay + tolerance_days
+        return discount
+
+    def _get_account(self, cr, uid, ids, residual_amount, payment_term, context=None):
+        """
+        This function returns the account according to the cash discount payment term for the corresponding payment term
+        """
+        if context is None:
+           context = {}
+
+        account_id = False
+
+        tax_obj = self.pool.get('account.tax')
+        invoice = self.browse(cr, uid, ids[0], context=context)
+
+        date1 = invoice.date_invoice or time.strftime('%Y-%m-%d')
+        date2 = 'date_p' in context and context['date_p'] or time.strftime('%Y-%m-%d')
+        from_dt = time.mktime(time.strptime(date1, '%Y-%m-%d'))
+        to_dt = time.mktime(time.strptime(date2, '%Y-%m-%d'))
+        diff_day = abs(from_dt - to_dt) / (3600 * 24)
+        tolerance = self._get_amount(cr, uid, ids, residual_amount, payment_term, context)
+        tolerance_days = tolerance['tol_days']
+
+        if payment_term:
+            payment_term_lines = self.pool.get('account.payment.term').browse(cr, uid, payment_term, context=context)
+            if payment_term_lines.cash_discount_ids:
+                    res = dis = 0.0
+                    for discount_line in payment_term_lines.cash_discount_ids:
+                        if diff_day >= dis and diff_day <= discount_line.delay + tolerance_days:
+                            if invoice.type in ('in_invoice', 'in_refund'):
+                                account_id = discount_line.sup_discount_account_id.id
+                            else:
+                                account_id = discount_line.discount_account_id.id
+                        dis = discount_line.delay + tolerance_days
+                    return account_id
+
+    def pay_and_reconcile(self, cr, uid, ids, pay_amount, pay_account_id, period_id, pay_journal_id, writeoff_acc_id, writeoff_period_id, writeoff_journal_id, context=None, name=''):
+        if context is None:
+            context = {}
+        #TODO check if we can use different period for payment and the writeoff line
+        assert len(ids) == 1, _("Can only pay one invoice at a time!")
+        invoice = self.browse(cr, uid, ids[0])
+
+        invoice_tax_obj = self.pool.get("account.invoice.tax")
+        journal_obj = self.pool.get('account.journal')
+        move_obj = self.pool.get('account.move')
+        move_line_obj = self.pool.get('account.move.line')
+        move_line_obj_memory = self.pool.get('account.move.line.memory')
+        tax_obj = self.pool.get('account.tax')
+        cur_obj = self.pool.get('res.currency')
+        res_users_obj = self.pool.get('res.user')
+
+        # get discount from payment term if any
+        amount_discount = invoice.payment_term and self._get_payment(cr, uid, ids, pay_amount, invoice.payment_term.id, context=context) or 0.0
+        journal_currency = journal_obj.browse(cr, uid, pay_journal_id, context=context).currency.id
+         
+        if not name:
+            name = invoice.invoice_line and invoice.invoice_line[0].name or invoice.number
+        src_account_id = invoice.account_id.id
+        # Take the seq as name for move
+        types = {'out_invoice': -1, 'in_invoice': 1, 'out_refund': 1, 'in_refund': -1}
+        direction = types[invoice.type]
+        #take the choosen date
+        date = 'date_p' in context and context['date_p'] or time.strftime('%Y-%m-%d')
+
+        # Take the amount in currency and the currency of the payment
+        if 'amount_currency' in context and context['amount_currency'] and 'currency_id' in context and context['currency_id']:
+            amount_currency = context['amount_currency']
+            currency_id = context['currency_id']
+        else:
+            amount_currency = False
+            currency_id = False
+            
+        if invoice.type in ('in_invoice', 'in_refund'):
+            ref = invoice.reference
+        else:
+            ref = self._convert_ref(cr, uid, invoice.number)
+
+        discount_amount = tax_total_amount = 0.0
+        if 'cash_amount' in context and context['cash_amount']:
+            discount_amount = context['cash_amount']
+        elif 'pay_cash_discount' in context and context['pay_cash_discount']:
+            discount_amount = context['pay_cash_discount']
+            
+        # Pay attention to the sign for both debit/credit AND amount_currency
+        l1 = {
+            'debit': direction * pay_amount > 0 and abs(pay_amount) or 0.0,
+            'credit': direction * pay_amount < 0 and abs(pay_amount) or 0.0,
+            'account_id': src_account_id,
+            'partner_id': invoice.partner_id.id,
+            'ref': ref,
+            'date': date,
+            'currency_id': currency_id,
+            'amount_currency': amount_currency and direction * amount_currency or 0.0,
+            'name': name,
+        }
+
+        ### if we change the amount paid and in the disocunt then it used the changes discount
+        if amount_discount != discount_amount and discount_amount > 0.0:
+            amount_discount = discount_amount
+        l2 = {
+            'debit': direction * (pay_amount - amount_discount) < 0 and abs(pay_amount - amount_discount) or 0.0,
+            'credit': direction * (pay_amount - amount_discount) > 0 and abs(pay_amount - amount_discount) or 0.0,
+            'account_id': pay_account_id,
+            'partner_id': invoice.partner_id.id,
+            'ref': ref,
+            'date': date,
+            'currency_id': currency_id,
+            'amount_currency': amount_currency and -direction * amount_currency or 0.0,
+            'name': name,
+        }
+
+        lines = [(0, 0, l1), (0, 0, l2)]
+
+        ### When we make payment by pay invoice wizard and if found the taxes move then directly take the entry from the wizard
+        if 'tax_move_ids' in context and context['tax_move_ids']:
+            move_line = context['tax_move_ids']
+            for move_line_id in move_line:
+                move_line_data = move_line_obj_memory.browse(cr, uid,move_line_id)
+                l3 = {
+                    'debit': move_line_data.debit,
+                    'credit': move_line_data.credit,
+                    'account_id': move_line_data.account_id.id,
+                    'partner_id': invoice.partner_id.id,
+                    'ref': ref,
+                    'date': move_line_data.date,
+                    'currency_id': move_line_data.currency_id.id,
+                    'amount_currency': move_line_data.amount_currency and direction * move_line_data.amount_currency or 0.0,
+                    'name': move_line_data.name,
+                    'tax_code_id': move_line_data.tax_code_id.id,
+                    'tax_amount': move_line_data.tax_amount,
+                }
+                lines.append((0, 0, l3))
+        else:
+            if amount_discount > 0.0:
+                for line in invoice.invoice_line:
+                    line_tax_amount = 0.0
+                    tax_account_id = tax_code_id = tax_base = tax_code = False
+                    
+                    for tax in tax_obj.compute(cr, uid, line.invoice_line_tax_id, line.price_subtotal / line.quantity, line.quantity, invoice.address_invoice_id.id, line.product_id, invoice.partner_id):    
+                        line_tax_amount += tax['amount']
+                    line_total = line.price_subtotal + line_tax_amount
+                    invoice_res_amount = invoice.amount_total
+                    line_ratio = line_total / invoice_res_amount
+                    
+                    if line.invoice_line_tax_id:
+                        total_tax_amount = tax_amount_currency = 0.0
+                        for tax_id in line.invoice_line_tax_id:
+                            tax_data = tax_obj.browse(cr, uid, tax_id.id, context=context)
+                            discount_ratio = amount_discount * line_ratio
+                            tax_amt = round((discount_ratio * tax_data.amount), int(config['price_accuracy']))
+                            tax_real_amt = round((tax_amt / (1 + tax_data.amount)), int(config['price_accuracy']))
+                            total_tax_amount += tax_real_amt
+
+                            tax_base = tax_data.base_code_id.id
+                            tax_code = tax_data.tax_code_id.id  
+                            tax_invoice_id = invoice_tax_obj.search(cr, uid, [('invoice_id', '=', invoice.id), ('tax_code_id', '=', tax_code), ('base_code_id', '=', tax_base)])
+                        
+                            for tax_id2 in tax_invoice_id:
+                                tax_value = invoice_tax_obj.browse(cr, uid, tax_id2)
+                                tax_account_id = tax_value.account_id.id
+                                tax_code_id = tax_value.tax_code_id.id
+
+                            if invoice.company_id.currency_id.id <> invoice.currency_id.id:
+                                tax_amount_currency = cur_obj.compute(cr, uid, invoice.currency_id.id, invoice.company_id.currency_id.id, tax_real_amt, context=context)
+                            l3 = {
+                                'debit': direction * tax_real_amt < 0 and abs(tax_real_amt) or 0.0,
+                                'credit': direction * tax_real_amt > 0 and abs(tax_real_amt) or 0.0,
+                                'account_id': tax_account_id,
+                                'partner_id': invoice.partner_id.id,
+                                'ref': ref,
+                                'date': date,
+                                'currency_id': currency_id,
+                                'amount_currency': tax_amount_currency and direction * tax_amount_currency or 0.0,
+                                'tax_code_id': tax_code_id,
+                                'tax_amount': -tax_real_amt,
+                                'name': name,
+                            }
+                            lines.append((0, 0, l3))
+        ### When we make payment by pay invoice wizard and if found the discount moves in wizard discount move then directly take the entry from the wizard
+        if 'discount_move_ids' in context and context['discount_move_ids']:
+            move_line = context['discount_move_ids']
+            for move_line_id in move_line:
+                move_line_data = move_line_obj_memory.browse(cr, uid, move_line_id)
+                l4 = {
+                    'debit': move_line_data.debit,
+                    'credit':move_line_data.credit,
+                    'account_id': move_line_data.account_id.id,
+                    'partner_id': invoice.partner_id.id,
+                    'ref':ref,
+                    'date': move_line_data.date,
+                    'currency_id': move_line_data.currency_id.id,
+                    'amount_currency': move_line_data.amount_currency and direction * move_line_data.amount_currency or 0.0,
+                    'name': move_line_data.name,
+                    'tax_code_id': move_line_data.tax_code_id.id,
+                    'tax_amount': -move_line_data.tax_amount,
+                }
+                lines.append((0, 0, l4))
+        else:
+            if amount_discount > 0:
+                account_id = False
+                if 'account_id' in context and context['account_id']:
+                    account_id = context['account_id']
+                elif 'pay_cash_dis_acc' in context and context['pay_cash_dis_acc']:
+                    account_id = context['pay_cash_dis_acc']
+                else:
+                    account_id = self._get_account(cr, uid, ids , pay_amount, invoice.payment_term.id, context=context)
+                
+                fpos = invoice.fiscal_position or False
+                if account_id:
+                    account_id = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, account_id)
+
+                for line in invoice.invoice_line:
+                    tax_account_id = base_code_id = False  
+                    tax_base = tax_code = False
+                    
+                    discount_amount_currency = line_tax_amount = total_tax_amount = 0.0  
+                    for tax in tax_obj.compute(cr, uid, line.invoice_line_tax_id, line.price_subtotal/line.quantity, line.quantity, invoice.address_invoice_id.id, line.product_id, invoice.partner_id):    
+                        line_tax_amount += tax['amount']
+                    line_total = line.price_subtotal + line_tax_amount
+                    invoice_res_amount = invoice.amount_total
+                    line_ratio = line_total / invoice_res_amount
+
+                    discount_ratio = amount_discount * line_ratio
+                    
+                    for tax_id in line.invoice_line_tax_id:
+                        tax_data = tax_obj.browse(cr, uid, tax_id.id, context=context)
+                        tax_amt = round((discount_ratio * tax_data.amount), int(config['price_accuracy']))
+                        tax_real_amt = round((tax_amt / (1 + tax_data.amount)), int(config['price_accuracy']))
+                        total_tax_amount += tax_real_amt
+
+                        tax_base = tax_data.base_code_id.id
+                        tax_code = tax_data.tax_code_id.id
+                        tax_invoice_id = invoice_tax_obj.search(cr, uid, [('invoice_id', '=', invoice.id), ('tax_code_id', '=', tax_code), ('base_code_id', '=', tax_base)])
+                        
+                        for tax_id2 in tax_invoice_id:
+                            tax_value = invoice_tax_obj.browse(cr, uid, tax_id2)
+                            tax_account_id = tax_value.account_id.id
+                            base_code_id = tax_value.base_code_id.id
+
+                    if invoice.company_id.currency_id.id <> invoice.currency_id.id:
+                        discount_amount = discount_ratio - total_tax_amount
+                        discount_amount_currency = cur_obj.compute(cr, uid, invoice.currency_id.id, invoice.company_id.currency_id.id, discount_amount, context=context)
+                    l4 = {
+                        'debit': direction * (discount_ratio - total_tax_amount) < 0 and abs(discount_ratio - total_tax_amount) or 0.0,
+                        'credit': direction * (discount_ratio - total_tax_amount) > 0 and abs(discount_ratio - total_tax_amount) or 0.0,
+                        'account_id': account_id,
+                        'partner_id': invoice.partner_id.id,
+                        'ref': ref,
+                        'date': date,
+                        'currency_id': currency_id,
+                        'amount_currency': discount_amount_currency and direction * discount_amount_currency or 0.0,
+                        'tax_code_id': base_code_id,
+                        'tax_amount': -(discount_ratio - total_tax_amount),
+                        'name': name,
+                    }
+                    lines.append((0, 0, l4))
+        
+        ########################### for currency difference#################
+        currency_diff = invoice_amount = payment_line_amount = 0.0
+        
+        for line in invoice.move_id.line_id:
+            move_line_data = move_line_obj.browse(cr, uid, line.id, context=context)
+            invoice_amount += line.debit
+        
+        for payment_line in invoice.payment_ids:
+            if payment_line.debit > 0.0:
+                payment_line_amount += payment_line.debit 
+            elif payment_line.credit > 0.0:
+                payment_line_amount += payment_line.credit
+                
+        payment_line_amount += pay_amount
+
+        if journal_currency != invoice.currency_id.id or invoice.currency_id.id != invoice.company_id.currency_id.id:
+            currency_diff = invoice_amount - payment_line_amount
+            expense_acc = invoice.company_id.expense_account_id
+            revenue_acc = invoice.company_id.revenue_account_id
+            partner_acc_id = curr_diff_account_id = False
+            ## Account selection############
+            if currency_diff < 0.00:
+                curr_diff_account_id = expense_acc.id
+            elif currency_diff > 0.00:
+                curr_diff_account_id = revenue_acc.id
+            ###### set fiscal position for the currency_diff account
+            fpos = invoice.fiscal_position or False
+            if curr_diff_account_id:
+                curr_diff_account_id = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, curr_diff_account_id)
+
+            if currency_diff < 0.00 and invoice.type in ['in_invoice','out_refund'] or currency_diff > 0.00 and invoice.type in ['out_invoice','in_refund']:
+                l5 = {
+                    'ref': ref,
+                    'date': date,
+                    'partner_id': invoice.partner_id.id,
+                    'account_id': invoice.account_id.id,
+                    'credit': abs(currency_diff),
+                    'debit': 0.0,
+                    'amount_currency': 0.0,
+                    'name': name,
+                }
+                lines.append((0, 0, l5))
+                
+                l6 = {
+                    'ref': ref,
+                    'date': date,
+                    'partner_id': invoice.partner_id.id,
+                    'account_id': curr_diff_account_id,
+                    'credit': 0.0,
+                    'debit': abs(currency_diff),
+                    'amount_currency': 0.0,
+                    'name': name,
+                }
+                lines.append((0, 0, l6))
+            
+            if currency_diff > 0.00 and invoice.type in ['in_invoice','out_refund'] or currency_diff < 0.00 and invoice.type in ['out_invoice','in_refund']:
+                l5 = {
+                    'ref': ref,
+                    'date': date,
+                    'partner_id': invoice.partner_id.id,
+                    'account_id': invoice.account_id.id,
+                    'credit': 0.0,
+                    'debit': abs(currency_diff),
+                    'amount_currency': 0.0,
+                    'name': name,
+                }
+                lines.append((0, 0, l5))
+                
+                l6 = {
+                    'ref': ref,
+                    'date': date,
+                    'partner_id': invoice.partner_id.id,
+                    'account_id': curr_diff_account_id,
+                    'credit': abs(currency_diff),
+                    'debit': 0.0,
+                    'amount_currency': 0.0,
+                    'name': name,
+                }
+                lines.append((0, 0, l6))
+                
+        move = {'ref': ref, 'line_id': lines, 'journal_id': pay_journal_id, 'period_id': period_id, 'date': date}
+        move_id = move_obj.create(cr, uid, move, context=context)
+
+        line_ids = []
+        total = 0.0
+        line = self.pool.get('account.move.line')
+        cr.execute('SELECT id FROM account_move_line WHERE move_id IN (%s, %s)', (move_id, invoice.move_id.id,))
+
+        lines = line.browse(cr, uid, map(lambda x: x[0], cr.fetchall()) )
+        for l in lines + invoice.payment_ids:
+            if l.account_id.id == src_account_id:
+                line_ids.append(l.id)
+                total += (l.debit or 0.0) - (l.credit or 0.0)
+        if (not round(total, int(config['price_accuracy']))) or writeoff_acc_id:
+            self.pool.get('account.move.line').reconcile(cr, uid, line_ids, 'manual', writeoff_acc_id, writeoff_period_id, writeoff_journal_id, context)
+        else:
+            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
+        self.pool.get('account.invoice').write(cr, uid, ids, {}, context=context)
+        return True
+
+account_invoice()
+
+class account_bank_statement_reconcile(osv.osv):
+    _inherit='account.bank.statement.reconcile'
+    def name_get(self, cursor, user, ids, context=None):
+        res = []
+        res = super(account_bank_statement_reconcile, self).name_get(cursor, user, ids, context)   
+        for o in self.browse(cursor, user, ids, context=context):
+            data = res[0][1] + o.name
+            res.append((o.id, data))
+        return res
+account_bank_statement_reconcile()    
+
+class account_bank_statement_reconcile_line(osv.osv):
+    _inherit='account.bank.statement.reconcile.line'
+    _columns = {
+        'tax_code_id': fields.many2one('account.tax.code', 'Tax Account'),
+    }
+account_bank_statement_reconcile_line()
+
+class res_company(osv.osv):
+    _inherit  = "res.company"
+    _columns = {
+        'expense_account_id': fields.many2one('account.account', 'Account for Expense from Exchange Rate Difference', required=True),
+        'revenue_account_id': fields.many2one('account.account', 'Account for Revenue from Exchange Rate Difference', required=True),
+    }
+res_company()
+
+class res_company_wizard(osv.osv_memory):
+    _name = 'res.company.wizard'
+    
+    _columns = {
+        'expense_account_id': fields.many2one('account.account', 'Account for Expense from Exchange Rate Difference', required=True),
+        'revenue_account_id': fields.many2one('account.account', 'Account for Revenue from Exchange Rate Difference', required=True),
+    }
+
+    def set_default(self, cr, uid, ids, context=None):
+        company_id = self.pool.get('res.users').browse(cr,uid,[uid],context)[0].company_id
+        for o in self.browse(cr, uid, ids, context=context):
+             self.pool.get('res.company').write(cr, uid, [company_id.id], {'expense_account_id': o.expense_account_id.id, 'revenue_account_id': o.revenue_account_id.id})
+        return {
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': 'ir.actions.configuration.wizard',
+            'type': 'ir.actions.act_window',
+            'target': 'new',
+         }
+
+    def action_cancel(self, cr, uid, ids, context=None):
+        return {
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': 'ir.actions.configuration.wizard',
+            'type': 'ir.actions.act_window',
+            'target': 'new',
+        }
+
+res_company_wizard()
+
+class account_bank_statement(osv.osv):
+    _inherit="account.bank.statement"
+
+    def _end_balance(self, cr, uid, ids, name, attr, context=None):
+        res_currency_obj = self.pool.get('res.currency')
+        res_users_obj = self.pool.get('res.users')
+        tax_obj = self.pool.get('account.tax')
+        res = {}
+
+        statements = self.browse(cr, uid, ids, context=context)
+        for statement in statements:
+            res[statement.id] = statement.balance_start
+            currency_id = statement.currency.id
+            for line in statement.move_line_ids:
+                if line.debit > 0 and line.account_id.id == statement.journal_id.default_debit_account_id.id:
+                    res[statement.id] += line.amount_currency or line.debit
+                elif line.credit > 0 and line.account_id.id == statement.journal_id.default_credit_account_id.id:
+                    res[statement.id] += line.amount_currency or -line.credit
+                    
+            if statement.state == 'draft':
+                for line in statement.line_ids:
+                    tax = 1
+                    if line.type == 'general' and line.tax_type == 'tax_excluded' and line.tax_id:
+                        tax = 1 + tax_obj.browse(cr, uid, line.tax_id.id, context=context).amount
+                    res[statement.id] += line.amount * tax - line.cash_discount * tax
+
+        for r in res:
+            res[r] = round(res[r], int(config['price_accuracy']))
+        return res
+
+    _columns = {
+        'balance_end': fields.function(_end_balance, method=True, string = 'Balance'),
+    }
+    
+    def button_confirm(self, cr, uid, ids, context={}):
+        done = []
+        account_bank_statement_line_obj = self.pool.get('account.bank.statement.line')
+        account_move_obj = self.pool.get('account.move')
+        account_move_line_obj = self.pool.get('account.move.line')
+        tax_obj = self.pool.get('account.tax')
+        res_currency_obj = self.pool.get('res.currency')
+        res_users_obj = self.pool.get('res.users')
+        
+        company_currency_id = res_users_obj.browse(cr, uid, uid, context=context).company_id.currency_id.id
+        expense_acc = res_users_obj.browse(cr, uid, uid, context=context).company_id.expense_account_id.id
+        revenue_acc = res_users_obj.browse(cr, uid, uid, context=context).company_id.revenue_account_id.id
+        
+        for st in self.browse(cr, uid, ids, context):
+            if not st.state == 'draft':
+                continue
+            if not (abs(st.balance_end - st.balance_end_real) < 0.0001):
+                raise osv.except_osv(_('Error!'),
+                        _('The statement balance is incorrect!\n') +
+                        _('The expected balance (%.2f) is different than the computed one. (%.2f)') % (st.balance_end_real, st.balance_end))
+            if (not st.journal_id.default_credit_account_id) or (not st.journal_id.default_debit_account_id):
+                raise osv.except_osv(_('Configuration Error!'),
+                    _('Please verify that an account is defined in the journal.'))
+            currency_id = st.currency.id <> company_currency_id and st.currency.id
+            
+            for line in st.move_line_ids:
+                if line.state <> 'valid':
+                    raise osv.except_osv(_('Error!'),
+                        _('The account entry lines are not in valid state.'))
+            # for bank.statement.lines
+            # In line we get reconcile_id on bank.ste.rec.
+            # in bank stat.rec we get line_new_ids on bank.stat.rec.line
+            new_end_value = 0.0
+            for move in st.line_ids:
+                context.update({'date': move.date,})
+                move_id = account_move_obj.create(cr, uid, {
+                    'journal_id': st.journal_id.id,
+                    'period_id': st.period_id.id,
+                    'date': move.date,
+                }, context=context)
+                account_bank_statement_line_obj.write(cr, uid, [move.id], {
+                    'move_ids': [(4, move_id, False)]
+                })
+                if not move.amount:
+                    continue
+                torec = []
+                account_id = move.amount >= 0 and st.journal_id.default_credit_account_id.id or st.journal_id.default_debit_account_id.id
+                acc_cur = move.amount <= 0 and st.journal_id.default_debit_account_id or move.account_id
+                amount = res_currency_obj.compute(cr, uid, st.currency.id,
+                    company_currency_id, move.amount, context=context,
+                    account = acc_cur)
+
+                st_tax_amount = move_tax_amount = tax_real_amt = 0.0
+                st_base_code_id = curr_diff_account_id = False
+                
+                if move.type == 'general' and move.tax_type <> 'untaxed':
+                    if move.tax_type == 'tax_included':
+                        st_tax_data = tax_obj.browse(cr, uid, move.tax_id.id, context=context)
+                        st_tax_amt = move.amount * st_tax_data.amount
+                        st_tax_amount = st_tax_amt / (1 + st_tax_data.amount)
+                        st_base_code_id = st_tax_data.base_code_id.id
+                        amount = amount - st_tax_amount
+                        tax_pay = st_tax_amount
+                        st_tax_amount = 0.0
+                    else:
+                        st_tax_data = tax_obj.browse(cr, uid, move.tax_id.id, context=context)
+                        st_tax_amt = move.amount * st_tax_data.amount
+                        st_tax_amount = st_tax_amt
+                        tax_pay = st_tax_amount
+                        st_base_code_id = st_tax_data.base_code_id.id
+                    
+                    if not st_tax_data.tax_code_id.id:
+                        tax_val = {
+                            'name': move.name,
+                            'date': move.date,
+                            'ref': move.ref,
+                            'move_id': move_id,
+                            'partner_id': move.partner_id and move.partner_id.id,
+                            'account_id': move.account_id and move.account_id.id,
+                            'credit': tax_pay > 0 and abs(tax_pay) or 0.0,
+                            'debit': tax_pay < 0 and abs(tax_pay) or 0.0,
+                            'statement_id': st.id,
+                            'journal_id': st.journal_id.id,
+                            'period_id': st.period_id.id,
+                            'currency_id': currency_id,
+                            'tax_code_id': st_base_code_id,
+                            'tax_amount': move_tax_amount,
+                        }
+                        torec.append(account_move_line_obj.create(cr, uid, tax_val, context=context))    
+                
+                val = {
+                    'name': move.name,
+                    'date': move.date,
+                    'ref': move.ref,
+                    'move_id': move_id,
+                    'partner_id': move.partner_id and move.partner_id.id,
+                    'account_id': move.account_id and move.account_id.id,
+                    'credit': amount > 0 and abs(amount) or 0.0,
+                    'debit': amount < 0 and abs(amount) or 0.0,
+                    'statement_id': st.id,
+                    'journal_id': st.journal_id.id,
+                    'period_id': st.period_id.id,
+                    'currency_id': currency_id,
+                    'tax_code_id': st_base_code_id,
+                    'account_tax_id': move.tax_id.id,
+                    'tax_amount': move_tax_amount,
+                }
+                amount = res_currency_obj.compute(cr, uid, st.currency.id,
+                    company_currency_id, move.amount, context=context,
+                    account=acc_cur)
+                val['amount_currency'] = currency_id and -move.amount or 0.00
+
+                if move.account_id.currency_id and \
+                        st.currency.id <> company_currency_id <> move.account_id.currency_id.id <> st.currency_id:
+                    
+                    val['currency_id'] = move.account_id.currency_id.id
+                    val['amount_currency'] = res_currency_obj.compute(cr, uid, company_currency_id,
+                                    move.account_id.currency_id.id, -amount, context=context, account = acc_cur)
+
+                torec.append(account_move_line_obj.create(cr, uid, val, context=context))
+                
+                newline_sum = 0.0
+                if move.reconcile_id and move.reconcile_id.line_new_ids:
+                    newline_amount_currency = 0.0
+                    for newline in move.reconcile_id.line_new_ids:
+                        newline_amount_currency = res_currency_obj.compute(cr, uid, st.currency.id,
+                                                        company_currency_id, newline.amount, context=context)
+                        newline_amount_currency = round(newline_amount_currency, int(config['price_accuracy'])) 
+                        newline_sum += newline_amount_currency
+
+                        account_move_line_obj.create(cr, uid, {
+                            'name': newline.name or move.name,
+                            'date': move.date,
+                            'ref': move.ref,
+                            'move_id': move_id,
+                            'partner_id': move.partner_id and move.partner_id.id,
+                            'account_id': newline.account_id and newline.account_id.id,
+                            'debit': newline_amount_currency > 0 and abs(newline_amount_currency) or 0.0,
+                            'credit': newline_amount_currency < 0 and abs(newline_amount_currency) or 0.0,
+                            'statement_id': st.id,
+                            'tax_code_id': newline.tax_code_id.id,
+                            'tax_amount': -newline_amount_currency,
+                            'amount_currency': newline.amount,
+                            'currency_id': currency_id,
+                            'journal_id': st.journal_id.id,
+                            'period_id': st.period_id.id,
+                        }, context=context)
+
+                amount_currency = False
+                if move.reconcile_id and move.reconcile_id.line_ids:
+                    for line in move.reconcile_id.line_ids:
+                        move_line_data = self.pool.get('account.move.line').browse(cr, uid, line.id, context=context)
+                        if st.currency.id <> company_currency_id:
+                            balance = reconcile_sum = 0.0
+                            context.update({'amount': move_line_data.amount_currency, 'currency_id': move_line_data.currency_id.id  or company_currency_id})
+                            reconcile_data = self.pool.get("account.bank.statement.reconcile").browse(cr, uid, move.reconcile_id.id, context=context)
+                            balance_sum = reconcile_data.total_balance
+                            for line_reconcile in reconcile_data.line_new_ids:
+                                reconcile_sum += line_reconcile.amount
+                            balance = round((balance_sum - reconcile_sum), int(config['price_accuracy']))
+                            
+                            if st.currency.id <> move_line_data.currency_id.id:
+                                invoice_cret_balance = 0.0 
+                                payment_balance = 0.0
+                                context.update({'date': move_line_data.date})
+                                inv_create_balance = res_currency_obj.compute(cr, uid, company_currency_id,
+                                                            st.currency.id, amount, context=context)
+                                currenct_date = time.strftime('%Y-%m-%d')
+                                context.update({'date': currenct_date})
+                                payment_balance = res_currency_obj.compute(cr, uid, company_currency_id,
+                                                        st.currency.id, amount, context=context)
+                                balance = round(inv_create_balance - payment_balance, int(config['price_accuracy']))
+    
+                            ## Account selection############
+                            if balance < 0.00:
+                                curr_diff_account_id = expense_acc
+                            elif balance > 0.00:
+                                curr_diff_account_id = revenue_acc
+                            #######################################
+                            
+                            ###### set fiscal position for the currency_diff account
+                            fpos = move_line_data.invoice.fiscal_position or False
+                            if curr_diff_account_id:
+                                curr_diff_account_id = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, curr_diff_account_id)
+                            if balance <> 0.0:
+                                currency_diff1 = account_move_line_obj.create(cr, uid, {
+                                    'name': move.name,
+                                    'date': move.date,
+                                    'ref': move.ref,
+                                    'move_id': move_id,
+                                    'partner_id': move.partner_id and move.partner_id.id,
+                                    'account_id': move.account_id.id,
+                                    'credit': balance < 0.0 and abs(balance) or 0.0,
+                                    'debit': balance > 0.0 and abs(balance) or 0.0,
+                                    'statement_id': st.id,
+                                    'journal_id': st.journal_id.id,
+                                    'period_id': st.period_id.id,
+                                    'amount_currency': 0.0,
+                                    'currency_id': currency_id,
+                                }, context=context)
+    
+                                currency_diff2 = account_move_line_obj.create(cr, uid, {
+                                    'name': move.name,
+                                    'date': move.date,
+                                    'ref': move.ref,
+                                    'move_id': move_id,
+                                    'partner_id': move.partner_id and move.partner_id.id,
+                                    'account_id': curr_diff_account_id,
+                                    'credit': balance > 0.0 and abs(balance) or 0.0,
+                                    'debit': balance < 0.0 and abs(balance) or 0.0,
+                                    'statement_id': st.id,
+                                    'journal_id': st.journal_id.id,
+                                    'period_id': st.period_id.id,
+                                    'amount_currency': 0.0,
+                                    'currency_id': currency_id,
+                                }, context=context)
+                                
+                                if move_line_data.invoice.currency_id.id != company_currency_id:
+                                    torec.append(currency_diff1)
+
+                if currency_id:
+                    amount_currency = res_currency_obj.compute(cr, uid, company_currency_id, st.currency.id,
+                        (amount + st_tax_amount - newline_sum), context=context, account = acc_cur)
+                
+                account_move_line_obj.create(cr, uid, {
+                    'name': move.name,
+                    'date': move.date,
+                    'ref': move.ref,
+                    'move_id': move_id,
+                    'partner_id': move.partner_id and move.partner_id.id,
+                    'account_id': account_id,
+                    'credit': (amount + st_tax_amount - newline_sum) < 0 and abs(amount + st_tax_amount - newline_sum) or 0.0,
+                    'debit': (amount + st_tax_amount - newline_sum) > 0 and abs(amount + st_tax_amount - newline_sum) or 0.0,
+                    'statement_id': st.id,
+                    'journal_id': st.journal_id.id,
+                    'period_id': st.period_id.id,
+                    'amount_currency': amount_currency,
+                    'currency_id': currency_id,
+                    }, context=context)
+
+                account_move_line_obj.write(cr, uid, [x.id for x in
+                        account_move_obj.browse(cr, uid, move_id, context=context).line_id], {'statement_id': st.id,})
+                for line in account_move_line_obj.browse(cr, uid, [x.id for x in
+                        account_move_obj.browse(cr, uid, move_id, context=context).line_id], context=context):
+                    if line.state <> 'valid':
+                        raise osv.except_osv(_('Error!'),
+                                _('Account move line "%s" is not valid') % line.name)
+                if move.reconcile_id and move.reconcile_id.line_ids:
+                    torec += map(lambda x: x.id, move.reconcile_id.line_ids)
+                    #try:
+                    if abs(move.reconcile_amount - move.amount) < 0.0001:
+                        writeoff_acc_id = False
+                        #There should only be one write-off account!
+                        for entry in move.reconcile_id.line_new_ids:
+                            writeoff_acc_id = entry.account_id.id
+                            break
+                        account_move_line_obj.reconcile(cr, uid, torec, 'statement', writeoff_acc_id=writeoff_acc_id, writeoff_period_id=st.period_id.id, writeoff_journal_id=st.journal_id.id, context=context)
+                    else:
+                        account_move_line_obj.reconcile_partial(cr, uid, torec, 'statement', context)
+                    #except:
+                    #    raise osv.except_osv(_('Error!'), _('Unable to reconcile entry "%s": %.2f') % (move.name, move.amount))
+
+                if st.journal_id.entry_posted:
+                    account_move_obj.write(cr, uid, [move_id], {'state': 'posted'})
+            done.append(st.id)
+        
+        self.write(cr, uid, done, {'state': 'confirm'}, context=context)
+        return True
+
+account_bank_statement()
+
+class account_bank_statement_line(osv.osv):
+    _inherit="account.bank.statement.line"
+    _columns = {
+        'tax_id': fields.many2one('account.tax', 'Tax'),
+        'tax_type': fields.selection([
+            ('untaxed', 'Untaxed'),
+            ('tax_included', 'Tax included'),
+            ('tax_excluded', 'Tax excluded')], 'Tax method', required=True,),
+        'cash_discount': fields.float('Cash Discount'),
+        'transferred_amount': fields.float('Transferred'),
+    }
+
+    def onchange_account_id(self, cr, uid, ids, account_id, context=None):
+        result = {}
+        tax = False
+        taxes = self.pool.get('account.account').browse(cr, uid, account_id, context=context).tax_ids
+        for tax_id in taxes:
+            tax = tax_id.id
+        result['tax_id'] = tax
+        return {'value': result}
+
+    def onchange_cash_discount(self, cr, uid, ids, amount, cash_discount, context=None):
+        return {'value': {'transferred_amount': amount - cash_discount}}
+    
+    def onchange_transferred_amount(self, cr, uid, ids, amount, transferred_amount, context=None):
+        return {'value': {'cash_discount': amount - transferred_amount}}
+
+    def onchange_type(self, cr, uid, ids, type, context=None):
+        result={}
+        tax_id = self.pool.get('account.tax').search(cr, uid, [])
+
+        if type == 'general' and tax_id:
+           result['tax_id'] = tax_id[0]
+        else:
+            result['tax_id'] =  False
+        return {'value': result}
+    
+    _defaults = {
+        'tax_type':lambda *a: 'untaxed',
+    }
+account_bank_statement_line()
+
+
+class account_move_line(osv.osv):
+    _inherit="account.move.line"
+    
+    def reconcile_discount(self, cr, uid, ids, type='auto', discount_acc_id=False, discount_period_id=False, discount_journal_id=False, context={}):
+        tax_obj = self.pool.get('account.tax')
+        cur_obj = self.pool.get('res.currency')
+        partner_obj = self.pool.get('res.partner')
+        res_users_obj = self.pool.get('res.users')
+
+        id_set = ','.join(map(str, ids))
+        reconcile_lines = []
+        credit = debit = currency = 0.0
+        currency_id = account_id = partner_id = invoice = ref = False
+        discount_account = curr_diff_account = False
+        if discount_acc_id:
+            discount_account = self.pool.get('account.account').browse(cr, uid, discount_acc_id, context=context)
+        lines = self.browse(cr, uid, ids, context=context)
+        unrec_lines = filter(lambda x: not x['reconcile_id'], lines)
+        
+        for line in unrec_lines:
+            if line.invoice:
+                invoice = line.invoice
+            if line.state <> 'valid':
+                raise osv.except_osv(_('Error!'),
+                        _('Entry "%s" is not valid !') % line.name)
+            credit += line['credit']
+            debit += line['debit']
+            currency += line['amount_currency'] or 0.0
+            currency_id = currency_id or line['currency_id']
+            account_id = line['account_id']['id']
+            account_type = line['account_id']['type']
+            partner_id = line['partner_id'] and line['partner_id']['id']
+            ref = ref or line['ref']
+
+        # simple rules for (full) reconciliation w/ cash discount:
+        # if there's foreign currency involved:
+        # - difference in foreign currency is cash discount
+        # - difference in company currency is currency exchange rate difference
+        # - negative difference is expense, positive difference is revenue
+        # if there's no foreign currency:
+        # - difference in foreign currency is 0.00
+        # - difference in company currency is cash discount
+        balance = credit - debit
+        # take fiscal position from invoice, from partner as fallback
+        fpos = invoice and invoice.fiscal_position
+        if not fpos and partner_id:
+            fpos = partner_obj.browse(cr, uid, partner_id, context=context).property_account_position
+        date = context.has_key('date_p') and context['date_p'] or time.strftime('%Y-%m-%d')
+
+        cr.execute('SELECT account_id, reconcile_id '\
+                   'FROM account_move_line '\
+                   'WHERE id IN %s '\
+                   'GROUP BY account_id,reconcile_id',
+                   (tuple(ids),))
+        r = cr.fetchall()
+#TODO: move this check to a constraint in the account_move_reconcile object
+        if (len(r) != 1) and not context.get('fy_closing', False):
+            raise osv.except_osv(_('Error!'), _('Entries are not of the same account or already reconciled!'))
+        if not unrec_lines:
+            raise osv.except_osv(_('Error!'), _('Entry is already reconciled!'))
+        account = self.pool.get('account.account').browse(cr, uid, account_id, context=context)
+        if not context.get('fy_closing', False) and not account.reconcile:
+            raise osv.except_osv(_('Error!'), _('The account is not configured to be reconciled!'))
+        if r[0][1] != None:
+            raise osv.except_osv(_('Error!'), _('Some entries are already reconciled!'))
+
+        # foreign currency
+        if currency_id:
+            # cash discount
+            if not cur_obj.is_zero(cr, uid, currency_id, currency):
+                if currency > 0:
+                    osv.except_osv(_('Error!'), _('There seems to be a surcharge, not a cash discount. Can\'t reconcile this!'))
+                if not discount_acc_id:
+                    raise osv.except_osv(_('Error!'), _('You have to provide a cash discount account!'))
+                if fpos:
+                    discount_acc_id = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, discount_acc_id)
+                # TODO: Check if cash discount amount in company currency should be computed with current date
+                #       or date of last payment or date of invoice
+                company_amount = round(cur_obj.compute(cr, uid, currency_id.id, account.company_id.currency_id.id, currency),
+                    int(config['price_accuracy']))
+                reconcile_lines.append(
+                    (0, 0, {
+                        'name': invoice and invoice.number or 'comment' in context and context['comment'] or _('Cash Discount'),
+                        'ref': ref,
+                        'debit': abs(company_amount),
+                        'credit': 0.0,
+                        'account_id': account_id,
+                        'date': date,
+                        'partner_id': partner_id,
+                        'currency_id': currency_id.id,
+                        'amount_currency': -currency,
+                    })
+                )
+                reconcile_lines.append(
+                    (0, 0, {
+                        'name': invoice and invoice.number or 'comment' in context and context['comment'] or _('Cash Discount'),
+                        'ref': ref,
+                        'debit': 0.0,
+                        'credit': abs(company_amount),
+                        'account_id': discount_acc_id,
+                        'analytic_account_id': context.get('analytic_id', False),
+                        'date': date,
+                        'partner_id': partner_id,
+                        'currency_id': currency_id.id,
+                        'amount_currency': currency,
+                    })
+                )
+                # now the company currency difference needs to be corrected by the cash discount amount
+                balance += company_amount
+
+            # currency difference
+            if not cur_obj.is_zero(cr, uid, account.company_id.currency_id, balance):
+                if balance < 0.0:
+                    curr_diff_account = res_users_obj.browse(cr, uid, uid, context=context).company_id.expense_account_id.id
+                elif balance > 0.0:
+                    curr_diff_account = res_users_obj.browse(cr, uid, uid, context=context).company_id.revenue_account_id.id
+                if fpos:
+                    curr_diff_account = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, curr_diff_account)
+                reconcile_lines.append(
+                    (0, 0, {
+                        'name': invoice and invoice.number or balance < 0.0 and _('Currency Expense') or _('Currency Revenue'),
+                        'ref': ref,
+                        'debit': balance < 0.0 and abs(balance) or 0.0,
+                        'credit': balance > 0.0 and abs(balance) or 0.0,
+                        'account_id': curr_diff_account,
+                        'analytic_account_id': context.get('analytic_id', False),
+                        'date': date,
+                        'partner_id': partner_id,
+                        'currency_id': currency_id.id,
+                        'amount_currency': 0.0,
+                    })
+                )
+                reconcile_lines.append(
+                    (0, 0, {
+                        'name': invoice and invoice.number or balance < 0.0 and _('Currency Expense') or _('Currency Revenue'),
+                        'ref': ref,
+                        'debit': balance > 0.0 and abs(balance) or 0.0,
+                        'credit': balance < 0.0 and abs(balance) or 0.0,
+                        'account_id': account_id,
+                        'date': date,
+                        'partner_id': partner_id,
+                        'currency_id': currency_id.id,
+                        'amount_currency': 0.0,
+                    })
+                )
+        # no foreign currency
+        else:
+            # cash discount
+            if not cur_obj.is_zero(cr, uid, account.company_id.currency_id, balance):
+                if balance > 0:
+                    osv.except_osv(_('Error!'), _('There seems to be a surcharge, not a cash discount. Can\'t reconcile this!'))
+                if not discount_acc_id:
+                    raise osv.except_osv(_('Error!'), _('You have to provide a cash discount account!'))
+                if fpos:
+                    discount_acc_id = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, discount_acc_id)
+                reconcile_lines.append(
+                    (0, 0, {
+                        'name': invoice and invoice.number or 'comment' in context and context['comment'] or _('Cash Discount'),
+                        'ref': ref,
+                        'debit': balance > 0.0 and abs(balance) or 0.0,
+                        'credit': balance < 0.0 and abs(balance) or 0.0,
+                        'account_id': account_id,
+                        'date': date,
+                        'partner_id': partner_id,
+                    })
+                )
+                # take care of taxes for the cash discount
+                # cash discount -> base code
+                # tax amount -> tax code
+                taxed_balance = balance
+                tax_amount = 0.0
+                type = False
+                # guess the type of payment
+                if account.type == 'receivable':
+                    type = balance > 0.0 and 'invoice' or balance < 0.0 and 'refund'
+                elif account.type == 'payable':
+                    type = balance < 0.0 and 'invoice' or balance > 0.0 and 'refund'
+                if discount_account.tax_ids:
+                    for tax in discount_account.tax_ids:
+                        if tax.child_depend:
+                            for ctax in tax.child_ids:
+                                if not type or type == 'invoice':
+                                    tax_amount = round(ctax.tax_sign * ctax.amount * balance,
+                                        int(config['price_accuracy']))
+                                else:
+                                    tax_amount = round(ctax.ref_tax_sign * ctax.amount * balance,
+                                        int(config['price_accuracy']))
+                                reconcile_lines.append(
+                                    (0, 0, {
+                                        'name': invoice and invoice.number or 'comment' in context and context['comment'] or _('Cash Discount'),
+                                        'ref': ref,
+                                        'debit': balance < 0.0 and abs(tax_amount) or 0.0,
+                                        'credit': balance > 0.0 and abs(tax_amount) or 0.0,
+                                        'account_id': type == 'invoice' and ctax.account_collected_id.id or type == 'refund' and ctax.account_paid_id.id,
+                                        'date': date,
+                                        'partner_id': partner_id,
+                                        'tax_code_id': type == 'invoice' and ctax.tax_code_id.id or type == 'refund' and ctax.ref_tax_code_id.id,
+                                        'tax_amount': tax_amount,                                        
+                                    })
+                                )
+                        else:
+                            if not type or type == 'invoice':
+                                tax_amount = round(tax.tax_sign * tax.amount * balance, int(config['price_accuracy']))
+                            else:
+                                tax_amount = round(tax.ref_tax_sign * tax.amount * balance, int(config['price_accuracy']))
+                            reconcile_lines.append(
+                                (0, 0, {
+                                    'name': invoice and invoice.number or 'comment' in context and context['comment'] or _('Cash Discount'),
+                                    'ref': ref,
+                                    'debit': balance < 0.0 and abs(tax_amount) or 0.0,
+                                    'credit': balance > 0.0 and abs(tax_amount) or 0.0,
+                                    'account_id': type == 'invoice' and tax.account_collected_id.id or type == 'refund' and tax.account_paid_id.id,
+                                    'date': date,
+                                    'partner_id': partner_id,
+                                    'tax_code_id': type == 'invoice' and tax.tax_code_id.id or type == 'refund' and tax.ref_tax_code_id.id,
+                                    'tax_amount': tax_amount,
+                                })
+                            )
+                    taxed_balance -= tax_amount
+                    # only post with debit/credit on the first tax. The other rows would be needed for
+                    # tax reports but need to have debit/credit of 0.0. We just need to have an entry
+                    # for the base tax amount.
+                    first_tax = True
+                    for tax in discount_account.tax_ids:
+                        reconcile_lines.append(
+                            (0, 0, {
+                                'name': invoice and invoice.number or 'comment' in context and context['comment'] or _('Cash Discount'),
+                                'ref': ref,
+                                'debit': first_tax and balance < 0.0 and abs(taxed_balance) or 0.0,
+                                'credit': first_tax and balance > 0.0 and abs(taxed_balance) or 0.0,
+                                'account_id': discount_acc_id,
+                                'analytic_account_id': context.get('analytic_id', False),
+                                'date': date,
+                                'partner_id': partner_id,
+                                'tax_code_id': type == 'invoice' and tax.base_code_id.id \
+                                    or type == 'refund' and tax.ref_base_code_id.id,
+                                'tax_amount': taxed_balance,
+                            })
+                        )
+                        first_tax = False
+                else:
+                    reconcile_lines.append(
+                        (0, 0, {
+                            'name': invoice and invoice.number or 'comment' in context and context['comment'] or _('Cash Discount'),
+                            'ref': ref,
+                            'debit': balance < 0.0 and abs(taxed_balance) or 0.0,
+                            'credit': balance > 0.0 and abs(taxed_balance) or 0.0,
+                            'account_id': discount_acc_id,
+                            'analytic_account_id': context.get('analytic_id', False),
+                            'date': date,
+                            'partner_id': partner_id,
+                        })
+                    )
+        if len(reconcile_lines):
+            reconcile_move_id = self.pool.get('account.move').create(cr, uid, {
+                'period_id': discount_period_id,
+                'journal_id': discount_journal_id,
+                'date': date,
+                'state': 'draft',
+                'line_id': reconcile_lines,                
+                })
+            reconcile_line_ids = self.search(cr, uid, [('move_id', '=', reconcile_move_id), ('account_id', '=', account_id)])
+            ids += reconcile_line_ids
+
+        r_id = self.pool.get('account.move.reconcile').create(cr, uid, {
+            'type': type,
+            'line_id': map(lambda x: (4, x, False), ids),
+            'line_partial_ids': map(lambda x: (3, x, False), ids)
+        })
+        wf_service = netsvc.LocalService("workflow")
+        # the id of the move.reconcile is written in the move.line (self) by the create method above
+        # because of the way the line_id are defined: (4, x, False)
+        for id in ids:
+            wf_service.trg_trigger(uid, 'account.move.line', id, cr)
+        return r_id
+    
+account_move_line()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+

=== added file 'account_invoice_cash_discount/account_invoice_cash_discount_view.xml'
--- account_invoice_cash_discount/account_invoice_cash_discount_view.xml	1970-01-01 00:00:00 +0000
+++ account_invoice_cash_discount/account_invoice_cash_discount_view.xml	2011-07-29 01:35:58 +0000
@@ -0,0 +1,268 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+
+        <!-- cash discount -->
+        <record model="ir.ui.view" id="view_cash_discount_form">
+            <field name="name">account.cash.discount.form</field>
+            <field name="model">account.cash.discount</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Cash Discount">
+                    <field name="name" select="1"/>
+                    <field name="delay" select="1"/>
+                    <field name="discount" select="1"/>
+                    <separator string="Cash Discount Account for Supplier and Customer" colspan="4"/>
+                    <field name="discount_account_id" />
+                    <field name="sup_discount_account_id"/>
+                </form>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_cash_discount_tree">
+            <field name="name">account.cash.discount.tree</field>
+            <field name="model">account.cash.discount</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Cash Discount" editable="bottom">
+                    <field name="name" select="1"/>
+                    <field name="delay" select="1"/>
+                    <field name="discount" select="1"/>
+                    <field name="discount_account_id" />
+                    <field name="sup_discount_account_id"/>
+                </tree>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_payment_term_form">
+            <field name="name">account.payment.term.form</field>
+            <field name="model">account.payment.term</field>
+            <field name="inherit_id" ref="account.view_payment_term_form"/>
+            <field name="arch" type="xml">
+                <field name="line_ids" position="after">
+                    <separator string="Cash Discount" colspan="4"/>
+                    <field name="cash_discount_ids" colspan="4"/>
+                </field>
+            </field>
+        </record>
+
+        <record id="bank_statement_form_view1" model="ir.ui.view">
+            <field name="name">account.bank.statement.form</field>
+            <field name="model">account.bank.statement</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account.view_bank_statement_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//button[@string='Import Invoice']" position="replace">
+                        <button name="%(wizard_populate_statement_from_inv1)d"  type="action" string="Import Invoice" attrs="{'invisible': [('state', '=', 'confirm')]}"/>
+                </xpath>
+            </field>
+        </record>
+
+        <record id="bank_statement_reconcile_form_view1" model="ir.ui.view">
+            <field name="name">account.bank.statement.reconcile.form</field>
+            <field name="model">account.bank.statement.reconcile</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account.view_bank_statement_reconcile"/>
+            <field name="arch" type="xml">
+                <field name="total_new" position="replace">
+                    <field name="total_new" string="Total Write-Off/Cash Discount"/>
+                </field>
+            </field>
+        </record>
+        
+        <record id="view_bank_statement_reconcile_tree" model="ir.ui.view">
+            <field name="name">account.bank.statement.reconcile.tree</field>
+            <field name="model">account.bank.statement.reconcile</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Reconcile">
+                    <field name="name" select="1"/>
+                    <field name="total_amount"/>
+                    <field name="total_currency"/>
+                    <field name="total_entry"/>
+                    <field name="total_new"/>
+                    <field name="total_balance"/>
+                </tree>
+            </field>
+        </record>
+        
+        <record id="bank_statement_reconcile_form_view2" model="ir.ui.view">
+            <field name="name">account.bank.statement.reconcile.form</field>
+            <field name="model">account.bank.statement.reconcile</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account.view_bank_statement_reconcile"/>
+            <field name="arch" type="xml">
+                <xpath expr="//tree[@string='Write-Off']" position="replace">
+                    <tree editable="bottom" string="Write-Off and Cash Discount">
+                            <field name="account_id" domain="[('type', '&lt;&gt;', 'view'), ('type', '&lt;&gt;', 'consolidation')]"/>
+                            <field name="amount"/>
+                            <field name="name"/>
+                        </tree>
+                </xpath>
+            </field>
+        </record>
+
+        <record id="account_payment_term_line_view1" model="ir.ui.view">
+            <field name="name">account.payment.term.line.form</field>
+            <field name="model">account.payment.term.line</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account.view_payment_term_line_form"/>
+            <field name="arch" type="xml">
+                <field name="days2" position="after">
+                    <field name="compl_cash_discount"/>
+                    <field name="day_tolerance" required="1"/>
+                </field>
+            </field>
+        </record>
+
+        <record id="view_res_company_inherit_form" model="ir.ui.view">
+            <field name="name">res.company.inherit.form</field>
+            <field name="model">res.company</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.view_company_form"/>
+            <field name="arch" type="xml">
+                <field name="currency_id" position="after">
+                    <field name="expense_account_id" string="Acc for Exp from Curr Diff"/>
+                    <field name="revenue_account_id" string="Acc for Rev from Curr Diff"/>
+                </field>
+            </field>
+        </record>
+
+        <record id="view_res_company_wizard" model="ir.ui.view">
+            <field name="name">Company Exchage Rate Difference Accounts</field>
+            <field name="model">res.company.wizard</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Currency Difference Account Configuration">
+                    <field name="expense_account_id"/>
+                    <newline/>
+                    <field name="revenue_account_id"/>
+                    <newline/>
+                    <group col="4" colspan="4">
+                        <button icon="gtk-cancel" name="action_cancel" type="object" special="cancel" string="Cancel"/>
+                        <button icon="gtk-ok" name="set_default" string="Set Default" type="object"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_res_company_wizard" model="ir.actions.act_window">
+            <field name="name">Company Currency Difference Accounts</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">res.company.wizard</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+
+        <record id="config_wizard_res_company_wizard" model="ir.actions.todo">
+            <field name="name">Company Currency Difference Accounts</field>
+            <field name="note">This configuration step sets the default accounts for expense and revenue generated by exchange rate differences</field>
+            <field name="action_id" ref="action_res_company_wizard"/>
+        </record>
+       
+       
+        <record model="ir.ui.view" id="view_bank_statement_reconcile_view122">
+            <field name="name">account.bank.statement.reconcile.form</field>
+            <field name="model">account.bank.statement.reconcile</field>
+            <field name="inherit_id" ref="account.view_bank_statement_reconcile" />
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='line_new_ids']/tree/field[@name='name']" position="after">
+                    <field name="tax_code_id"/>
+                </xpath>
+            </field>
+        </record>
+
+        <record id="view_move_line_tree1" model="ir.ui.view">
+            <field name="name">account.move.line.tree</field>
+            <field name="model">account.move.line</field>
+            <field name="type">tree</field>
+            <field eval="1" name="priority"/>
+            <field name="inherit_id" ref="account.view_move_line_tree"/>
+            <field name="arch" type="xml">
+                <field name="account_tax_id" position="after">
+                    <field name="tax_code_id"/>
+                    <field name="tax_amount"/>
+                </field>
+            </field>
+        </record>
+        
+        <record model="ir.ui.view" id="view_bank_statement_acc_on_change_form">
+            <field name="name">account.bank.statement.form1</field>
+            <field name="model">account.bank.statement</field>
+            <field name="inherit_id" ref="account.view_bank_statement_form" />
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <field name="account_id" position="replace">
+                    <field name="account_id" on_change="onchange_account_id(account_id)"/>
+                </field>
+            </field>
+        </record>
+        
+        <record model="ir.ui.view" id="view_bank_statement_tax_tree">
+            <field name="name">account.bank.statement.tree1</field>
+            <field name="model">account.bank.statement</field>
+            <field name="inherit_id" ref="account.view_bank_statement_form"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='line_ids']/tree/field[@name='reconcile_amount']" position="after">
+                    <field name="tax_id"/>
+                    <field name="tax_type"/>
+                </xpath>
+            </field>
+        </record>
+        
+        <record model="ir.ui.view" id="view_bank_statement_tax_form">
+            <field name="name">account.bank.statement.form1</field>
+            <field name="model">account.bank.statement</field>
+            <field name="inherit_id" ref="account.view_bank_statement_form" />
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='line_ids']/form/field[@name='ref']" position="after">
+                    <field name="tax_id"/>
+                    <field name="tax_type"/>
+                </xpath>
+            </field>
+        </record>
+        
+        <record model="ir.ui.view" id="view_bank_statement_type_on_change_form">
+            <field name="name">account.bank.statement.form1</field>
+            <field name="model">account.bank.statement</field>
+            <field name="inherit_id" ref="account.view_bank_statement_form" />
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <field name="type" position="replace">
+                    <field name="type" on_change="onchange_type(type)"/>
+                </field>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_bank_statement_tax_tree1">
+            <field name="name">account.bank.statement.tree1</field>
+            <field name="model">account.bank.statement</field>
+            <field name="inherit_id" ref="account.view_bank_statement_form"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='line_ids']/tree/field[@name='amount']" position="after">
+                    <field name="cash_discount" on_change="onchange_cash_discount(amount, cash_discount)"/>
+                    <field name="transferred_amount" on_change="onchange_transferred_amount(amount, transferred_amount)"/>
+                </xpath>
+            </field>
+        </record>
+        
+        <record model="ir.ui.view" id="view_bank_statement_tax_form1">
+            <field name="name">account.bank.statement.form1</field>
+            <field name="model">account.bank.statement</field>
+            <field name="inherit_id" ref="account.view_bank_statement_form"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='line_ids']/form/field[@name='amount']" position="after">
+                    <field name="cash_discount" on_change="onchange_cash_discount(amount, cash_discount)"/>
+                    <field name="transferred_amount" on_change="onchange_transferred_amount(amount, transferred_amount)"/>
+                </xpath>
+            </field>
+        </record>
+       
+    </data>
+</openerp>

=== added file 'account_invoice_cash_discount/account_invoice_cash_discount_wizard.xml'
--- account_invoice_cash_discount/account_invoice_cash_discount_wizard.xml	1970-01-01 00:00:00 +0000
+++ account_invoice_cash_discount/account_invoice_cash_discount_wizard.xml	2011-07-29 01:35:58 +0000
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<openerp>
+	<data>
+		<wizard
+      string="Import invoices"
+      model="account.bank.statement"
+      name="populate_statement_from_inv1"
+      menu="False"
+      id="wizard_populate_statement_from_inv1"/>
+
+    <wizard
+        string="Reconcile Entries"
+        model="account.move.line"
+        name="account.move.line.discount.reconcile"
+        menu="True" 
+        id="account.wizard_reconcile"/>
+    <wizard
+        string="Compute Period Wise Write-off Entry"
+        model="account.move.line"
+        name="account_period_write_calculation"
+        menu="True" 
+        id="wizard_period_writeoff_calculation"/>
+        
+    <menuitem 
+        action="wizard_period_writeoff_calculation" 
+        id="menu_period_writeoff_calculation" 
+        parent="account_payment.menu_main"
+        type="wizard"/>
+	</data>
+</openerp>

=== added directory 'account_invoice_cash_discount/i18n'
=== added file 'account_invoice_cash_discount/i18n/account_invoice_cash_discount.pot'
--- account_invoice_cash_discount/i18n/account_invoice_cash_discount.pot	1970-01-01 00:00:00 +0000
+++ account_invoice_cash_discount/i18n/account_invoice_cash_discount.pot	2011-07-29 01:35:58 +0000
@@ -0,0 +1,673 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_invoice_cash_discount
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.14\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2010-10-07 16:33:48+0000\n"
+"PO-Revision-Date: 2010-10-07 16:33:48+0000\n"
+"Last-Translator: Thomas Dreiling <[e-mail]>\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_invoice_cash_discount
+#: code:addons/account_invoice_cash_discount/wizard/wizard_discount_reconcile.py:0
+#, python-format
+msgid "Write-Off"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: field:account.invoice.pay,discount_move_ids:0
+msgid "Account Discount Moves"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: selection:account.invoice.pay,cal_method_selection:0
+msgid "Calculate Discount with Gross Methodology"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: field:account.bank.statement.reconcile.line,tax_code_id:0
+#: field:account.move.line.memory,tax_code_id:0
+msgid "Tax Account"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: code:addons/account_invoice_cash_discount/account_invoice_cash_discount.py:0
+#, python-format
+msgid "Entries are not of the same account or already reconciled!"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: code:addons/account_invoice_cash_discount/account_invoice_cash_discount.py:0
+#, python-format
+msgid "Account move line \"%s\" is not valid"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: model:ir.model,name:account_invoice_cash_discount.model_res_company_wizard
+msgid "res.company.wizard"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: field:account.invoice.pay,cash_amount:0
+msgid "Cash Discount Amount"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: field:account.move.line.memory,account_id:0
+msgid "Account"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: field:account.invoice.pay,journal_id:0
+msgid "Journal/Payment Mode"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: view:account.message:0
+#: view:account.partial.message:0
+msgid "Messages"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: wizard_field:account_period_write_calculation,init,tax_id:0
+msgid "Taxes"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: code:addons/account_invoice_cash_discount/account_invoice_cash_discount.py:0
+#: code:addons/account_invoice_cash_discount/wizard/account_pay_invoice.py:0
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: code:addons/account_invoice_cash_discount/account_invoice_cash_discount.py:0
+#, python-format
+msgid "The statement balance is incorrect!\n"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: view:account.message:0
+#: view:account.partial.message:0
+msgid "OK"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: view:account.bank.statement.reconcile:0
+msgid "Reconcile"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: wizard_view:account_period_write_calculation,init:0
+msgid "Calculation"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: code:addons/account_invoice_cash_discount/account_invoice_cash_discount.py:0
+#, python-format
+msgid "Currency Expense"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: field:account.bank.statement.line,tax_id:0
+msgid "Tax"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: field:account.move.line.memory,date:0
+msgid "Effective Date"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: field:account.invoice.pay.writeoff,analytic_id:0
+#: field:account.move.line.memory,analytic_account_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: field:account.cash.discount,discount_account_id:0
+msgid "Customer Discount Account"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: code:addons/account_invoice_cash_discount/account_invoice_cash_discount.py:0
+#, python-format
+msgid "Entry \"%s\" is not valid !"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: wizard_button:populate_statement_from_inv1,go,end:0
+#: wizard_button:populate_statement_from_inv1,init,end:0
+msgid "_Cancel"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: view:account.cash.discount:0
+#: view:account.payment.term:0
+#: code:addons/account_invoice_cash_discount/account_invoice_cash_discount.py:0
+#: code:addons/account_invoice_cash_discount/wizard/wizard_discount_reconcile.py:0
+#: model:ir.model,name:account_invoice_cash_discount.model_account_cash_discount
+#, python-format
+msgid "Cash Discount"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: view:account.invoice.pay.writeoff:0
+msgid "Pay and Reconcile"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: view:account.invoice.pay:0
+msgid "Method For Calculation"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: view:account.invoice.pay.writeoff:0
+msgid "Write-Off Move"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: selection:account.invoice.pay,cal_method_selection:0
+msgid "Calculate Discount with Net Methodology"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: code:addons/account_invoice_cash_discount/account_invoice_cash_discount.py:0
+#, python-format
+msgid "Please verify that an account is defined in the journal."
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: field:account.move.line.memory,debit:0
+msgid "Debit"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: model:ir.actions.act_window,name:account_invoice_cash_discount.action_res_company_wizard
+msgid "Company Currency Difference Accounts"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: wizard_view:account_period_write_calculation,init:0
+msgid "Calculation of period-wise Write-Off Amount"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: field:account.payment.term.line,day_tolerance:0
+msgid "Tolerance (Days)"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: wizard_button:populate_statement_from_inv1,init,go:0
+msgid "_Go"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: field:account.cash.discount,delay:0
+msgid "Number of Days"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: code:addons/account_invoice_cash_discount/wizard/wizard_write_period_entry_calculation.py:0
+#, python-format
+msgid "Computed Entries"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: code:addons/account_invoice_cash_discount/account_invoice_cash_discount.py:0
+#, python-format
+msgid "Entry is already reconciled!"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: code:addons/account_invoice_cash_discount/account_invoice_cash_discount.py:0
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: field:account.bank.statement.line,tax_type:0
+msgid "Tax method"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: view:account.invoice.pay:0
+#: model:ir.actions.act_window,name:account_invoice_cash_discount.action_view_account_invoice_pay
+msgid "Pay Invoice"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: code:addons/account_invoice_cash_discount/account_invoice_cash_discount.py:0
+#, python-format
+msgid "Currency Revenue"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: view:account.invoice.pay:0
+#: view:account.partial.message:0
+msgid "Partial Payment"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: field:account.cash.discount,discount:0
+msgid "Discount (%)"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: field:account.invoice.pay.writeoff,comment:0
+msgid "Comment"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: wizard_field:populate_statement_from_inv1,go,lines:0
+msgid "Invoices"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: field:account.cash.discount,sup_discount_account_id:0
+msgid "Supplier Discount Account"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: field:account.move.line.memory,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: view:account.invoice.pay:0
+#: view:account.message:0
+msgid "Full Payment"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: code:addons/account_invoice_cash_discount/wizard/account_pay_invoice.py:0
+#, python-format
+msgid "Message"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: view:res.company:0
+msgid "Acc for Rev from Curr Diff"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: view:account.invoice.pay:0
+msgid "Calculate"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: view:account.invoice.pay.writeoff:0
+#: code:addons/account_invoice_cash_discount/wizard/account_pay_invoice.py:0
+#, python-format
+msgid "Information Addendum"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: model:ir.module.module,shortdesc:account_invoice_cash_discount.module_meta_information
+msgid "Payment Term with Cash Discount"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: wizard_view:populate_statement_from_inv1,init:0
+msgid "Choose Journal and Payment Date"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: help:populate_statement_from_inv1,init,journal_id:0
+msgid "This field allows you to choose the accounting journals you want to search invoices in. If you leave this field empty all sale, purchase and cash journals will be searched."
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: field:account.invoice.pay,account_id:0
+#: wizard_field:account_period_write_calculation,init,cash_discount_id:0
+msgid "Cash Discount Account"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: constraint:ir.model:0
+msgid "The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: model:ir.actions.wizard,name:account_invoice_cash_discount.wizard_populate_statement_from_inv1
+msgid "Import invoices"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: view:account.bank.statement.reconcile:0
+msgid "Write-Off and Cash Discount"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: view:res.company:0
+msgid "Acc for Exp from Curr Diff"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: model:ir.model,name:account_invoice_cash_discount.model_account_message
+msgid "account.message"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: code:addons/account_invoice_cash_discount/account_invoice_cash_discount.py:0
+#, python-format
+msgid "The expected balance (%.2f) is different than the computed one. (%.2f)"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: code:addons/account_invoice_cash_discount/wizard/account_pay_invoice.py:0
+#, python-format
+msgid "Your journal must have a default credit and debit account."
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: field:res.company,revenue_account_id:0
+#: field:res.company.wizard,revenue_account_id:0
+msgid "Account for Revenue from Exchange Rate Difference"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: field:account.invoice.pay,date:0
+#: wizard_field:populate_statement_from_inv1,init,date:0
+msgid "Payment Date"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: selection:account.bank.statement.line,tax_type:0
+msgid "Untaxed"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: wizard_button:account_period_write_calculation,init,calculate:0
+msgid "Compute"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: view:account.bank.statement:0
+msgid "Import Invoice"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: selection:account.bank.statement.line,tax_type:0
+msgid "Tax included"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: field:account.invoice.pay.writeoff,writeoff_journal_id:0
+msgid "Write-Off Journal"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: field:account.move.line.memory,credit:0
+msgid "Credit"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: field:account.move.line.memory,amount_currency:0
+msgid "Amount Currency"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: field:account.invoice.pay,tax_move_ids:0
+msgid "Account Taxes Moves"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: model:ir.model,name:account_invoice_cash_discount.model_account_move_line_memory
+msgid "Account move line memory "
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: field:account.invoice.pay,name:0
+msgid "Entry Name"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: help:account.move.line.memory,amount_currency:0
+msgid "The amount in the optional foreign currency if it is a multi-currency entry."
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: code:addons/account_invoice_cash_discount/account_invoice_cash_discount.py:0
+#, python-format
+msgid "Unable to reconcile entry \"%s\": %.2f"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: field:account.invoice.pay,cash_residual_amount:0
+msgid "Residual Amount"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: code:addons/account_invoice_cash_discount/account_invoice_cash_discount.py:0
+#, python-format
+msgid "The account entry lines are not in valid state."
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: code:addons/account_invoice_cash_discount/account_invoice_cash_discount.py:0
+#, python-format
+msgid "You have to provide a cash discount account!"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: view:account.message:0
+msgid "Do you really want to reconcile this invoice? The proposed payment does not completely balance the invoiced amount. Please check the payment term lines. Usually, one would use Partial Payment to avoid the ready/paid state for this invoice."
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: field:account.invoice.pay,period_id:0
+#: wizard_field:account_period_write_calculation,init,period_id:0
+msgid "Period"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: model:ir.module.module,description:account_invoice_cash_discount.module_meta_information
+msgid "\n"
+"    Module to add account move lines in case of payment with cash discount conditions in reconcilation form.\n"
+"    "
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: field:account.payment.term.line,compl_cash_discount:0
+msgid "Use Complete Cash Discount"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: selection:account.bank.statement.line,tax_type:0
+msgid "Tax excluded"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: view:account.invoice.pay:0
+#: view:account.invoice.pay.writeoff:0
+#: view:account.message:0
+#: view:account.partial.message:0
+#: wizard_button:account_period_write_calculation,init,end:0
+#: view:res.company.wizard:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: code:addons/account_invoice_cash_discount/wizard/account_pay_invoice.py:0
+#, python-format
+msgid "Cannot pay invoices in draft/proforma/cancel/done state."
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: field:account.payment.term,cash_discount_ids:0
+msgid "Cash Discount Terms"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: wizard_view:populate_statement_from_inv1,init:0
+msgid "Import Invoices in Statement"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: code:addons/account_invoice_cash_discount/account_invoice_cash_discount.py:0
+#, python-format
+msgid "Can only pay one invoice at a time!"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: field:res.company,expense_account_id:0
+#: field:res.company.wizard,expense_account_id:0
+msgid "Account for Expense from Exchange Rate Difference"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: view:account.partial.message:0
+msgid "Do you really want to NOT reconcile this invoice? The proposed payment completely balances the invoiced amount. Please check the payment term lines. Usually, one would use Full Payment to receive ready/paid state for this invoice."
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: view:account.invoice.pay.writeoff:0
+msgid "Analytic"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: view:account.move.line.memory:0
+msgid "Account Move Line"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: model:ir.model,name:account_invoice_cash_discount.model_account_invoice_pay
+#: model:ir.model,name:account_invoice_cash_discount.model_account_invoice_pay_writeoff
+msgid "Pay Invoice  "
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: view:res.company.wizard:0
+msgid "Set Default"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: code:addons/account_invoice_cash_discount/account_invoice_cash_discount.py:0
+#, python-format
+msgid "The account is not configured to be reconciled!"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: field:account.move.line.memory,tax_amount:0
+msgid "Tax/Base Amount"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: field:account.cash.discount,payment_id:0
+msgid "Related Payment Term"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: view:account.invoice.pay:0
+msgid "Account Cash Discount Moves"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: view:account.cash.discount:0
+msgid "Cash Discount Account for Supplier and Customer"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: wizard_button:populate_statement_from_inv1,go,finish:0
+msgid "O_k"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: code:addons/account_invoice_cash_discount/account_invoice_cash_discount.py:0
+#, python-format
+msgid "Some entries are already reconciled!"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: code:addons/account_invoice_cash_discount/account_invoice_cash_discount.py:0
+#, python-format
+msgid "There seems to be a surcharge, not a cash discount. Can\'t reconcile this!"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: field:account.cash.discount,name:0
+#: field:account.move.line.memory,name:0
+msgid "Name"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: view:account.bank.statement.reconcile:0
+msgid "Total Write-Off/Cash Discount"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: model:ir.actions.wizard,name:account_invoice_cash_discount.wizard_period_writeoff_calculation
+#: model:ir.ui.menu,name:account_invoice_cash_discount.menu_period_writeoff_calculation
+msgid "Compute Period Wise Write-off Entry"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: view:res.company.wizard:0
+msgid "Currency Difference Account Configuration"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: field:account.invoice.pay,cal_method_selection:0
+msgid "Method for Calculation"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: field:account.invoice.pay,amount:0
+msgid "Amount Paid"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: view:account.invoice.pay:0
+msgid "Tax Account Moves"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: model:ir.model,name:account_invoice_cash_discount.model_account_partial_message
+msgid "account.partial.message"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: help:account.move.line.memory,currency_id:0
+msgid "The optional foreign currency if it is a multi-currency entry."
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: help:account.move.line.memory,tax_code_id:0
+msgid "The account can either be a base tax code or tax code account."
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: field:account.invoice.pay.writeoff,writeoff_acc_id:0
+msgid "Write-Off Account"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: field:account.move.line.memory,journal_id:0
+#: wizard_field:account_period_write_calculation,init,journal_id:0
+#: wizard_field:populate_statement_from_inv1,init,journal_id:0
+msgid "Journal"
+msgstr ""
+
+#. module: account_invoice_cash_discount
+#: model:ir.actions.todo,note:account_invoice_cash_discount.config_wizard_res_company_wizard
+msgid "This configuration step sets the default accounts for expense and revenue generated by exchange rate differences"
+msgstr ""
+

=== added file 'account_invoice_cash_discount/i18n/de_DE.po'
--- account_invoice_cash_discount/i18n/de_DE.po	1970-01-01 00:00:00 +0000
+++ account_invoice_cash_discount/i18n/de_DE.po	2011-07-29 01:35:58 +0000
@@ -0,0 +1,675 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_invoice_cash_discount
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.14\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2010-10-07 16:33:48+0000\n"
+"PO-Revision-Date: 2010-10-07 16:33:48+0000\n"
+"Last-Translator: Thomas Dreiling <[e-mail]>\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_invoice_cash_discount
+#: code:addons/account_invoice_cash_discount/wizard/wizard_discount_reconcile.py:0
+#, python-format
+msgid "Write-Off"
+msgstr "Abschreibung"
+
+#. module: account_invoice_cash_discount
+#: field:account.invoice.pay,discount_move_ids:0
+msgid "Account Discount Moves"
+msgstr "Skontobuchungen"
+
+#. module: account_invoice_cash_discount
+#: selection:account.invoice.pay,cal_method_selection:0
+msgid "Calculate Discount with Gross Methodology"
+msgstr "Berechne Skonto mit Bruttomethode"
+
+#. module: account_invoice_cash_discount
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Ungültiger Modellname in der Aktionsdefinition."
+
+#. module: account_invoice_cash_discount
+#: field:account.bank.statement.reconcile.line,tax_code_id:0
+#: field:account.move.line.memory,tax_code_id:0
+msgid "Tax Account"
+msgstr "Steuerkonto"
+
+#. module: account_invoice_cash_discount
+#: code:addons/account_invoice_cash_discount/account_invoice_cash_discount.py:0
+#, python-format
+msgid "Entries are not of the same account or already reconciled!"
+msgstr "Buchungen gehören nicht zum selben Konto oder sind bereits ausgeglichen!"
+
+#. module: account_invoice_cash_discount
+#: code:addons/account_invoice_cash_discount/account_invoice_cash_discount.py:0
+#, python-format
+msgid "Account move line \"%s\" is not valid"
+msgstr "Buchungszeile \"%s\" ist ungültig"
+
+#. module: account_invoice_cash_discount
+#: model:ir.model,name:account_invoice_cash_discount.model_res_company_wizard
+msgid "res.company.wizard"
+msgstr "res.company.wizard"
+
+#. module: account_invoice_cash_discount
+#: field:account.invoice.pay,cash_amount:0
+msgid "Cash Discount Amount"
+msgstr "Skontobetrag"
+
+#. module: account_invoice_cash_discount
+#: field:account.move.line.memory,account_id:0
+msgid "Account"
+msgstr "Konto"
+
+#. module: account_invoice_cash_discount
+#: field:account.invoice.pay,journal_id:0
+msgid "Journal/Payment Mode"
+msgstr "Journal/Zahlungsweise"
+
+#. module: account_invoice_cash_discount
+#: view:account.message:0
+#: view:account.partial.message:0
+msgid "Messages"
+msgstr "Nachrichten"
+
+#. module: account_invoice_cash_discount
+#: wizard_field:account_period_write_calculation,init,tax_id:0
+msgid "Taxes"
+msgstr "Steuern"
+
+#. module: account_invoice_cash_discount
+#: code:addons/account_invoice_cash_discount/account_invoice_cash_discount.py:0
+#: code:addons/account_invoice_cash_discount/wizard/account_pay_invoice.py:0
+#, python-format
+msgid "Error!"
+msgstr "Fehler!"
+
+#. module: account_invoice_cash_discount
+#: code:addons/account_invoice_cash_discount/account_invoice_cash_discount.py:0
+#, python-format
+msgid "The statement balance is incorrect!\n"
+msgstr "Das Saldo des Kontoauszugs stimmt nicht!\n"
+
+#. module: account_invoice_cash_discount
+#: view:account.message:0
+#: view:account.partial.message:0
+msgid "OK"
+msgstr "OK"
+
+#. module: account_invoice_cash_discount
+#: view:account.bank.statement.reconcile:0
+msgid "Reconcile"
+msgstr "OP-Ausgleich"
+
+#. module: account_invoice_cash_discount
+#: wizard_view:account_period_write_calculation,init:0
+msgid "Calculation"
+msgstr "Berechnung"
+
+#. module: account_invoice_cash_discount
+#: code:addons/account_invoice_cash_discount/account_invoice_cash_discount.py:0
+#, python-format
+msgid "Currency Expense"
+msgstr "Kursaufwand"
+
+#. module: account_invoice_cash_discount
+#: field:account.bank.statement.line,tax_id:0
+msgid "Tax"
+msgstr "Steuer"
+
+#. module: account_invoice_cash_discount
+#: field:account.move.line.memory,date:0
+msgid "Effective Date"
+msgstr "Stichtag"
+
+#. module: account_invoice_cash_discount
+#: field:account.invoice.pay.writeoff,analytic_id:0
+#: field:account.move.line.memory,analytic_account_id:0
+msgid "Analytic Account"
+msgstr "Analytisches Konto"
+
+#. module: account_invoice_cash_discount
+#: field:account.cash.discount,discount_account_id:0
+msgid "Customer Discount Account"
+msgstr "Skontokonto Debitor"
+
+#. module: account_invoice_cash_discount
+#: code:addons/account_invoice_cash_discount/account_invoice_cash_discount.py:0
+#, python-format
+msgid "Entry \"%s\" is not valid !"
+msgstr "Buchung \"%s\" ist ungültig!"
+
+#. module: account_invoice_cash_discount
+#: wizard_button:populate_statement_from_inv1,go,end:0
+#: wizard_button:populate_statement_from_inv1,init,end:0
+msgid "_Cancel"
+msgstr "_Cancel"
+
+#. module: account_invoice_cash_discount
+#: view:account.cash.discount:0
+#: view:account.payment.term:0
+#: code:addons/account_invoice_cash_discount/account_invoice_cash_discount.py:0
+#: code:addons/account_invoice_cash_discount/wizard/wizard_discount_reconcile.py:0
+#: model:ir.model,name:account_invoice_cash_discount.model_account_cash_discount
+#, python-format
+msgid "Cash Discount"
+msgstr "Skonto"
+
+#. module: account_invoice_cash_discount
+#: view:account.invoice.pay.writeoff:0
+msgid "Pay and Reconcile"
+msgstr "Zahlung und OP-Ausgleich"
+
+#. module: account_invoice_cash_discount
+#: view:account.invoice.pay:0
+msgid "Method For Calculation"
+msgstr "Berechnungsmethode"
+
+#. module: account_invoice_cash_discount
+#: view:account.invoice.pay.writeoff:0
+msgid "Write-Off Move"
+msgstr "Abschreibungsbuchung"
+
+#. module: account_invoice_cash_discount
+#: selection:account.invoice.pay,cal_method_selection:0
+msgid "Calculate Discount with Net Methodology"
+msgstr "Berechne Skonto mit Nettomethode"
+
+#. module: account_invoice_cash_discount
+#: code:addons/account_invoice_cash_discount/account_invoice_cash_discount.py:0
+#, python-format
+msgid "Please verify that an account is defined in the journal."
+msgstr "Bitte prüfen, ob im Journal ein Konto hinterlegt ist."
+
+#. module: account_invoice_cash_discount
+#: field:account.move.line.memory,debit:0
+msgid "Debit"
+msgstr "Soll"
+
+#. module: account_invoice_cash_discount
+#: model:ir.actions.act_window,name:account_invoice_cash_discount.action_res_company_wizard
+msgid "Company Currency Difference Accounts"
+msgstr "Kursdifferenzkonten der Firma"
+
+#. module: account_invoice_cash_discount
+#: wizard_view:account_period_write_calculation,init:0
+msgid "Calculation of period-wise Write-Off Amount"
+msgstr "Berechnung des periodenweisen Abschreibungsbetrags"
+
+#. module: account_invoice_cash_discount
+#: field:account.payment.term.line,day_tolerance:0
+msgid "Tolerance (Days)"
+msgstr "Toleranz (Tage)"
+
+#. module: account_invoice_cash_discount
+#: wizard_button:populate_statement_from_inv1,init,go:0
+msgid "_Go"
+msgstr "_Go"
+
+#. module: account_invoice_cash_discount
+#: field:account.cash.discount,delay:0
+msgid "Number of Days"
+msgstr "Anzahl Tage"
+
+#. module: account_invoice_cash_discount
+#: code:addons/account_invoice_cash_discount/wizard/wizard_write_period_entry_calculation.py:0
+#, python-format
+msgid "Computed Entries"
+msgstr "Berechnete Buchungen"
+
+#. module: account_invoice_cash_discount
+#: code:addons/account_invoice_cash_discount/account_invoice_cash_discount.py:0
+#, python-format
+msgid "Entry is already reconciled!"
+msgstr "Buchung ist bereits ausgeglichen!"
+
+#. module: account_invoice_cash_discount
+#: code:addons/account_invoice_cash_discount/account_invoice_cash_discount.py:0
+#, python-format
+msgid "Configuration Error!"
+msgstr "Konfigurationsfehler!"
+
+#. module: account_invoice_cash_discount
+#: field:account.bank.statement.line,tax_type:0
+msgid "Tax method"
+msgstr "Steuerberechnung"
+
+#. module: account_invoice_cash_discount
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Fehlerhafter XML-Code für diese Ansicht!"
+
+#. module: account_invoice_cash_discount
+#: view:account.invoice.pay:0
+#: model:ir.actions.act_window,name:account_invoice_cash_discount.action_view_account_invoice_pay
+msgid "Pay Invoice"
+msgstr "Bezahle Rechnung"
+
+#. module: account_invoice_cash_discount
+#: code:addons/account_invoice_cash_discount/account_invoice_cash_discount.py:0
+#, python-format
+msgid "Currency Revenue"
+msgstr "Kursertrag"
+
+#. module: account_invoice_cash_discount
+#: view:account.invoice.pay:0
+#: view:account.partial.message:0
+msgid "Partial Payment"
+msgstr "Teilzahlung"
+
+#. module: account_invoice_cash_discount
+#: field:account.cash.discount,discount:0
+msgid "Discount (%)"
+msgstr "Skonto (%)"
+
+#. module: account_invoice_cash_discount
+#: field:account.invoice.pay.writeoff,comment:0
+msgid "Comment"
+msgstr "Hinweis"
+
+#. module: account_invoice_cash_discount
+#: wizard_field:populate_statement_from_inv1,go,lines:0
+msgid "Invoices"
+msgstr "Rechnungen"
+
+#. module: account_invoice_cash_discount
+#: field:account.cash.discount,sup_discount_account_id:0
+msgid "Supplier Discount Account"
+msgstr "Skontokonto Kreditor"
+
+#. module: account_invoice_cash_discount
+#: field:account.move.line.memory,currency_id:0
+msgid "Currency"
+msgstr "Währung"
+
+#. module: account_invoice_cash_discount
+#: view:account.invoice.pay:0
+#: view:account.message:0
+msgid "Full Payment"
+msgstr "Vollständige Bezahlung"
+
+#. module: account_invoice_cash_discount
+#: code:addons/account_invoice_cash_discount/wizard/account_pay_invoice.py:0
+#, python-format
+msgid "Message"
+msgstr "Nachricht"
+
+#. module: account_invoice_cash_discount
+#: view:res.company:0
+msgid "Acc for Rev from Curr Diff"
+msgstr "Konto Kurserträge"
+
+#. module: account_invoice_cash_discount
+#: view:account.invoice.pay:0
+msgid "Calculate"
+msgstr "Berechne"
+
+#. module: account_invoice_cash_discount
+#: view:account.invoice.pay.writeoff:0
+#: code:addons/account_invoice_cash_discount/wizard/account_pay_invoice.py:0
+#, python-format
+msgid "Information Addendum"
+msgstr "Zusatzinformationen"
+
+#. module: account_invoice_cash_discount
+#: model:ir.module.module,shortdesc:account_invoice_cash_discount.module_meta_information
+msgid "Payment Term with Cash Discount"
+msgstr "Zahlungsbedingung mit Skonto"
+
+#. module: account_invoice_cash_discount
+#: wizard_view:populate_statement_from_inv1,init:0
+msgid "Choose Journal and Payment Date"
+msgstr "Wähle Journal und Zahlungsdatum"
+
+#. module: account_invoice_cash_discount
+#: help:populate_statement_from_inv1,init,journal_id:0
+msgid "This field allows you to choose the accounting journals you want to search invoices in. If you leave this field empty all sale, purchase and cash journals will be searched."
+msgstr "Mit diesem Feld können die Journale gewählt werden, in denen nach Rechnungen gesucht werden. Bleibt das Feld leer, werden alle Verkaufs-, Einkaufs- und Kassenjournale durchsucht."
+
+#. module: account_invoice_cash_discount
+#: field:account.invoice.pay,account_id:0
+#: wizard_field:account_period_write_calculation,init,cash_discount_id:0
+msgid "Cash Discount Account"
+msgstr "Skontokonto"
+
+#. module: account_invoice_cash_discount
+#: constraint:ir.model:0
+msgid "The Object name must start with x_ and not contain any special character !"
+msgstr "Der Objektname muss mit x_ beginnen und darf keine Sonderzeichen beinhalten!"
+
+#. module: account_invoice_cash_discount
+#: model:ir.actions.wizard,name:account_invoice_cash_discount.wizard_populate_statement_from_inv1
+msgid "Import invoices"
+msgstr "Importiere Rechnungen"
+
+#. module: account_invoice_cash_discount
+#: view:account.bank.statement.reconcile:0
+msgid "Write-Off and Cash Discount"
+msgstr "Abschreibung und Skonto"
+
+#. module: account_invoice_cash_discount
+#: view:res.company:0
+msgid "Acc for Exp from Curr Diff"
+msgstr "Konto Kursaufwendungen"
+
+#. module: account_invoice_cash_discount
+#: model:ir.model,name:account_invoice_cash_discount.model_account_message
+msgid "account.message"
+msgstr "account.message"
+
+#. module: account_invoice_cash_discount
+#: code:addons/account_invoice_cash_discount/account_invoice_cash_discount.py:0
+#, python-format
+msgid "The expected balance (%.2f) is different than the computed one. (%.2f)"
+msgstr "Der eingetragene Saldo (%.2f) stimmt nicht mit dem berechneten überein. (%.2f)"
+
+#. module: account_invoice_cash_discount
+#: code:addons/account_invoice_cash_discount/wizard/account_pay_invoice.py:0
+#, python-format
+msgid "Your journal must have a default credit and debit account."
+msgstr "Im Journal müssen Standardkonten für Soll und Haben konfiguriert sein."
+
+#. module: account_invoice_cash_discount
+#: field:res.company,revenue_account_id:0
+#: field:res.company.wizard,revenue_account_id:0
+msgid "Account for Revenue from Exchange Rate Difference"
+msgstr "Konto für Kurserträge"
+
+#. module: account_invoice_cash_discount
+#: field:account.invoice.pay,date:0
+#: wizard_field:populate_statement_from_inv1,init,date:0
+msgid "Payment Date"
+msgstr "Zahlungsdatum"
+
+#. module: account_invoice_cash_discount
+#: selection:account.bank.statement.line,tax_type:0
+msgid "Untaxed"
+msgstr "Unversteuert"
+
+#. module: account_invoice_cash_discount
+#: wizard_button:account_period_write_calculation,init,calculate:0
+msgid "Compute"
+msgstr "Berechne"
+
+#. module: account_invoice_cash_discount
+#: view:account.bank.statement:0
+msgid "Import Invoice"
+msgstr "Importiere Rechnungen"
+
+#. module: account_invoice_cash_discount
+#: selection:account.bank.statement.line,tax_type:0
+msgid "Tax included"
+msgstr "Inklusive Steuer"
+
+#. module: account_invoice_cash_discount
+#: field:account.invoice.pay.writeoff,writeoff_journal_id:0
+msgid "Write-Off Journal"
+msgstr "Abschreibungsjournal"
+
+#. module: account_invoice_cash_discount
+#: field:account.move.line.memory,credit:0
+msgid "Credit"
+msgstr "Haben"
+
+#. module: account_invoice_cash_discount
+#: field:account.move.line.memory,amount_currency:0
+msgid "Amount Currency"
+msgstr "Währungsbetrag"
+
+#. module: account_invoice_cash_discount
+#: field:account.invoice.pay,tax_move_ids:0
+msgid "Account Taxes Moves"
+msgstr "Steuerbuchung"
+
+#. module: account_invoice_cash_discount
+#: model:ir.model,name:account_invoice_cash_discount.model_account_move_line_memory
+msgid "Account move line memory "
+msgstr "Buchungshistorie"
+
+#. module: account_invoice_cash_discount
+#: field:account.invoice.pay,name:0
+msgid "Entry Name"
+msgstr "Buchungstext"
+
+#. module: account_invoice_cash_discount
+#: help:account.move.line.memory,amount_currency:0
+msgid "The amount in the optional foreign currency if it is a multi-currency entry."
+msgstr "Der Fremdwährungsbetrag bei einer Fremdwährungsbuchung."
+
+#. module: account_invoice_cash_discount
+#: code:addons/account_invoice_cash_discount/account_invoice_cash_discount.py:0
+#, python-format
+msgid "Unable to reconcile entry \"%s\": %.2f"
+msgstr "Kann Rechnung  \"%s\": %.2f nicht ausgleichen"
+
+#. module: account_invoice_cash_discount
+#: field:account.invoice.pay,cash_residual_amount:0
+msgid "Residual Amount"
+msgstr "Offener Betrag"
+
+#. module: account_invoice_cash_discount
+#: code:addons/account_invoice_cash_discount/account_invoice_cash_discount.py:0
+#, python-format
+msgid "The account entry lines are not in valid state."
+msgstr "Die Buchungszeilen sind nicht im Status Gültig."
+
+#. module: account_invoice_cash_discount
+#: code:addons/account_invoice_cash_discount/account_invoice_cash_discount.py:0
+#, python-format
+msgid "You have to provide a cash discount account!"
+msgstr "Es muss ein Skontokonto angegeben werden!"
+
+#. module: account_invoice_cash_discount
+#: view:account.message:0
+msgid "Do you really want to reconcile this invoice? The proposed payment does not completely balance the invoiced amount. Please check the payment term lines. Usually, one would use Partial Payment to avoid the ready/paid state for this invoice."
+msgstr "Soll die Rechnung wirklich ausgeglichen werden? Die vorgeschlagene Zahlung deckt den Rechnungsbetrag nicht vollständig. Überprüfen sie die Zahlungsbedingung. In der Regel sollte hier eine Teilzahlung vorgenommen werden, um die Rechnung nicht als bezahlt zu kennzeichnen."
+
+#. module: account_invoice_cash_discount
+#: field:account.invoice.pay,period_id:0
+#: wizard_field:account_period_write_calculation,init,period_id:0
+msgid "Period"
+msgstr "Periode"
+
+#. module: account_invoice_cash_discount
+#: model:ir.module.module,description:account_invoice_cash_discount.module_meta_information
+msgid "\n"
+"    Module to add account move lines in case of payment with cash discount conditions in reconcilation form.\n"
+"    "
+msgstr "\n"
+"    Modul für die Buchung von Zahlungen mit Skonto im Bankauszug.\n"
+"    "
+
+#. module: account_invoice_cash_discount
+#: field:account.payment.term.line,compl_cash_discount:0
+msgid "Use Complete Cash Discount"
+msgstr "Verwende gesamtes Skonto"
+
+#. module: account_invoice_cash_discount
+#: selection:account.bank.statement.line,tax_type:0
+msgid "Tax excluded"
+msgstr "Exklusive Steuer"
+
+#. module: account_invoice_cash_discount
+#: view:account.invoice.pay:0
+#: view:account.invoice.pay.writeoff:0
+#: view:account.message:0
+#: view:account.partial.message:0
+#: wizard_button:account_period_write_calculation,init,end:0
+#: view:res.company.wizard:0
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#. module: account_invoice_cash_discount
+#: code:addons/account_invoice_cash_discount/wizard/account_pay_invoice.py:0
+#, python-format
+msgid "Cannot pay invoices in draft/proforma/cancel/done state."
+msgstr "Rechnungen im Status Entwurf/Proforma/Abgebrochen/Erledigt können nicht bezahlt werden."
+
+#. module: account_invoice_cash_discount
+#: field:account.payment.term,cash_discount_ids:0
+msgid "Cash Discount Terms"
+msgstr "Skontobedingungen"
+
+#. module: account_invoice_cash_discount
+#: wizard_view:populate_statement_from_inv1,init:0
+msgid "Import Invoices in Statement"
+msgstr "Importiere Rechnungen"
+
+#. module: account_invoice_cash_discount
+#: code:addons/account_invoice_cash_discount/account_invoice_cash_discount.py:0
+#, python-format
+msgid "Can only pay one invoice at a time!"
+msgstr "Es kann immer nur eine einzelne Rechnung bezahlt werden!"
+
+#. module: account_invoice_cash_discount
+#: field:res.company,expense_account_id:0
+#: field:res.company.wizard,expense_account_id:0
+msgid "Account for Expense from Exchange Rate Difference"
+msgstr "Konto für Kursaufwendungen"
+
+#. module: account_invoice_cash_discount
+#: view:account.partial.message:0
+msgid "Do you really want to NOT reconcile this invoice? The proposed payment completely balances the invoiced amount. Please check the payment term lines. Usually, one would use Full Payment to receive ready/paid state for this invoice."
+msgstr "Soll die Rechnung wirklich NICHT ausgeglichen werden? Die vorgeschlagene Zahlung deckt den Rechnungsbetrag vollständig. Überprüfen sie die Zahlungsbedingung. In der Regel sollte hier eine vollständige Zahlung vorgenommen werden, um die Rechnung als bezahlt zu kennzeichnen."
+
+#. module: account_invoice_cash_discount
+#: view:account.invoice.pay.writeoff:0
+msgid "Analytic"
+msgstr "Analytisch"
+
+#. module: account_invoice_cash_discount
+#: view:account.move.line.memory:0
+msgid "Account Move Line"
+msgstr "Buchungssatz"
+
+#. module: account_invoice_cash_discount
+#: model:ir.model,name:account_invoice_cash_discount.model_account_invoice_pay
+#: model:ir.model,name:account_invoice_cash_discount.model_account_invoice_pay_writeoff
+msgid "Pay Invoice  "
+msgstr "Zahle Rechnung"
+
+#. module: account_invoice_cash_discount
+#: view:res.company.wizard:0
+msgid "Set Default"
+msgstr "Standard setzen"
+
+#. module: account_invoice_cash_discount
+#: code:addons/account_invoice_cash_discount/account_invoice_cash_discount.py:0
+#, python-format
+msgid "The account is not configured to be reconciled!"
+msgstr "Dieses Konto ist nicht für den OP-Ausgleich konfiguriert!"
+
+#. module: account_invoice_cash_discount
+#: field:account.move.line.memory,tax_amount:0
+msgid "Tax/Base Amount"
+msgstr "Steuer-/Steuermessbetrag"
+
+#. module: account_invoice_cash_discount
+#: field:account.cash.discount,payment_id:0
+msgid "Related Payment Term"
+msgstr "Zugehörige Zahlungsbedingung"
+
+#. module: account_invoice_cash_discount
+#: view:account.invoice.pay:0
+msgid "Account Cash Discount Moves"
+msgstr "Skontobuchungen"
+
+#. module: account_invoice_cash_discount
+#: view:account.cash.discount:0
+msgid "Cash Discount Account for Supplier and Customer"
+msgstr "Skontokonto für Kreditoren und Debitoren"
+
+#. module: account_invoice_cash_discount
+#: wizard_button:populate_statement_from_inv1,go,finish:0
+msgid "O_k"
+msgstr "O_k"
+
+#. module: account_invoice_cash_discount
+#: code:addons/account_invoice_cash_discount/account_invoice_cash_discount.py:0
+#, python-format
+msgid "Some entries are already reconciled!"
+msgstr "Einige Buchungen sind bereits ausgeglichen!"
+
+#. module: account_invoice_cash_discount
+#: code:addons/account_invoice_cash_discount/account_invoice_cash_discount.py:0
+#, python-format
+msgid "There seems to be a surcharge, not a cash discount. Can\'t reconcile this!"
+msgstr "Es scheint hier einen Zuschlag zu geben, kein Skonto. Dies kann hiermit nicht ausgeglichen werden!"
+
+#. module: account_invoice_cash_discount
+#: field:account.cash.discount,name:0
+#: field:account.move.line.memory,name:0
+msgid "Name"
+msgstr "Bezeichnung"
+
+#. module: account_invoice_cash_discount
+#: view:account.bank.statement.reconcile:0
+msgid "Total Write-Off/Cash Discount"
+msgstr "Summe Abschreibungen/Skonto"
+
+#. module: account_invoice_cash_discount
+#: model:ir.actions.wizard,name:account_invoice_cash_discount.wizard_period_writeoff_calculation
+#: model:ir.ui.menu,name:account_invoice_cash_discount.menu_period_writeoff_calculation
+msgid "Compute Period Wise Write-off Entry"
+msgstr "Periodenweise Abschreibungen berechnen"
+
+#. module: account_invoice_cash_discount
+#: view:res.company.wizard:0
+msgid "Currency Difference Account Configuration"
+msgstr "Konfiguration der Kursdifferenzenkonten"
+
+#. module: account_invoice_cash_discount
+#: field:account.invoice.pay,cal_method_selection:0
+msgid "Method for Calculation"
+msgstr "Berechnungsmethode"
+
+#. module: account_invoice_cash_discount
+#: field:account.invoice.pay,amount:0
+msgid "Amount Paid"
+msgstr "Gezahlter Betrag"
+
+#. module: account_invoice_cash_discount
+#: view:account.invoice.pay:0
+msgid "Tax Account Moves"
+msgstr "Steuerkontobewegungen"
+
+#. module: account_invoice_cash_discount
+#: model:ir.model,name:account_invoice_cash_discount.model_account_partial_message
+msgid "account.partial.message"
+msgstr "account.partial.message"
+
+#. module: account_invoice_cash_discount
+#: help:account.move.line.memory,currency_id:0
+msgid "The optional foreign currency if it is a multi-currency entry."
+msgstr "Die optionale Fremdwährung bei einer Fremdwährungsbuchung."
+
+#. module: account_invoice_cash_discount
+#: help:account.move.line.memory,tax_code_id:0
+msgid "The account can either be a base tax code or tax code account."
+msgstr "Das Konto kann entweder ein Steuerbemessungs- oder ein Steuerkonto sein"
+
+#. module: account_invoice_cash_discount
+#: field:account.invoice.pay.writeoff,writeoff_acc_id:0
+msgid "Write-Off Account"
+msgstr "Abschreibungskonto"
+
+#. module: account_invoice_cash_discount
+#: field:account.move.line.memory,journal_id:0
+#: wizard_field:account_period_write_calculation,init,journal_id:0
+#: wizard_field:populate_statement_from_inv1,init,journal_id:0
+msgid "Journal"
+msgstr "Journal"
+
+#. module: account_invoice_cash_discount
+#: model:ir.actions.todo,note:account_invoice_cash_discount.config_wizard_res_company_wizard
+msgid "This configuration step sets the default accounts for expense and revenue generated by exchange rate differences"
+msgstr "Dieser Konfigurationsschritt setzt die Standardkonten für Aufwendungen und Erträge aus Kursdifferenzen"
+

=== added directory 'account_invoice_cash_discount/security'
=== added file 'account_invoice_cash_discount/security/ir.model.access.csv'
--- account_invoice_cash_discount/security/ir.model.access.csv	1970-01-01 00:00:00 +0000
+++ account_invoice_cash_discount/security/ir.model.access.csv	2011-07-29 01:35:58 +0000
@@ -0,0 +1,22 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_account_cash_discount_manager","account.cash.discount","model_account_cash_discount","account.group_account_manager",1,1,1,1
+"access_account_cash_discount_invoice","account.cash.discount","model_account_cash_discount","account.group_account_invoice",1,0,0,0
+"access_account_cash_discount_accountant","account.cash.discount","model_account_cash_discount","account.group_account_user",1,0,0,0
+"access_account_invoice_pay_writeoff_manager","account.invoice.pay.writeoff","model_account_invoice_pay_writeoff","account.group_account_manager",1,1,1,1
+"access_account_invoice_pay_writeoff_invoive","account.invoice.pay.writeoff","model_account_invoice_pay_writeoff","account.group_account_invoice",1,0,0,0
+"access_account_invoice_pay_writeoff_accountant","account.invoice.pay.writeoff","model_account_invoice_pay_writeoff","account.group_account_user",1,0,0,0
+"access_account_invoice_pay_manager","account.invoice.pay","model_account_invoice_pay","account.group_account_manager",1,1,1,1
+"access_account_invoice_pay_invoice","account.invoice.pay","model_account_invoice_pay","account.group_account_invoice",1,0,0,0
+"access_account_invoice_pay_accountant","account.invoice.pay","model_account_invoice_pay","account.group_account_user",1,0,0,0
+"access_res_company_wizard_manager","res.company.wizard","model_res_company_wizard","account.group_account_manager",1,1,1,1
+"access_res_company_wizard_invoice","res.company.wizard","model_res_company_wizard","account.group_account_invoice",1,0,0,0
+"access_res_company_wizard_accountant","res.company.wizard","model_res_company_wizard","account.group_account_user",1,0,0,0
+"access_account_move_line_memory_manager","account.move.line.memory","model_account_move_line_memory","account.group_account_manager",1,1,1,1
+"access_account_move_line_memory_invoice","account.move.line.memory","model_account_move_line_memory","account.group_account_invoice",1,0,0,0
+"access_account_move_line_memory_accountant","account.move.line.memory","model_account_move_line_memory","account.group_account_user",1,0,0,0
+"access_account_message_manager","account.message","model_account_message","account.group_account_manager",1,1,1,1
+"access_account_message_invoice","account.message","model_account_message","account.group_account_invoice",1,0,0,0
+"access_account_message_accountant","account.message","model_account_message","account.group_account_user",1,0,0,0
+"access_account_partial_message_manager","account.partial.message","model_account_partial_message","account.group_account_manager",1,1,1,1
+"access_account_partial_message_invoice","account.partial.message","model_account_partial_message","account.group_account_invoice",1,0,0,0
+"access_account_partial_message_accountant","account.partial.message","model_account_partial_message","account.group_account_user",1,0,0,0

=== added directory 'account_invoice_cash_discount/wizard'
=== added file 'account_invoice_cash_discount/wizard/__init__.py'
--- account_invoice_cash_discount/wizard/__init__.py	1970-01-01 00:00:00 +0000
+++ account_invoice_cash_discount/wizard/__init__.py	2011-07-29 01:35:58 +0000
@@ -0,0 +1,29 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import account_pay_invoice
+import invoice_statement_payment
+import wizard_discount_reconcile
+import wizard_write_period_entry_calculation
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+

=== added file 'account_invoice_cash_discount/wizard/account_pay_invoice.py'
--- account_invoice_cash_discount/wizard/account_pay_invoice.py	1970-01-01 00:00:00 +0000
+++ account_invoice_cash_discount/wizard/account_pay_invoice.py	2011-07-29 01:35:58 +0000
@@ -0,0 +1,651 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import time
+from lxml import etree
+from osv import fields, osv
+from tools.translate import _
+from tools import config
+
+class account_invoice_pay_writeoff(osv.osv_memory):
+    """
+    Opens the write-off amount pay form.
+    """
+    _name = "account.invoice.pay.writeoff"
+    _description = "Pay Invoice"
+    _columns = {
+        'writeoff_acc_id': fields.many2one('account.account', 'Write-Off Account', required=True),
+        'writeoff_journal_id': fields.many2one('account.journal', 'Write-Off Journal', required=True),
+        'comment': fields.char('Comment', size=64, required=True),
+        'analytic_id': fields.many2one('account.analytic.account', 'Analytic Account'),
+        }
+    _defaults = {
+        'comment':lambda *a: 'Write-Off',
+        }
+
+    def pay_and_reconcile_writeoff(self, cr, uid, ids, context=None):
+        pay_invoice = self.pool.get('account.invoice.pay')
+        data = self.read(cr, uid, ids, context=context)[0]
+        context.update({'write_off': data})
+        self.pool.get('account.invoice.pay').pay_and_reconcile(cr, uid, ids, context=context)
+        return {}
+
+account_invoice_pay_writeoff()
+
+class account_invoice_pay(osv.osv_memory):
+    """
+    Generate pay invoice wizard. The user can make partial or full payment of invoices.
+    """
+    _name = "account.invoice.pay"
+    _description = "Pay Invoice"
+    _columns = {
+        'amount': fields.float('Amount Paid', required=True),
+        'name': fields.char('Entry Name', size=64, required=True),
+        'date': fields.date('Payment Date', required=True),
+        'cash_residual_amount': fields.float('Residual Amount'),
+        'journal_id': fields.many2one('account.journal', 'Journal/Payment Mode', required=True),
+        'period_id': fields.many2one('account.period', 'Period', required=True),
+        'cash_amount': fields.float('Cash Discount Amount',),
+        'account_id': fields.many2one('account.account', 'Cash Discount Account',),
+        'cal_method_selection': fields.selection([('method_gross_methodology', 'Calculate Discount with Gross Methodology'),
+                                                  ('method_net_methodology', 'Calculate Discount with Net Methodology'),],
+                                                 'Method for Calculation'),
+        'discount_move_ids': fields.many2many('account.move.line.memory', 'account_discount_move_rel', 'discount_account_id', 'discount_move_id', 'Account Discount Moves'),
+        'tax_move_ids': fields.many2many('account.move.line.memory', 'account_tax_move_rel', 'tax_account_id', 'tax_move_id', 'Account Taxes Moves'),
+    }
+    
+    def _get_period(self, cr, uid, context=None):
+        ids = self.pool.get('account.period').find(cr, uid, context=context)
+        period_id = False
+        if len(ids):
+            period_id = ids[0]
+        return period_id
+
+    def _get_amount(self, cr, uid, context=None):
+        obj_inv = self.pool.get('account.invoice')
+        tax_obj = self.pool.get('account.tax')
+        invoice =  obj_inv.browse(cr, uid, context['id'], context=context)
+        total_tax_amount = total_amount = 0.0
+        amount = obj_inv._get_amount(cr, uid, [context['id']], invoice.residual, invoice.payment_term.id, context=context)
+        amount = amount['amount']
+        context.update({'found': amount})
+        discount = obj_inv._get_payment(cr, uid, [context['id']], amount, invoice.payment_term.id, context=context)
+        residual_amount = amount - discount
+        return residual_amount
+    
+    def _get_discount(self, cr, uid, context=None):
+        obj_inv = self.pool.get('account.invoice')
+        tax_obj = self.pool.get('account.tax')
+        invoice =  obj_inv.browse(cr, uid, context['id'], context=context)
+        amount = obj_inv._get_amount(cr, uid, [context['id']], invoice.residual, invoice.payment_term.id, context=context)
+        amount = amount['amount']
+        discount = obj_inv._get_payment(cr, uid, [context['id']], amount, invoice.payment_term.id, context=context)
+        return discount
+    
+    def _get_account(self, cr, uid, context=None):
+        """
+        This function returns the account according to the cash discount payment term and maps the account with fiscal position
+        """
+        obj_inv = self.pool.get('account.invoice')
+        invoice =  obj_inv.browse(cr, uid, context['id'], context=context)
+        account = obj_inv._get_account(cr, uid, [context['id']], invoice.residual, invoice.payment_term.id, context=context)
+        if account and invoice.fiscal_position:
+            account = self.pool.get('account.fiscal.position').map_account(cr, uid, invoice.fiscal_position, account)
+        return account
+    
+    def _get_discount_move(self, cr, uid, context=None):
+        invoice_obj = self.pool.get('account.invoice')
+        invoice_tax_obj = self.pool.get("account.invoice.tax")
+        move_line_obj_memory = self.pool.get('account.move.line.memory')
+        tax_obj = self.pool.get('account.tax')
+        cur_obj = self.pool.get('res.currency')
+
+        invoice = self.pool.get('account.invoice').browse(cr, uid, context['id'], context=context)
+        
+        #### to get direction
+        types = {'out_invoice': -1, 'in_invoice': 1, 'out_refund': 1, 'in_refund': -1}
+        direction = types[invoice.type]
+        date = time.strftime('%Y-%m-%d')
+        
+        #### to get name
+        name = invoice.invoice_line and invoice.invoice_line[0].name or invoice.number
+        ##### Entry in the discount account moves and entry in the tax account moves
+        
+        amount = discount = 0.0
+        discount_line_ids = []
+        discount_account_id = base_code_id = False
+        
+        discount = self._get_discount(cr, uid, context=context)
+        discount_account_id = self._get_account(cr, uid, context=context)
+        if discount > 0.0:
+            for line in invoice.invoice_line:
+                total_tax_amount = line_tax_amount = 0.0
+                tax_base = tax_code = False
+                
+                for tax in tax_obj.compute(cr, uid, line.invoice_line_tax_id, line.price_subtotal / line.quantity, line.quantity, invoice.address_invoice_id.id, line.product_id, invoice.partner_id):    
+                    line_tax_amount += tax['amount']
+                line_total = line.price_subtotal + line_tax_amount
+                invoice_res_amount = invoice.amount_total
+                line_ratio = line_total / invoice_res_amount
+                #####################################################
+                discount_pay = discount * line_ratio
+                tax_real_amt = 0.0
+                if line.invoice_line_tax_id:
+                    for tax_id in line.invoice_line_tax_id:
+                        tax_data = tax_obj.browse(cr, uid, tax_id.id, context=context)
+                        tax_amt = round((discount_pay * tax_data.amount), int(config['price_accuracy']))
+                        tax_real_amt = round((tax_amt / (1 + tax_data.amount)), int(config['price_accuracy']))
+                        total_tax_amount += tax_real_amt
+
+                        tax_base = tax_data.base_code_id.id
+                        tax_code = tax_data.tax_code_id.id
+                        
+                        tax_invoice_id = invoice_tax_obj.search(cr, uid, [('invoice_id', '=', invoice.id), ('tax_code_id', '=', tax_code), ('base_code_id', '=', tax_base)])
+                        for tax_id in tax_invoice_id:
+                            tax_value = invoice_tax_obj.browse(cr, uid, tax_id)
+                            base_code_id = tax_value.base_code_id.id
+                            
+                if invoice.company_id.currency_id.id <> invoice.currency_id.id:
+                    discount_amount = discount - tax_real_amt
+                    amount = cur_obj.compute(cr, uid, invoice.currency_id.id, invoice.company_id.currency_id.id, discount_amount, context=context)
+                
+                l4 = {
+                    'debit': direction * (discount_pay - total_tax_amount) < 0 and abs(discount_pay - total_tax_amount) or 0.0,
+                    'credit': direction * (discount_pay - total_tax_amount) > 0 and abs(discount_pay - total_tax_amount) or 0.0,
+                    'account_id': discount_account_id,
+                    'date': date,
+                    'name': name,
+                    'currency_id': invoice.currency_id and invoice.currency_id.id,
+                    'journal_id': invoice.journal_id and invoice.journal_id.id,
+                    'tax_code_id': base_code_id,
+                    'tax_amount': -(discount_pay - total_tax_amount),
+                    'amount_currency': amount and direction * amount or 0.0,
+                    'analytic_account_id': line.account_analytic_id.id,
+                }
+                
+                discount_line_id = move_line_obj_memory.create(cr, uid, l4, context=context)
+                discount_line_ids.append(l4)
+        return discount_line_ids
+    
+    def _get_taxes_move(self, cr, uid, context=None):
+        invoice_obj = self.pool.get('account.invoice')
+        invoice_tax_obj = self.pool.get("account.invoice.tax")
+        move_line_obj_memory = self.pool.get('account.move.line.memory')
+        tax_obj = self.pool.get('account.tax')
+        cur_obj = self.pool.get('res.currency')
+
+        invoice = self.pool.get('account.invoice').browse(cr, uid, context['id'], context=context)
+        
+        #### to get direction
+        types = {'out_invoice': -1, 'in_invoice': 1, 'out_refund': 1, 'in_refund': -1}
+        direction = types[invoice.type]
+        date = time.strftime('%Y-%m-%d')
+        
+        #### to get name
+        name = invoice.invoice_line and invoice.invoice_line[0].name or invoice.number
+        ##### Entry in the discount account moves and entry in the tax account moves
+        amount = discount = 0.0
+        line_ids = []
+        tax_code_id = tax_account_id = tax_base = tax_code = False
+        
+        discount = self._get_discount(cr, uid, context=context)
+        if discount > 0.0:
+            for line in invoice.invoice_line:
+                line_tax_amount = total_tax_amount = 0.0
+                ############# Ratio#####
+                for tax in tax_obj.compute(cr, uid, line.invoice_line_tax_id, line.price_subtotal / line.quantity, line.quantity, invoice.address_invoice_id.id, line.product_id, invoice.partner_id):    
+                    line_tax_amount += tax['amount']
+                line_total = line.price_subtotal + line_tax_amount
+                invoice_res_amount = invoice.amount_total
+                line_ratio = line_total / invoice_res_amount
+                #############
+                ### discount for the invoice line
+                discount_pay = discount * line_ratio
+                if line.invoice_line_tax_id:
+                    for tax_id in line.invoice_line_tax_id:
+                        tax_data = tax_obj.browse(cr, uid, tax_id.id, context=context)
+                        tax_amt = round((discount_pay * tax_data.amount), int(config['price_accuracy']))
+                        tax_real_amt = round((tax_amt / (1 + tax_data.amount)), int(config['price_accuracy']))
+                        total_tax_amount += tax_real_amt
+
+                        tax_base = tax_data.base_code_id.id
+                        tax_code = tax_data.tax_code_id.id
+                        
+                        tax_invoice_id = invoice_tax_obj.search(cr, uid, [('invoice_id', '=', invoice.id), ('tax_code_id', '=', tax_code), ('base_code_id', '=', tax_base)])
+                        
+                        for tax_id in tax_invoice_id:
+                            tax_value = invoice_tax_obj.browse(cr, uid, tax_id)
+                            tax_account_id = tax_value.account_id.id
+                            tax_code_id = tax_value.tax_code_id.id
+
+                        if invoice.company_id.currency_id.id <> invoice.currency_id.id:
+                            amount = cur_obj.compute(cr, uid, invoice.currency_id.id, invoice.company_id.currency_id.id, tax_real_amt, context=context)
+                                
+                        l3 = {
+                            'debit': direction * tax_real_amt < 0 and abs(tax_real_amt) or 0.0,
+                            'credit': direction * tax_real_amt > 0 and abs(tax_real_amt) or 0.0,
+                            'account_id': tax_account_id,
+                            'date': date,
+                            'journal_id': invoice.journal_id and invoice.journal_id.id,
+                            'name': name,
+                            'currency_id': invoice.currency_id and invoice.currency_id.id,
+                            'tax_code_id': tax_code_id,
+                            'tax_amount': -tax_real_amt,
+                            'amount_currency': amount and direction * amount or 0.0,
+                            'analytic_account_id': line.account_analytic_id.id,
+                        }
+                        line_id = move_line_obj_memory.create(cr, uid, l3, context=context)
+                        line_ids.append(l3)
+        return line_ids
+         
+    _defaults = {
+        'date': lambda *a: time.strftime('%Y-%m-%d'),
+        'period_id': _get_period,
+        'amount': _get_amount,
+        'cash_amount': _get_discount,
+        'account_id': _get_account,
+        'cash_residual_amount': lambda *a: 0.0,
+        'cal_method_selection': lambda *a: 'method_gross_methodology',
+        'discount_move_ids': _get_discount_move,
+        'tax_move_ids': _get_taxes_move,
+    }
+    
+    def on_change_ammount(self, cr, uid, ids, amount, cash_amount, context=None):
+        """
+        This function returns the cash discount according to the Amount Paid and Cash Discount Payment Term
+        """
+        res = {}
+        obj_inv = self.pool.get('account.invoice')
+        invoice =  obj_inv.browse(cr, uid, context['id'], context=context)
+        cal_amount = obj_inv._get_amount(cr, uid, [context['id']], invoice.residual, invoice.payment_term.id, context=context)
+        old_cal_amount = old_amount = cal_amount['amount']
+        diff_amount = round(old_amount - amount + cash_amount, int(config['price_accuracy']))
+
+        return {'value': {'cash_residual_amount': diff_amount}}
+    
+    def on_change_cash_discount_amount(self, cr, uid, ids, discount_amount, amount, context=None):
+        ###  Return discount amount
+        res = {}
+        obj_inv = self.pool.get('account.invoice')
+        invoice =  obj_inv.browse(cr, uid, context['id'], context=context)
+        cal_amount = obj_inv._get_amount(cr, uid, [context['id']] ,invoice.residual, invoice.payment_term.id, context=context)
+        old_cal_amount = old_amount = cal_amount['amount']
+        discount = obj_inv._get_payment(cr, uid, [context['id']] , amount, invoice.payment_term.id, context=context)
+        diff_amount = round(old_amount - amount + discount_amount, int(config['price_accuracy']))
+
+        return {'value' : {'cash_amount':discount_amount,'cash_residual_amount':diff_amount}}
+    
+    def _calculation(self, cr, uid, ids, context=None):
+        invoice_obj = self.pool.get('account.invoice')
+        invoice_tax_obj = self.pool.get("account.invoice.tax")
+        move_line_obj_memory = self.pool.get('account.move.line.memory')
+        tax_obj = self.pool.get('account.tax')
+        cur_obj = self.pool.get('res.currency')
+        
+        data = self.read(cr, uid, ids, context=context)[0]
+        invoice = self.pool.get('account.invoice').browse(cr, uid, context['id'], context=context)
+        #### to get direction
+        types = {'out_invoice': -1, 'in_invoice': 1, 'out_refund': 1, 'in_refund': -1}
+        direction = types[invoice.type]
+        date = time.strftime('%Y-%m-%d')
+        
+        #### to get name
+        name = invoice.invoice_line and invoice.invoice_line[0].name or invoice.number
+        ##### Entry in the discount account moves and entry in the tax account moves
+
+        if data.get('cash_amount', 0.0) <= 0.0:
+            return True
+        
+        tax_total_amount = amount = discount = 0.0
+        line_ids = discount_line_ids = []
+        discount_account_id = tax_account_id = False
+        tax_code_id = base_code_id = tax_base = tax_code = False
+
+        for line in invoice.invoice_line:
+            line_tax_amount = total_tax_amount = tax_real_amt = 0.0
+            #####get the ratio of the line in the total invoice amount 
+            for tax in tax_obj.compute(cr, uid, line.invoice_line_tax_id, line.price_subtotal / line.quantity, line.quantity, invoice.address_invoice_id.id, line.product_id, invoice.partner_id):    
+                line_tax_amount += tax['amount']
+            line_total = line.price_subtotal + line_tax_amount
+            invoice_res_amount = invoice.amount_total
+            line_ratio = line_total / invoice_res_amount
+            ###########################
+            discount_pay = data['cash_amount'] * line_ratio
+            if line.invoice_line_tax_id:
+                for tax_id in line.invoice_line_tax_id:
+                    tax_data = tax_obj.browse(cr, uid, tax_id.id, context=context)
+                    tax_amt = round(discount_pay * tax_data.amount, int(config['price_accuracy']))
+                    tax_real_amt = round(tax_amt / (1 + tax_data.amount), int(config['price_accuracy']))
+                    total_tax_amount += tax_real_amt
+
+                    tax_base = tax_data.base_code_id.id
+                    tax_code = tax_data.tax_code_id.id
+                    
+                    tax_invoice_id = invoice_tax_obj.search(cr, uid, [('invoice_id', '=', invoice.id), ('tax_code_id', '=', tax_code), ('base_code_id', '=', tax_base)])
+                    for tax_id in tax_invoice_id:
+                        tax_value = invoice_tax_obj.browse(cr, uid, tax_id)
+                        tax_account_id = tax_value.account_id.id
+                        tax_code_id = tax_value.tax_code_id.id
+                        base_code_id = tax_value.base_code_id.id
+                    
+                    if invoice.company_id.currency_id.id <> invoice.currency_id.id:
+                        amount = cur_obj.compute(cr, uid, invoice.currency_id.id, invoice.company_id.currency_id.id, tax_real_amt, context=context)
+                        
+                    l3 = {
+                        'debit': direction * tax_real_amt < 0 and abs(tax_real_amt) or 0.0,
+                        'credit': direction * tax_real_amt > 0 and abs(tax_real_amt) or 0.0,
+                        'account_id': tax_account_id,
+                        'date': date,
+                        'journal_id': data.get('journal_id', False),
+                        'name': name,
+                        'currency_id': invoice.currency_id and invoice.currency_id.id,
+                        'tax_code_id': tax_code_id,
+                        'tax_amount': -tax_real_amt,
+                        'amount_currency': amount and direction * amount or 0.0,
+                        'analytic_account_id': line.account_analytic_id.id,
+                    }
+                    line_id = move_line_obj_memory.create(cr, uid, l3, context=context)
+                    line_ids.append(line_id)
+        
+            ### if calculation on the Net Methology then in discount field it will take product income account or product category income account
+            if data['cal_method_selection'] == 'method_net_methodology':
+                if invoice.type == 'in_invoice':
+                    if line.product_id.property_account_income:
+                        discount_account_id = line.product_id.property_account_income.id
+                    else:
+                        discount_account_id = line.product_id.categ_id.property_account_income_categ.id
+                else:
+                    if line.product_id.property_account_income:
+                        discount_account_id = line.product_id.property_account_expense.id
+                    else:
+                        discount_account_id = line.product_id.categ_id.property_account_expense_categ.id
+                            
+            else:
+                 discount_account_id = data['account_id']
+            
+            if invoice.company_id.currency_id.id <> invoice.currency_id.id:
+                discount_amount = discount_pay - tax_real_amt
+                amount = cur_obj.compute(cr, uid, invoice.currency_id.id, invoice.company_id.currency_id.id, discount_amount, context=context)
+            
+            l4 = {
+                'debit': direction * (discount_pay - total_tax_amount) < 0 and abs(discount_pay - total_tax_amount) or 0.0,
+                'credit': direction * (discount_pay - total_tax_amount) > 0 and abs(discount_pay - total_tax_amount) or 0.0,
+                'account_id': discount_account_id,
+                'date': date,
+                'name': name,
+                'currency_id': invoice.currency_id and invoice.currency_id.id,
+                'journal_id': data.get('journal_id', False),
+                'tax_code_id': base_code_id,
+                'tax_amount': -(discount_pay - total_tax_amount),
+                'amount_currency': amount and direction * amount or 0.0,
+                'analytic_account_id': line.account_analytic_id.id,
+            }
+            
+            discount_line_id = move_line_obj_memory.create(cr, uid, l4, context=context)
+            discount_line_ids.append(discount_line_id)
+
+        self.write(cr, uid, ids,
+               {'tax_move_ids': [(6, 0, line_ids)],
+                'discount_move_ids' : [(6, 0, discount_line_ids)],
+               }, context=context)
+
+        return True
+    
+    def default_get(self, cr, uid, fields, context=None):
+      res = super(account_invoice_pay, self).default_get(cr, uid, fields, context=context)
+      invoice = self.pool.get('account.invoice').browse(cr, uid, context['id'], context=context)
+      if invoice.state in ['draft', 'proforma2', 'cancel', 'paid']:
+          raise osv.except_osv(_('Error!'), _('Cannot pay invoices in draft/proforma/cancel/done state.'))
+      return res
+     
+    def _message(self, cr, uid, ids, context=None):
+        mod_obj = self.pool.get('ir.model.data')
+        data =  self.read(cr, uid, ids, context=context)[0]
+        invoice = self.pool.get('account.invoice').browse(cr, uid, context['id'], context)
+        
+        if data.get('discount_move_ids', False):
+            context.update({'discount_move_ids': data['discount_move_ids']})
+        if data.get('tax_move_ids', False):
+            context.update({'tax_move_ids': data['tax_move_ids']})
+        if data.get('amount', False):
+            context.update({'amount': data['amount']})
+        if data.get('cash_amount', False):
+            context.update({'cash_amount': data['cash_amount']})
+            
+        total_data_amount = total_invoice_amount = 0.0
+        total_data_amount = data['amount'] + data['cash_amount']
+        total_invoice_amount = invoice.residual
+                      
+        model_data_ids = mod_obj.search(cr, uid,[('model', '=', 'ir.ui.view'), ('name', '=', 'view_account_message')], context=context)
+        resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
+        if self.pool.get('res.currency').is_zero(cr, uid, invoice.company_id.currency_id, (total_invoice_amount - total_data_amount)):
+            self.pool.get('account.invoice.pay').pay_and_reconcile(cr, uid, ids, context=context)
+            return {}
+        else:
+            return {
+                'name': _('Message'),
+                'context': context,
+                'view_type': 'form',
+                'view_mode': 'form',
+                'res_model': 'account.message',
+                'views': [(resource_id, 'form')],
+                'type': 'ir.actions.act_window',
+                'target': 'new',
+            }
+                  
+    def _message_partial(self, cr, uid, ids, context=None):
+        mod_obj = self.pool.get('ir.model.data')
+        data =  self.read(cr, uid, ids, context=context)[0]
+        invoice = self.pool.get('account.invoice').browse(cr, uid, context['id'], context)
+
+        total_data_amount = total_invoice_amount = 0.0
+        
+        if data.get('discount_move_ids', False):
+            context.update({'discount_move_ids': data['discount_move_ids']})
+        if data.get('tax_move_ids', False):
+            context.update({'tax_move_ids': data['tax_move_ids']})
+        if data.get('amount', False):
+            context.update({'amount': data['amount']})
+        if data.get('cash_amount', False):
+            context.update({'cash_amount': data['cash_amount']})
+        
+        total_data_amount = data['amount'] + data['cash_amount']
+        total_invoice_amount = invoice.residual
+        
+        if self.pool.get('res.currency').is_zero(cr, uid, invoice.company_id.currency_id, (total_invoice_amount - total_data_amount)):
+            model_data_ids = mod_obj.search(cr, uid, [('model', '=', 'ir.ui.view'), ('name', '=', 'view_account_partial_message')], context=context)
+            resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
+            return {
+                'name': _('Message'),
+                'context': context,
+                'view_type': 'form',
+                'view_mode': 'form',
+                'res_model': 'account.partial.message',
+                'views': [(resource_id, 'form')],
+                'type': 'ir.actions.act_window',
+                'target': 'new',   
+            }
+        else:
+            self.pool.get('account.invoice.pay').pay_and_reconcile(cr, uid, ids, context=context)
+            return {}      
+            
+    def wo_check(self, cr, uid, ids, context=None):
+        cur_obj = self.pool.get('res.currency')
+        mod_obj = self.pool.get('ir.model.data')
+        obj_inv = self.pool.get('account.invoice')
+        
+        if context is None:
+            context = {}
+        data =  self.read(cr, uid, ids, context=context)[0]
+        invoice = self.pool.get('account.invoice').browse(cr, uid, context['id'], context)
+        journal = self.pool.get('account.journal').browse(cr, uid, data['journal_id'], context)
+        # Here we need that:
+        #    The invoice total amount in company's currency <> paid amount in company currency
+        #    (according to the correct day rate, invoicing rate and payment rate are may be different)
+        #    => Ask to a write-off of the difference. This could happen even if both amount are equal,
+        #    because if the currency rate
+        # Get the amount in company currency for the invoice (according to move lines)
+        inv_amount_company_currency = 0
+        for aml in invoice.move_id.line_id:
+            if aml.account_id.id == invoice.account_id.id or aml.account_id.type in ('receivable', 'payable'):
+                inv_amount_company_currency += aml.debit
+                inv_amount_company_currency -= aml.credit
+        inv_amount_company_currency = abs(inv_amount_company_currency)
+        # Get the current amount paid in company currency
+        if journal.currency and invoice.company_id.currency_id.id <> journal.currency.id:
+            ctx = {'date': data['date']}
+            amount_paid = cur_obj.compute(cr, uid, journal.currency.id, invoice.company_id.currency_id.id, data['amount'], round=True, context=ctx)
+        else:
+            amount_paid = data['amount'] + data['cash_amount']
+            
+        # Get the old payment if there are some
+        if invoice.payment_ids:
+            debit = credit = 0.0
+            for payment in invoice.payment_ids:
+                debit += payment.debit
+                credit += payment.credit
+            amount_paid += abs(debit - credit)
+        
+        if data['cash_residual_amount'] == 0.0 or self.pool.get('res.currency').is_zero(cr, uid, invoice.company_id.currency_id,
+                (amount_paid - inv_amount_company_currency)):
+            return self.pay_and_reconcile(cr, uid, ids, context=context)
+        else:
+            model_data_ids = mod_obj.search(cr, uid,[('model', '=', 'ir.ui.view'), ('name', '=', 'view_account_invoice_pay_writeoff')], context=context)
+            resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
+            return {
+                'name': _('Information Addendum'),
+                'context': context,
+                'view_type': 'form',
+                'view_mode': 'form',
+                'res_model': 'account.invoice.pay.writeoff',
+                'views': [(resource_id, 'form')],
+                'type': 'ir.actions.act_window',
+                'target': 'new',
+            }
+
+    def pay_and_reconcile(self, cr, uid, ids, context=None):
+        cur_obj = self.pool.get('res.currency')
+        if context is None:
+            context = {}
+
+        data =  self.read(cr, uid, ids, context=context)[0]
+        writeoff_account_id = writeoff_journal_id = comment = False
+        
+        if 'write_off' in context and context['write_off'] :
+            writeoff_account_id = context['write_off']['writeoff_acc_id']
+            writeoff_journal_id = context['write_off']['writeoff_journal_id']
+            comment = context['write_off']['comment']
+       
+        if context.get('amount', False):
+            amount = context['amount'] + context.get('cash_amount', 0.0)
+        else:
+            amount = data['amount'] + data['cash_amount']
+        
+        invoice = self.pool.get('account.invoice').browse(cr, uid, context['id'], context=context)
+        journal = self.pool.get('account.journal').browse(cr, uid, data['journal_id'], context=context)
+        # Compute the amount in company's currency, with the journal currency (which is equal to payment currency)
+        # when it is needed :  If payment currency (according to selected journal.currency) is <> from company currency
+        curr_diff = False
+        if journal.currency and invoice.company_id.currency_id.id <> journal.currency.id:
+            ctx = {'date': data['date']}
+            amount = cur_obj.compute(cr, uid, journal.currency.id, invoice.company_id.currency_id.id, amount, context=ctx)
+            currency_id = journal.currency.id
+            # Put the paid amount in currency, and the currency, in the context if currency is different from company's currency
+            if context.get('amount', False):
+                context.update({'amount_currency': context['amount'] + context.get('cash_amount', 0.0),'currency_id': currency_id})
+            else:    
+                context.update({'amount_currency': data['amount'] + data['cash_amount'], 'currency_id': currency_id})
+            curr_diff = True
+
+        if not journal.currency and invoice.company_id.currency_id.id <> invoice.currency_id.id and not curr_diff:
+            ctx = {'date': data['date']}
+            amount = cur_obj.compute(cr, uid, invoice.currency_id.id, invoice.company_id.currency_id.id, amount, context=ctx)
+            currency_id = invoice.currency_id.id
+            # Put the paid amount in currency, and the currency, in the context if currency is different from company's currency
+            if context.get('amount', False):
+                context.update({'amount_currency': context['amount'] + context.get('cash_amount', 0.0), 'currency_id': currency_id})
+            else:    
+                context.update({'amount_currency': data['amount'] + data['cash_amount'], 'currency_id': currency_id})
+
+        context.update({'account_id': data['account_id'], 'date_p': data['date'],'comment': comment or False})        
+
+        if context.get('discount_move_ids', False):
+            context.update({'discount_move_ids': context['discount_move_ids']})
+        else:
+            context.update({'discount_move_ids': data['discount_move_ids']})    
+
+        if context.get('tax_move_ids', False):
+            context.update({'tax_move_ids': context['tax_move_ids']})
+        else:
+            context.update({'tax_move_ids': data['tax_move_ids']})
+        
+        if context.get('cash_amount', False):
+            context.update({'cash_amount': context['cash_amount']})        
+        else:
+            context.update({'cash_amount': data['cash_amount']})
+            
+        acc_id = journal.default_credit_account_id and journal.default_credit_account_id.id
+        if not acc_id:
+            raise osv.except_osv(_('Error!'), _('Your journal must have a default credit and debit account.'))
+
+        self.pool.get('account.invoice').pay_and_reconcile(cr, uid, [context['id']],
+                amount, acc_id, data['period_id'], data['journal_id'], writeoff_account_id,
+                data['period_id'], writeoff_journal_id, context, data['name'])
+        return {}
+    
+account_invoice_pay()
+
+class account_move_line_memory(osv.osv_memory):
+    _name= "account.move.line.memory"
+    _description = "Account Move Line Memory "
+    _columns = {
+        'date': fields.date('Effective Date', required=True),
+        'name': fields.char('Name', size=64, required=True),
+        'account_id': fields.many2one('account.account', 'Account',),
+        'journal_id': fields.many2one('account.journal', 'Journal', required=True, select=1),
+        'debit': fields.float('Debit', digits=(16,2)),
+        'credit': fields.float('Credit', digits=(16,2)),
+        'tax_code_id': fields.many2one('account.tax.code', 'Tax Account', help="The account can either be a base tax code or tax code account."),
+        'tax_amount': fields.float('Tax/Base Amount', digits=(16,2), select=True),
+        'currency_id': fields.many2one('res.currency', 'Currency', help="The optional foreign currency if it is a multi-currency entry."),
+        'amount_currency': fields.float('Amount Currency', help="The amount in the optional foreign currency if it is a multi-currency entry."),
+        'analytic_account_id' : fields.many2one('account.analytic.account', 'Analytic Account'),
+    }
+account_move_line_memory()
+
+class account_message(osv.osv_memory):
+    _name = "account.message"
+    def _check(self, cr, uid, ids, context=None):
+        data =  self.read(cr, uid, ids,context=context)[0]
+        result = self.pool.get('account.invoice.pay').wo_check(cr, uid, ids, context=context)
+        return result
+
+account_message()
+
+class account_partial_message(osv.osv_memory):
+    _name = "account.partial.message"
+    def _check_partial(self, cr, uid, ids, context=None):
+        data =  self.read(cr, uid, ids,context=context)[0]
+        result = self.pool.get('account.invoice.pay').pay_and_reconcile(cr, uid, ids, context=context)
+        return result
+
+account_partial_message()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== added file 'account_invoice_cash_discount/wizard/account_pay_invoice_view.xml'
--- account_invoice_cash_discount/wizard/account_pay_invoice_view.xml	1970-01-01 00:00:00 +0000
+++ account_invoice_cash_discount/wizard/account_pay_invoice_view.xml	2011-07-29 01:35:58 +0000
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+  <data>
+    <record id="view_account_invoice_pay" model="ir.ui.view">
+      <field name="name">account.invoice.pay.form</field>
+      <field name="model">account.invoice.pay</field>
+      <field name="type">form</field>
+      <field name="arch" type="xml">
+        <form string="Pay Invoice">
+          <group colspan="4">
+            <field name="amount" on_change="on_change_ammount(amount, cash_amount, context)"/>
+    		    <field name="cash_residual_amount"/>
+    		    <field name="name"/>
+    		    <field name="date"/>
+    		    <field name="journal_id" domain="[('type', '=', 'cash')]"/>
+    		    <field name="period_id"/>
+    		    <field name="cash_amount" on_change="on_change_cash_discount_amount(cash_amount, amount, context)" attrs="{'required': [('cash_amount', '>', 0)]}"/>
+    		    <field name="account_id" attrs="{'required':[('cash_amount', '>', 0)]}"/>
+        	</group>
+        	<group>
+        		<separator string="Method For Calculation" colspan="4"/>
+        		<field name="cal_method_selection" colspan="2" nolabel="1"/>
+        		<button icon="gtk-execute" string="Calculate" name="_calculation" type="object"/>
+        	</group>
+        	<group colspan="4">
+        		<separator string="Account Cash Discount Moves" colspan="4"/>
+        		<field name="discount_move_ids" widget="one2many_list" nolabel="1"/>
+        	</group>
+        	<group colspan="4">
+        		<separator string="Tax Account Moves" colspan="4"/>
+        		<field name="tax_move_ids" widget="one2many_list" nolabel="1"/>
+        	</group>
+          <group colspan="4" col="6">
+            <label string="" colspan="2"/>
+          	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+          	<button icon="gtk-execute" string="Partial Payment" name="_message_partial" type="object"/>
+          	<button icon="gtk-execute" string="Full Payment" name="_message" type="object"/>
+         </group>
+       </form>
+      </field>
+    </record>
+
+		<act_window name="Pay Invoice"
+		  res_model="account.invoice.pay"
+			src_model="account.invoice"
+			view_mode="form"
+			target="new"
+			context="{'id': active_id}"
+			id="action_view_account_invoice_pay"/>
+
+		<record id="view_account_invoice_pay_writeoff" model="ir.ui.view">
+      <field name="name">account.invoice.pay.writeoff.form</field>
+      <field name="model">account.invoice.pay.writeoff</field>
+      <field name="type">form</field>
+      <field name="arch" type="xml">
+        <form string="Information Addendum">
+        	<group colspan="4">
+        	  <separator string="Write-Off Move" colspan="4"/>
+      	    <field name="writeoff_journal_id"/>
+      			<field name="writeoff_acc_id" domain="[('type', '&lt;&gt;', 'view'), ('type', '&lt;&gt;', 'consolidation')]"/>
+      			<field name="comment"/>
+      			<separator string="Analytic" colspan="4"/>
+      			<field name="analytic_id"/>
+        	</group>
+          <group colspan="4" col="6">
+             	<label string="" colspan="2"/>
+          	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+          	<button icon="gtk-execute" string="Pay and Reconcile" name="pay_and_reconcile_writeoff" type="object"/>
+          </group>
+        </form>
+      </field>
+    </record>
+        
+    <record id="view_account_move_line_memory" model="ir.ui.view">
+      <field name="name">account.move.line.memory.form</field>
+      <field name="model">account.move.line.memory</field>
+      <field name="type">tree</field>
+      <field name="arch" type="xml">
+        <tree string="Account Move Line" editable="bottom">
+          <field name="date"/>
+          <field name="name"/>
+          <field name="account_id"/>
+          <field name="journal_id"/>
+          <field name="debit"/>
+          <field name="credit"/>
+          <field name="tax_code_id"/>
+          <field name="tax_amount"/>
+          <field name="currency_id"/>
+          <field name="amount_currency"/>
+          <field name="analytic_account_id"/>
+        </tree>
+      </field>
+		</record>
+        
+    <record id="view_account_message" model="ir.ui.view">
+  		<field name="name">account.message.form</field>
+  		<field name="model">account.message</field>
+  		<field name="type">form</field>
+  		<field name="arch" type="xml">
+  			<form string="Messages">
+  				<group>
+  					<separator string="Full Payment" colspan="4"/>
+  					<label string ="Do you really want to reconcile this invoice?
+The proposed payment does not completely balance the invoiced amount.
+Please check the payment term lines. Usually, one would use Partial
+Payment to avoid the ready/paid state for this invoice." colspan="2"/>
+  					<newline/>
+  					<button icon="gtk-cancel" special="cancel" string="Cancel" colspan="1"/>
+  					<button icon="gtk-execute" string="OK" name="_check" type="object" colspan="1"/>
+  				</group>
+  			</form>
+  		</field>
+    </record>
+		
+		<record id="view_account_partial_message" model="ir.ui.view">
+			<field name="name">account.partial.message.form</field>
+			<field name="model">account.partial.message</field>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<form string="Messages">
+					<group>
+						<separator string="Partial Payment" colspan="4"/>
+						<label string ="Do you really want to NOT reconcile this invoice?
+The proposed payment completely balances the invoiced amount.
+Please check the payment term lines. Usually, one would use Full Payment
+to receive ready/paid state for this invoice." colspan="2"/>
+						<newline/>
+						<button icon="gtk-cancel" special="cancel" string="Cancel" colspan="1"/>
+						<button icon="gtk-execute" string="OK" name="_check_partial" type="object" colspan="1"/>
+					</group>
+				</form>
+			</field>
+		</record>
+	</data>
+</openerp>
\ No newline at end of file

=== added file 'account_invoice_cash_discount/wizard/invoice_statement_payment.py'
--- account_invoice_cash_discount/wizard/invoice_statement_payment.py	1970-01-01 00:00:00 +0000
+++ account_invoice_cash_discount/wizard/invoice_statement_payment.py	2011-07-29 01:35:58 +0000
@@ -0,0 +1,288 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2008 Camptocamp SA All Rights Reserved. (JGG)
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+
+import wizard
+import pooler
+from tools.misc import UpdateableStr
+import time
+
+FORM = UpdateableStr()
+
+FIELDS = {
+    'lines': {
+        'string': 'Invoices',
+        'type': 'many2many',
+        'relation': 'account.move.line',
+    },
+}
+
+START_FIELD = {
+    'date': {
+        'string': 'Payment Date',
+        'type': 'date',
+        'required': True,
+        'default': lambda *a: time.strftime('%Y-%m-%d'),
+    },
+    'journal_id': {
+        'string': 'Journal',
+        'type': 'many2many', 
+        'relation': 'account.journal',
+        'domain': '[("type", "in", ["sale", "purchase", "cash"])]',
+        'help': 'This field allows you to choose the accounting journals you want to search invoices in. If you leave this field empty all sale, purchase and cash journals will be searched.',
+    },
+}
+
+START_FORM = '''<?xml version="1.0"?>
+<form string="Import Invoices in Statement">
+    <label string="Choose Journal and Payment Date" colspan="4"/>
+    <field name="date"/>
+    <field name="journal_id" colspan="4"/>
+</form>'''
+
+def _search_invoices(obj, cr, uid, data, context):
+    pool = pooler.get_pool(cr.dbname)
+    statement_obj = pool.get('account.bank.statement')
+    journal_obj = pool.get('account.journal')
+    line_obj = pool.get('account.move.line')
+
+    statement = statement_obj.browse(cr, uid, data['id'], context=context)
+    args_move_line = []
+    repeated_move_line_ids = []
+    # Creating a group that is unique for importing move lines (move lines, once imported into statement lines, should not appear again)
+    for st_line in statement.line_ids:
+        args_move_line = []
+        args_move_line.append(('name', '=', st_line.name))
+        args_move_line.append(('ref', '=', st_line.ref))
+        if st_line.partner_id:
+            args_move_line.append(('partner_id', '=', st_line.partner_id.id))
+        args_move_line.append(('account_id', '=', st_line.account_id.id))
+        
+        move_line_id = line_obj.search(cr, uid, args_move_line, context=context)
+        if move_line_id:
+            repeated_move_line_ids += move_line_id
+        
+    journal_ids = data['form']['journal_id'][0][2]
+
+    if journal_ids == []:
+        journal_ids = journal_obj.search(cr, uid, [('type', 'in', ('sale', 'cash', 'purchase'))], context=context)
+    
+    args = [
+        ('reconcile_id', '=', False),
+        ('journal_id', 'in', journal_ids),
+        ('account_id.reconcile', '=', True)]
+    
+    if repeated_move_line_ids:
+        args.append(('id', 'not in', repeated_move_line_ids))
+           
+    line_ids = line_obj.search(cr, uid, args,
+        #order='date DESC, id DESC', #doesn't work
+        context=context)
+        
+    FORM.string = '''<?xml version="1.0"?>
+<form string="Import Entries">
+    <field name="lines" colspan="4" height="300" width="800" nolabel="1"
+        domain="[('id', 'in', [%s])]"/>
+</form>''' % (','.join([str(x) for x in line_ids]))
+    return {}
+
+def _populate_statement(obj, cursor, user, data, context):
+
+    line_ids = data['form']['lines'][0][2]
+    line_date=data['form']['date']
+    if not line_ids:
+        return {}
+
+    pool = pooler.get_pool(cursor.dbname)
+    statement_obj = pool.get('account.bank.statement')
+    statement_line_obj = pool.get('account.bank.statement.line')
+    statement_reconcile_obj = pool.get('account.bank.statement.reconcile')
+    statement_reconcile_line_obj = pool.get('account.bank.statement.reconcile.line')
+    obj_inv = pool.get('account.invoice')
+    invoice_tax_obj = pool.get("account.invoice.tax")
+    line_obj = pool.get('account.move.line')
+    currency_obj = pool.get('res.currency')
+    tax_obj = pool.get('account.tax')
+
+    discount = 0.0
+
+    statement = statement_obj.browse(cursor, user, data['id'], context=context)
+    # for each selected move lines
+    for line in line_obj.browse(cursor, user, line_ids, context=context):
+        ctx = context.copy()
+        #  take the date for computation of currency => use payment date
+        # if line.date_maturity:
+        #     ctx['date'] = line.date_maturity 
+        # else:
+        ctx['date'] = line_date
+        invoice_amount = cal_invoice_amount = 0.0
+        if line.debit > 0:
+            invoice_amount = line.debit
+        elif line.credit > 0:
+            invoice_amount = -line.credit
+        
+        reconcile_id = statement_reconcile_obj.create(cursor, user, {
+            'line_ids': [(6, 0, [line.id])]
+            }, context=context)
+        
+         ######################################### Calculation for discount and taxes######
+        if line.invoice.id:
+            discount = 0.0
+            account = False
+            invoice = obj_inv.browse(cursor, user, line.invoice.id, context=context)
+            for invoice_line in invoice.invoice_line:
+                line_tax_amount = total_tax_amount = 0.0
+                tax_account_id = tax_code_id = tax_base_id = False
+                #####get the ratio of the line in the total invoice amount 
+                for tax in tax_obj.compute(cursor, user, invoice_line.invoice_line_tax_id, invoice_line.price_subtotal / invoice_line.quantity, invoice_line.quantity, invoice.address_invoice_id.id, invoice_line.product_id, invoice.partner_id):    
+                    line_tax_amount += tax['amount']
+                line_total = invoice_line.price_subtotal + line_tax_amount
+                invoice_res_amount = invoice.amount_total
+                line_ratio = line_total / invoice_res_amount
+                ###########################
+                if line.amount_currency:
+                    invoice_amount = currency_obj.compute(cursor, user, line.currency_id.id, statement.currency.id, line.amount_currency, context=ctx)
+                elif line.invoice and line.invoice.currency_id.id <> statement.currency.id:
+                    invoice_amount = currency_obj.compute(cursor, user, line.invoice.currency_id.id, statement.currency.id, invoice_amount, context=ctx)
+                    
+                amount = obj_inv._get_amount(cursor, user, [invoice.id], invoice_amount, invoice.payment_term.id, context=context)
+                cal_invoice_amount = amount['amount']
+                discount = obj_inv._get_payment(cursor, user, [invoice.id], cal_invoice_amount, invoice.payment_term.id, context=context)
+                account = obj_inv._get_account(cursor, user, [invoice.id], cal_invoice_amount, invoice.payment_term.id, context=context)
+                
+                ### set fiscal positon for the discount account
+                if account and invoice.fiscal_position:
+                    account = pool.get('account.fiscal.position').map_account(cursor, user, invoice.fiscal_position, account)
+                
+                #### discount for the invoice line
+                discount_pay = discount * line_ratio
+                if invoice_line.invoice_line_tax_id:
+                    tax_real_amt = 0.0
+                    for tax_id in invoice_line.invoice_line_tax_id:
+                        tax_data = tax_obj.browse(cursor, user, tax_id.id, context=context)
+                        tax_amt = discount_pay * tax_data.amount
+                        tax_real_amt = tax_amt / (1 + tax_data.amount)
+                        total_tax_amount += tax_real_amt
+                        
+                        tax_base = tax_data.base_code_id.id
+                        tax_code = tax_data.tax_code_id.id
+                        
+                        tax_invoice_id = invoice_tax_obj.search(cursor, user, [('invoice_id', '=', invoice.id), ('tax_code_id', '=', tax_code), ('base_code_id', '=', tax_base)])
+                        for inv_tax_id in tax_invoice_id:
+                            tax_value = invoice_tax_obj.browse(cursor, user, inv_tax_id)
+                            tax_account_id = tax_value.account_id.id
+                            tax_code_id = tax_value.tax_code_id.id
+                            tax_base_id = tax_value.base_code_id.id
+                            
+                        ### set fisical positon for the tax account
+                        if tax_account_id and invoice.fiscal_position:
+                            tax_account_id = pool.get('account.fiscal.position').map_account(cursor, user, invoice.fiscal_position, tax_account_id)
+                        
+                        if tax_real_amt:
+                            statement_reconcile_line_obj.create(cursor, user, {
+                                'name': line.name,
+                                'amount': tax_real_amt,
+                                'account_id': tax_account_id,
+                                'line_id': reconcile_id,
+                                'tax_code_id': tax_code_id
+                                }, context=context)
+
+                if discount:
+                    discount = discount * line_ratio
+                    statement_reconcile_line_obj.create(cursor, user, {
+                        'name': line.name,
+                        'amount': discount - total_tax_amount,
+                        'account_id': account,
+                        'line_id': reconcile_id,
+                        'tax_code_id': tax_base_id
+                        }, context=context)
+        ##########################################################################
+        
+        if line.journal_id.type == 'sale':
+            type = 'customer'
+        elif line.journal_id.type == 'purchase':
+            type = 'supplier'
+        else:
+            type = 'general'
+            
+        statement_line_obj.create(cursor, user, {
+            'name': line.name or '?',
+            'amount': cal_invoice_amount,
+            'type': type,
+            'partner_id': line.partner_id.id,
+            'account_id': line.account_id.id,
+            'statement_id': statement.id,
+            'ref': line.ref,
+            'reconcile_id': reconcile_id,
+            'date': line_date, #time.strftime('%Y-%m-%d'), #line.date_maturity or,
+            'cash_discount': discount,
+            'transferred_amount': cal_invoice_amount - discount,
+            }, context=context)
+    return {}
+    
+    
+class PopulateStatementFromInv(wizard.interface):
+    """
+    Populate the current statement with selected invoices
+    """
+    states = {
+        'init': {
+            'actions': [],
+            'result': {
+                'type': 'form',
+                'arch': START_FORM,
+                'fields':START_FIELD,
+                'state': [
+                    ('end', '_Cancel'),
+                    ('go', '_Go', '', True),
+                ]
+            },
+        },
+        'go': {
+            'actions': [_search_invoices],
+            'result': {
+                'type': 'form',
+                'arch': FORM,
+                'fields': FIELDS,
+                'state': [
+                    ('end', '_Cancel','', True),
+                    ('finish', 'O_k','', True)
+                ]
+            },
+        },
+
+        'finish': {
+        'actions': [],
+        'result': {
+            'type': 'action',
+            'action': _populate_statement,
+            'state': 'end'
+        },
+    },
+    }
+PopulateStatementFromInv('populate_statement_from_inv1')
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'account_invoice_cash_discount/wizard/wizard_discount_reconcile.py'
--- account_invoice_cash_discount/wizard/wizard_discount_reconcile.py	1970-01-01 00:00:00 +0000
+++ account_invoice_cash_discount/wizard/wizard_discount_reconcile.py	2011-07-29 01:35:58 +0000
@@ -0,0 +1,291 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution   
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import wizard
+import netsvc
+import time
+import osv
+import pooler
+from mx import DateTime as datetime
+from tools.translate import _
+
+_transaction_form = '''<?xml version="1.0"?>
+<form string="Reconciliation">
+    <separator string="Reconciliation Transactions" colspan="4"/>
+    <field name="trans_nbr"/>
+    <newline/>
+    <field name="credit"/>
+    <field name="debit"/>
+    <separator string="Write-Off" colspan="4"/>
+    <field name="writeoff"/>
+</form>'''
+
+_transaction_fields = {
+    'trans_nbr': {
+        'string': '# of Transaction',
+        'type': 'integer',
+        'readonly': True,
+    },
+    'credit': {
+        'string': 'Credit Amount',
+        'type': 'float',
+        'readonly': True,
+    },
+    'debit': {
+        'string': 'Debit Amount',
+        'type': 'float',
+        'readonly': True,
+    },
+    'writeoff': {
+        'string': 'Write-Off Amount',
+        'type': 'float',
+        'readonly': True,
+    },
+}
+
+def _trans_rec_get(self, cr, uid, data, context=None):
+    pool = pooler.get_pool(cr.dbname)
+    account_move_line_obj = pool.get('account.move.line')
+    credit = debit = 0.0
+    account_id = False
+    count = 0
+    for line in account_move_line_obj.browse(cr, uid, data['ids'], context=context):
+        if not line.reconcile_id and not line.reconcile_id.id:
+            count += 1
+            credit += line.credit
+            debit += line.debit
+            account_id = line.account_id.id
+    return {'trans_nbr': count, 'account_id': account_id, 'credit': credit, 'debit': debit, 'writeoff': debit - credit}
+
+def _trans_rec_reconcile_partial(self, cr, uid, data, context=None):
+    pool = pooler.get_pool(cr.dbname)
+    account_move_line_obj = pool.get('account.move.line')
+    account_move_line_obj.reconcile_partial(cr, uid, data['ids'], 'manual', context=context)
+    return {}
+
+def _trans_rec_reconcile(self, cr, uid, data, context=None):
+    pool = pooler.get_pool(cr.dbname)
+    account_move_line_obj = pool.get('account.move.line')
+
+    form = data['form']
+    account_id = form.get('writeoff_acc_id', False)
+    context['date_p'] = form.get('date_p', False)
+    date = False
+    if context['date_p']:
+        date = datetime.strptime(context['date_p'], '%Y-%m-%d')
+    ids = pool.get('account.period').find(cr, uid, dt=date, context=context)
+    period_id = False
+    if len(ids):
+        period_id = ids[0]
+
+    journal_id = form.get('journal_id', False)
+    context['comment'] = form.get('comment', False)
+    context['analytic_id'] = form.get('analytic_id', False)
+    account_move_line_obj.reconcile(cr, uid, data['ids'], 'manual', account_id,
+            period_id, journal_id, context=context)
+    return {}
+
+def _trans_rec_reconcile_discount(self, cr, uid, data, context=None):
+    pool = pooler.get_pool(cr.dbname)
+    account_move_line_obj = pool.get('account.move.line')
+    
+    form = data['form']
+    account_id = form.get('discount_acc_id', False)
+    context['date_p'] = form.get('date_p', False)
+    date = context['date_p'] and datetime.strptime(context['date_p'], '%Y-%m-%d')
+    ids = pool.get('account.period').find(cr, uid, dt=date, context=context)
+    period_id = False
+    if len(ids):
+        period_id = ids[0]
+        
+    journal_id = form.get('journal_id', False)
+    context['comment'] = form.get('comment', False)
+    context['analytic_id'] = form.get('analytic_id', False)
+    account_move_line_obj.reconcile_discount(cr, uid, data['ids'], 'manual', account_id,
+            period_id, journal_id, context=context)
+    return {}
+
+def _partial_check(self, cr, uid, data, context):
+    if _trans_rec_get(self,cr,uid, data, context)['writeoff'] == 0:
+        return 'init_full'
+    return 'init_partial'
+
+_transaction_add_form = '''<?xml version="1.0"?>
+<form string="Information Addendum">
+    <separator string="Write-Off Move" colspan="4"/>
+    <field name="journal_id"/>
+    <field name="writeoff_acc_id" domain="[('type', '&lt;&gt;', 'view')]"/>
+    <field name="date_p"/>
+    <field name="comment"/>
+    <separator string="Analytic" colspan="4"/>
+    <field name="analytic_id"/>
+</form>'''
+
+_transaction_add_fields = {
+    'journal_id': {
+        'string': 'Write-Off Journal',
+        'type': 'many2one',
+        'relation': 'account.journal',
+        'required': True,
+    },
+    'writeoff_acc_id': {
+        'string': 'Write-Off account',
+        'type': 'many2one',
+        'relation': 'account.account',
+        'required': True,
+    },
+    'date_p': {
+        'string': 'Date',
+        'type': 'date',
+    },
+    'comment': {
+        'string': 'Comment',
+        'type': 'char',
+        'size': 64,
+        'required': True,
+    },
+    'analytic_id': {
+        'string': 'Analytic Account',
+        'type': 'many2one',
+        'relation': 'account.analytic.account',
+    },
+}
+
+def _trans_rec_addendum(self, cr, uid, data, context={}):
+    date_p = time.strftime('%Y-%m-%d')
+    return {'date_p': date_p, 'comment': _('Write-Off')}
+
+_transaction_discount_form = '''<?xml version="1.0"?>
+<form string="Cash Discount Information">
+    <separator string="Cash Discount Move" colspan="4"/>
+    <field name="journal_id"/>
+    <field name="discount_acc_id" domain="[('type', '&lt;&gt;', 'view')]"/>
+    <field name="date_p"/>
+    <field name="comment"/>
+    <separator string="Analytic" colspan="4"/>
+    <field name="analytic_id"/>
+</form>'''
+
+_transaction_discount_fields = {
+    'journal_id': {
+        'string': 'Cash Discount Journal',
+        'type': 'many2one',
+        'relation': 'account.journal',
+        'required': True,
+    },
+    'discount_acc_id': {
+        'string': 'Cash Discount account',
+        'type': 'many2one',
+        'relation': 'account.account',
+        'required': True,
+    },
+    'date_p': {
+        'string': 'Date',
+        'type': 'date',
+    },
+    'comment': {
+        'string': 'Comment',
+        'type': 'char',
+        'size': 64,
+        'required': True,
+    },
+    'analytic_id': {
+        'string': 'Analytic Account',
+        'type': 'many2one',
+        'relation': 'account.analytic.account',
+    },
+}
+
+def _trans_rec_discount(self, cr, uid, data, context={}):
+    date_p = time.strftime('%Y-%m-%d')
+    return {'date_p': date_p, 'comment': _('Cash Discount')}
+
+class wiz_reconcile(wizard.interface):
+    states = {
+        'init': {
+            'actions': [],
+            'result': {
+                'type': 'choice',
+                'next_state': _partial_check,
+            }
+        },
+        'init_full': {
+            'actions': [_trans_rec_get],
+            'result': {
+                'type': 'form',
+                'arch': _transaction_form,
+                'fields': _transaction_fields,
+                'state': [('end', 'Cancel'), ('reconcile', 'Reconcile')],
+            }
+        },
+        'init_partial': {
+            'actions': [_trans_rec_get],
+            'result': {
+                'type': 'form',
+                'arch': _transaction_form,
+                'fields': _transaction_fields,
+                'state': [('end', 'Cancel'), ('addendum', 'Reconcile with Write-Off'), ('discount', 'Reconcile with Cash Discount'), ('partial', 'Partial Reconcile')],
+            }
+        },
+        'addendum': {
+            'actions': [_trans_rec_addendum],
+            'result': {
+                'type': 'form',
+                'arch': _transaction_add_form,
+                'fields': _transaction_add_fields,
+                'state': [('end', 'Cancel'), ('reconcile', 'Reconcile')],
+            }
+        },
+        'discount': {
+            'actions': [_trans_rec_discount],
+            'result': {
+                'type': 'form',
+                'arch': _transaction_discount_form,
+                'fields': _transaction_discount_fields,
+                'state': [('end', 'Cancel'), ('reconcile_discount', 'Reconcile')],
+            }
+        },
+        'reconcile': {
+            'actions': [_trans_rec_reconcile],
+            'result': {
+                'type': 'state',
+                'state': 'end',
+            }
+        },
+        'reconcile_discount': {
+            'actions': [_trans_rec_reconcile_discount],
+            'result': {
+                'type': 'state',
+                'state': 'end',
+            }
+        },
+        'partial': {
+            'actions': [_trans_rec_reconcile_partial],
+            'result': {
+                'type': 'state',
+                'state': 'end',
+            }
+        }
+    }
+wiz_reconcile('account.move.line.discount.reconcile')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'account_invoice_cash_discount/wizard/wizard_write_period_entry_calculation.py'
--- account_invoice_cash_discount/wizard/wizard_write_period_entry_calculation.py	1970-01-01 00:00:00 +0000
+++ account_invoice_cash_discount/wizard/wizard_write_period_entry_calculation.py	2011-07-29 01:35:58 +0000
@@ -0,0 +1,188 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution	
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import wizard
+import pooler
+import time
+from datetime import datetime
+from dateutil.relativedelta import relativedelta
+from mx import DateTime
+from tools.translate import _
+
+_writeoff_entry_calculation_form = '''<?xml version="1.0"?>
+<form string="Calculation">
+    <separator string="Calculation of period-wise Write-Off Amount" colspan="4"/>
+    <field name="cash_discount_id"/>
+    <field name="tax_id"/>
+    <field name="period_id"/>
+    <field name="journal_id"/>
+</form>'''
+
+_writeoff_entry_calculation_fields = {
+    'cash_discount_id': {
+        'string': 'Cash Discount Account',
+        'type': 'many2one',
+        'relation': 'account.account',
+        'required': True,
+    },
+    'tax_id': {
+        'string': 'Taxes',
+        'type': 'many2one',
+        'relation': 'account.tax',
+        'required': True,
+    },
+    'period_id': {
+        'string': 'Period',
+        'type': 'many2one',
+        'relation': 'account.period',
+        'required': True,
+    },
+    'journal_id': {
+        'string': 'Journal',
+        'type': 'many2one',
+        'relation': 'account.journal',
+        'required': True,
+    },
+}
+
+def _compute(self, cr, uid, data, context):
+    
+    pool = pooler.get_pool(cr.dbname)
+    invoice_obj = pool.get('account.invoice')
+    account_move_obj= pool.get('account.move')
+    account_move_line_obj = pool.get('account.move.line')
+    payment_term_obj = pool.get('account.payment.term')
+    tax_obj = pool.get('account.tax')
+    
+    period_id = data['form']['period_id']
+    tax_id = data['form']['tax_id']
+    journal_id = data['form']['journal_id']
+    cash_discount_id = data['form']['cash_discount_id']
+    
+    account_move_line_ids = account_move_line_obj.search(cr, uid, [('period_id', '=', period_id), ('account_id', '=', cash_discount_id)])
+    date = time.strftime('%Y-%m-%d')
+
+    discount_lines = []
+    
+    tax_account_id = dis_tax_code_id = discount_code_id = False
+
+    for line in account_move_line_obj.browse(cr, uid, account_move_line_ids, context=context):
+        tax_discount_amt = 0.0
+        tax_discount_data = tax_obj.browse(cr, uid, tax_id, context=context)
+        tax_account_id = tax_discount_data.account_collected_id and tax_discount_data.account_collected_id.id or tax_discount_data.tax_code_id.id
+        discount_code_id = tax_discount_data.base_code_id.id
+        dis_tax_code_id = tax_discount_data.tax_code_id.id
+            
+        if line.debit > 0.0:
+            tax_discount_amt = 0.0
+            tax_discount_amt = line.debit * tax_discount_data.amount
+                 
+            discount_lines.append(
+                    (0, 0, {
+                        'name': line.name,
+                        'debit': 0.0,
+                        'credit': tax_discount_amt,
+                        'account_id': cash_discount_id,
+                        'date': date,
+                        'partner_id': line.partner_id.id,
+                        'tax_amount': -tax_discount_amt,
+                        'tax_code_id': discount_code_id,
+                    })),
+            discount_lines.append(
+                    (0, 0, {
+                        'name': line.name,
+                        'debit': tax_discount_amt,
+                        'credit': 0.0,
+                        'account_id': tax_account_id,
+                        'date': date,
+                        'partner_id': line.partner_id.id,
+                        'tax_amount': -tax_discount_amt,
+                        'tax_code_id': dis_tax_code_id,
+                    }))
+        elif line.credit > 0.0:
+            tax_discount_amt = 0.0
+            tax_discount_amt = line.credit * tax_discount_data.amount
+
+            discount_lines.append(
+                    (0, 0, {
+                        'name': line.name,
+                        'debit': 0.0,
+                        'credit': tax_discount_amt,
+                        'account_id': tax_account_id,
+                        'date': date,
+                        'partner_id': line.partner_id.id,
+                        'tax_amount': -tax_discount_amt,
+                        'tax_code_id': dis_tax_code_id,
+                    }))
+            discount_lines.append(
+                    (0, 0, {
+                        'name': line.name,
+                        'debit': tax_discount_amt,
+                        'credit': 0.0,
+                        'account_id': cash_discount_id,
+                        'date': date,
+                        'partner_id': line.partner_id.id,
+                        'tax_amount': -tax_discount_amt,
+                        'tax_code_id': discount_code_id,
+                    })),
+
+    discount_move_line = account_move_obj.create(cr, uid, 
+            {
+            'period_id': period_id,
+            'journal_id': journal_id,
+            'date': date,
+            'line_id': discount_lines,
+            })        
+    
+    return {
+        'domain': [('id', '=', discount_move_line)],
+        'name': _('Computed Entries'),
+        'view_type': 'form',
+        'view_mode': 'tree,form',
+        'view_id': False,
+        'res_model': 'account.move',
+        'type': 'ir.actions.act_window',
+    }
+
+class wiz_period_writeoff_calculation(wizard.interface):
+    states = {
+        'init': {
+            'actions': [],
+            'result': {
+                'type': 'form',
+                'arch': _writeoff_entry_calculation_form,
+                'fields': _writeoff_entry_calculation_fields,
+                'state': [('calculate', 'Compute'), ('end', 'Cancel')],
+            }
+        },
+        'calculate': {
+            'actions': [],
+            'result': {
+                'type': 'action',
+                'action': _compute,
+                'state': 'end',
+            }
+        }
+    }
+wiz_period_writeoff_calculation('account_period_write_calculation')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added directory 'account_payment_discount_extension'
=== added file 'account_payment_discount_extension/__init__.py'
--- account_payment_discount_extension/__init__.py	1970-01-01 00:00:00 +0000
+++ account_payment_discount_extension/__init__.py	2011-07-29 01:35:58 +0000
@@ -0,0 +1,24 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import account_payment_discount
+import wizard
\ No newline at end of file

=== added file 'account_payment_discount_extension/__terp__.py'
--- account_payment_discount_extension/__terp__.py	1970-01-01 00:00:00 +0000
+++ account_payment_discount_extension/__terp__.py	2011-07-29 01:35:58 +0000
@@ -0,0 +1,44 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+{
+    "name" : "Account Payment Discount Extension",
+    "version" : "1.1",
+    "author" : "Big Consulting",
+    "website" : "http://www.openbig.org",
+    "category" : "Generic Modules/Accounting",
+    "license" : "GPL-3",
+    "depends" : ["base","account_payment_extension",],
+    "init_xml" : [
+    ],
+    "demo_xml" : [
+    ],
+    "update_xml" : [
+            "account_payment_disocunt_wizard.xml",
+            "account_payment_discount_view.xml",
+            "account_payment_discount_data.xml",
+            ],
+    "active": False,
+    "installable": True,
+    'certificate': '001057921598129524157',
+}
+

=== added file 'account_payment_discount_extension/account_payment_discount.py'
--- account_payment_discount_extension/account_payment_discount.py	1970-01-01 00:00:00 +0000
+++ account_payment_discount_extension/account_payment_discount.py	2011-07-29 01:35:58 +0000
@@ -0,0 +1,115 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import netsvc
+from osv import fields, osv
+import time
+from mx import DateTime
+
+class payment_order(osv.osv):
+    _inherit='payment.order'
+    _columns={
+        'inter_bank_journal': fields.many2one('account.journal', 'Intermediate Bank Journal', required=False),
+    }
+payment_order()
+
+class account_invoice(osv.osv):
+    _inherit='account.invoice'
+    _columns={
+        'next_payment_date': fields.date('Next Payment Date', states={'open': [('readonly', True)], 'close': [('readonly', True)]},),
+    }
+    
+    def action_date_assign(self, cr, uid, ids, *args):
+        data = super(account_invoice, self).action_date_assign(cr, uid, ids, *args)
+        for inv in self.browse(cr, uid, ids):
+            if inv.payment_term.id:
+                payment_data = self.pool.get('account.payment.term').browse(cr, uid, inv.payment_term.id).cash_discount_ids
+                if payment_data:
+                    delay = payment_data[0].delay
+                    if inv.date_invoice:
+                        date_invoice = inv.date_invoice
+                    else:
+                        date_invoice = time.strftime('%Y-%m-%d')
+                    self.write(cr, uid, [inv.id], {'next_payment_date': (DateTime.strptime(date_invoice, '%Y-%m-%d') + DateTime.RelativeDateTime(days = delay)).strftime('%Y-%m-%d')})
+        return data
+        
+    def _next_date(self, cr, uid, ids, context=None):
+        payment_term_obj = self.pool.get('account.payment.term')
+        current_date = time.strftime('%Y-%m-%d')
+        ids = self.search(cr, uid, [('state', '=', 'open')])
+        for id in ids:
+            invoice_data = self.browse(cr, uid, id, context=context)
+            next_pay_date = invoice_data.next_payment_date
+            if invoice_data.payment_term:
+                payment_data = payment_term_obj.browse(cr, uid, invoice_data.payment_term.id)
+            if next_pay_date: 
+                if next_pay_date < current_date:
+                    for dis_line in payment_data.cash_discount_ids:
+                        discount_date = (DateTime.strptime(invoice_data.date_invoice, '%Y-%m-%d') + DateTime.RelativeDateTime(days=dis_line.delay)).strftime('%Y-%m-%d')
+                        if discount_date > current_date:
+                            self.write(cr, uid, [id], {'next_payment_date': discount_date})
+                            break
+        return True
+    
+    def check_next_date(self, cr, uid, ids=[], context=None):
+        self._next_date(cr, uid, ids, context=context)
+        
+    def copy(self, cr, uid, id, default=None, context=None):
+        if default is None:
+            default = {}
+        default = default.copy()
+        default.update({'next_payment_date': False})
+        return super(account_invoice, self).copy(cr, uid, id, default, context)
+
+account_invoice()
+
+class payment_line(osv.osv):
+    _name = 'payment.line'
+    _inherit = 'payment.line'
+    _columns = {
+        'cash_discount': fields.float('Cash Discount'),
+        'discount_date': fields.date('Discount Date'),
+        'pay_amount': fields.float('Pay Amount'),
+    }
+payment_line()
+
+class res_partner(osv.osv):
+    _inherit = 'res.partner'
+    _columns = {
+        'property_customer_cash_discount_account': fields.property(
+            'account.account',
+            type = 'many2one',
+            relation = 'account.account',
+            string = "Customer Cash Discount Account",
+            method = True,
+            view_load = True,
+            required = True),
+        'property_supplier_cash_discount_account': fields.property(
+            'account.account',
+            type = 'many2one',
+            relation = 'account.account',
+            string = "Supplier Cash Discount Account",
+            method = True,
+            view_load = True,
+            required = True),
+      }
+res_partner()

=== added file 'account_payment_discount_extension/account_payment_discount_data.xml'
--- account_payment_discount_extension/account_payment_discount_data.xml	1970-01-01 00:00:00 +0000
+++ account_payment_discount_extension/account_payment_discount_data.xml	2011-07-29 01:35:58 +0000
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+  <data noupdate="1">
+    <record forcecreate="True" id="ir_cron_discount_action" model="ir.cron">
+      <field name="name">Next Payment Date</field>
+      <field name="interval_number">1</field>
+      <field name="interval_type">days</field>
+      <field name="numbercall">-1</field>
+      <field eval="False" name="doall"/>
+      <field eval="'account.invoice'" name="model"/>
+      <field eval="'check_next_date'" name="function"/>
+      <field eval="'(False,)'" name="args"/>
+    </record>
+  </data>
+</openerp>

=== added file 'account_payment_discount_extension/account_payment_discount_view.xml'
--- account_payment_discount_extension/account_payment_discount_view.xml	1970-01-01 00:00:00 +0000
+++ account_payment_discount_extension/account_payment_discount_view.xml	2011-07-29 01:35:58 +0000
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+  <data>
+    <record model="ir.ui.view" id="invoice_customer_form_inherit11">
+      <field name="name">account.invoice.customer.form.inherit</field>
+      <field name="model">account.invoice</field>
+      <field name="type">form</field>
+      <field name="inherit_id" ref="account.invoice_form"/>
+      <field name="arch" type="xml">
+        <field name="date_due" position="after">
+          <field name="next_payment_date"/>
+        </field>
+    </field>
+    </record>
+
+    <record model="ir.ui.view" id="invoice_supplier_form_inherit11">
+      <field name="name">account.invoice.supplier.form.inherit</field>
+      <field name="model">account.invoice</field>
+      <field name="type">form</field>
+      <field name="inherit_id" ref="account.invoice_supplier_form"/>
+      <field name="priority">2</field>
+      <field name="arch" type="xml">
+        <field name="number" position="before">
+          <field name="next_payment_date"/>
+        </field>
+      </field>
+    </record>
+
+    <record id="view_payment_order_form_wizard_ext" model="ir.ui.view">
+      <field name="name">payment.order.form.ext11</field>
+      <field name="model">payment.order</field>
+      <field name="type">form</field>
+      <field name="inherit_id" ref="account_payment_extension.view_payment_order_form_ext1"/>
+      <field name="arch" type="xml">
+        <xpath expr="//button[@string='Select invoices to pay/receive payment']" position="replace">
+          <label string=""/>
+          <button name="%(wizard_populate_payment_discount_ext)d" string="Select invoices to pay/receive payment" type="action" attrs="{'invisible': [('state', '=', 'done')]}"/>
+        </xpath>
+      </field>
+    </record>
+    
+     <record model="ir.ui.view" id="view_payment_order_form1">
+        <field name="name">payment.order.form1</field>
+        <field name="model">payment.order</field>
+        <field name="inherit_id" ref="account_payment.view_payment_order_form"/>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+          <xpath expr="//field[@name='partner_id']" position="before">
+            <field name="cash_discount"/>
+            <field name="discount_date"/>
+            <field name="pay_amount"/>
+            <label string=""/>
+          </xpath>
+        </field>
+    </record>
+    
+    <record model="ir.ui.view" id="view_payment_order_tree1">
+      <field name="name">payment.order.form1</field>
+      <field name="model">payment.order</field>
+      <field name="inherit_id" ref="account_payment.view_payment_order_form"/>
+      <field name="type">tree</field>
+      <field name="arch" type="xml">
+        <xpath expr="//tree/field[@name='amount']" position="after">
+          <field name="cash_discount"/>
+          <field name="discount_date"/>
+          <field name="pay_amount"/>
+        </xpath>
+      </field>
+    </record>
+    
+    <record model="ir.ui.view" id="view_payment_order_bank_form1">
+      <field name="name">payment.order.form1</field>
+      <field name="model">payment.order</field>
+      <field name="inherit_id" ref="account_payment.view_payment_order_form"/>
+      <field name="type">form</field>
+      <field name="arch" type="xml">
+        <field name="user_id" position="after">
+          <field name="inter_bank_journal" required="True"/>
+        </field>
+      </field>
+    </record>
+    
+    <record id="view_payment_order_wizard_form" model="ir.ui.view">
+      <field name="name">payment.order.form1</field>
+      <field name="model">payment.order</field>
+      <field name="type">form</field>
+      <field name="inherit_id" ref="account_payment.view_payment_order_form"/>
+      <field name="arch" type="xml">
+        <xpath expr="//button[@string='Make Payments']" position="replace">
+          <button name="%(wizard_pay_discount_payment)d" states="open" string="Make Payments" type="action" />
+        </xpath>
+      </field>
+    </record>
+    
+    <record id="view_partner_customer_discount_property_form" model="ir.ui.view">
+      <field name="name">res.partner.property.cus_discount.form.inherit</field>
+      <field name="model">res.partner</field>
+      <field name="type">form</field>
+      <field name="priority">2</field>
+      <field name="inherit_id" ref="account.view_partner_property_form"/>
+      <field name="arch" type="xml">
+        <field name="property_account_receivable" position="after">
+          <field name="property_customer_cash_discount_account"/>
+        </field>
+      </field>
+    </record>
+    
+    <record id="view_partner_supplier_discount_property_form" model="ir.ui.view">
+      <field name="name">res.partner.property.sup_discount.form.inherit</field>
+      <field name="model">res.partner</field>
+      <field name="type">form</field>
+      <field name="priority">2</field>
+      <field name="inherit_id" ref="account.view_partner_property_form"/>
+      <field name="arch" type="xml">
+        <field name="property_account_payable" position="after">
+          <field name="property_supplier_cash_discount_account"/>
+        </field>
+      </field>
+    </record>
+    
+    <!--**************************** Customer Invoice Refunds *******************************-->
+    <menuitem id="menu_customer_invoice_refund"
+      name="Customer Invoice Refunds"
+      parent="account_payment.menu_main"/>
+  
+    <record id="action_menu_customer_invoice_refund" model="ir.actions.act_window">
+      <field name="name">Customer Invoice Refunds</field>
+      <field name="res_model">payment.order</field>
+      <field name="view_type">form</field>
+      <field name="view_mode">tree,form</field>
+      <field name="context">{'payment_type_customer': 'customer_refund'}</field>
+      <field name="domain">[('type', '=', 'payable')]</field>
+    </record>
+    <menuitem action="action_menu_customer_invoice_refund"
+      id="menu_action_menu_customer_invoice_refund"
+      parent="menu_customer_invoice_refund" />
+  </data>
+</openerp>

=== added file 'account_payment_discount_extension/account_payment_disocunt_wizard.xml'
--- account_payment_discount_extension/account_payment_disocunt_wizard.xml	1970-01-01 00:00:00 +0000
+++ account_payment_discount_extension/account_payment_disocunt_wizard.xml	2011-07-29 01:35:58 +0000
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+  <data>
+    <wizard id="wizard_populate_payment_discount_ext"
+      menu="False"
+      model="payment.order"
+      name="populate_payment_discount_ext"
+      string="Populate Payment to Pay"/>
+
+    <wizard id="wizard_pay_discount_payment"
+      menu="False"
+      model="payment.order"
+      name="pay_discount_payment"
+      string="Pay"/>
+
+    <wizard id="wizard_calculate_next_payment_date"
+      menu="True"
+      model="payment.order"
+      name="cal_next_payment_date"
+      string="Recompute Next Payment Date"/>
+
+    <menuitem action="wizard_calculate_next_payment_date"
+      id="menu_calculate_next_payment_date"
+      parent="account_payment.menu_main"
+      type="wizard"/>
+  </data>
+</openerp>

=== added directory 'account_payment_discount_extension/i18n'
=== added file 'account_payment_discount_extension/i18n/account_payment_discount_extension.pot'
--- account_payment_discount_extension/i18n/account_payment_discount_extension.pot	1970-01-01 00:00:00 +0000
+++ account_payment_discount_extension/i18n/account_payment_discount_extension.pot	2011-07-29 01:35:58 +0000
@@ -0,0 +1,176 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_payment_discount_extension
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.14\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2010-10-08 10:04:15+0000\n"
+"PO-Revision-Date: 2010-10-08 10:04:15+0000\n"
+"Last-Translator: Thomas Dreiling <[e-mail]>\n"