Merge lp:~npg-team/openobject-addons/account_voucher_credits_us_npg into lp:openobject-addons

[Novapoint Group]

NovaPoint Group has developed this module to provide an improved ability to manage credit memos and apply them against invoices. Allows users to split credit memos and provides significantly more flexibility than the base OpenERP. Accountants have the control and option to use credit memos as they/or their customers direct. Credit memos can be allocated against a single outstanding invoice, partial allocation, against multiple invoices, etc. With this development users have complete control.

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

Having this feature is good but the implementation seems not good. It's not normal that the diff have 4000 lines of code, it should have around 200 max.

[Olivier Dony (Odoo) (odo-openerp)]

Hello,

I would like to explain a little bit more why this merge proposal was rejected, in 2 parts: our policy for merge proposals, then some specific hints.

1. Merge Proposal Acceptance Policy
===================================
There may have been contradicting messages about how and when it is useful to make a merge proposal.
We would like to state this policy very clearly, especially now that extra-addons have been deprecated due to the introduction of OpenERP Apps. So we have now added an official Merge Proposal Acceptance Policy to our contributor documentation, please have a look: http://bit.ly/openerp-contrib-mp

2. Remarks specific to this merge proposal
==========================================
In approximate order of importance:

- if this module is specific to the US (which it seems to be) and would be a dependency of l10n_us, it should be named l10n_us_xxx, shouldn't it?
- it looks like this module is a general purpose extra feature that could be a great extra feature on OpenERP Apps as explained in the policy, but does not need to be included in official addons now
- the size of the merge proposal diff is very large (+3900 lines) compared to its scope:
  + DUPLICATED COPY OF THE MODULE in account_voucher_credits_us subdirectory = x2 diff, except they look slightly different!!!?? Very hard to review..
  + lots of copy/pasted code from original addons, are they all really necessary? You duplicated almost the whole account_voucher module! It was certainly possible to avoid that, this is *very* bad practice
- invalid/deprecated XML attributes in views: group.color, field.view_mode, etc.
- oversized methods, e.g. your account_voucher,action_move_line_create() has hundreds of lines! It needs to be refactored!
- you included YAML tests that seem to test and demo the module (good!), but you copy/pasted some existing tests without changing the record IDs.. this is brittle and not likely to work for very long, if it ever does.
- "hook" methods are discouraged in OpenERP, and should be replaced by smaller, overridable API methods as much as possible (e.g. your "_update_discount" hook method)
- use of deprecated API: as of v6.0 it is possible to make multiple XPATH alteration to an inherited form within a single view, you don't need to make multiple views for that
- non-i18n compatible text in warning (missing _() call): e.g. account_post_voucher
- unclear description of the module in the module manifest
- remaining typos in labels/text, e.g. "Avilable Credits"
- multiple leftover "print" debugging statements
- remaining commented out code and TODOs, should be cleaned up

I hope this helps,

Thanks!

review: Disapprove (policy + quick technical scan)

Unmerged revisions

5304. By Novapoint Group on 2011-10-06

[Add]: account_voucher_credits_us to manage credit memos against invoices

=== added directory 'account_voucher_credits_us'
=== added file 'account_voucher_credits_us/Change Log.txt'
--- account_voucher_credits_us/Change Log.txt	1970-01-01 00:00:00 +0000
+++ account_voucher_credits_us/Change Log.txt	2011-10-06 15:24:58 +0000
@@ -0,0 +1,70 @@
+===============================================================================
+ Version Change Log (account_voucher_credits_us)
+===============================================================================
+1.17 (2011-09-29) -> Arif
+	* Hide Post button in Credit Card Pay Invoice
+	
+1.16 (2011-09-16) -> Arif
+	* Added dicount check box on customer pay invoice
+	* Removed the onchange on amount in Pay Invoice
+
+1.15 (2011-09-15) -> Sinoj & Arif
+	* Fixed the bug on calculation of discount on Pay Invoice
+	
+1.13 -> 1.14 (2011-05-24) By Jabir
+	* Fixed credits are not using on customer payment if no amount is entered Paid Amount
+		
+1.12 -> 1.13 (2011-04-18) By Jabir
+	* Created configuration on company to set default payment term for supplier
+	
+1.11 -> 1.12 (2011-02-07) By Jabir
+	* Supplier discount support 
+1.10 -> 1.11 (2011-02-07) By Jabir
+	* Fixed the wrong account posting for journal with type bank and cash
+	
+1.09 -> 1.10 (2011-02-07) By Jabir
+	* Removed default focus from Calculate button
+	
+1.08 -> 1.09 (2011-02-07) By Jabir
+	* Add write function on account.move.line to make ids list if it is not
+
+1.07 -> 1.08 (2011-02-04) By Sinoj
+	* Optimization and cleanup
+	
+1.06 -> 1.07 (2010-12-06) By jabir
+	* Remove payment_meth_id from account_voucher_credits_us and add code to check whether this variable exist before using it
+	
+1.05 -> 1.06 (2010-12-06) By jabir
+	* Change the domain of writeoff_account and remove extra whitespace and comments in voucher.py
+	
+1.04 -> 1.05 (2010-12-06) By jabir
+	* Take invoice partner instead of voucher partner
+	
+1.03 -> 1.04 (2010-11-24) By jabir
+	* Fixed unable to open new customer payment form issue occur due to trunk update
+	* Fixed onchange_pay function error occuring when writeoff or discount module uninstalled
+	
+1.02 -> 1.03 (2010-11-24) By jabir
+	* Select credit and debit lines of child partner along with its when a customer is selected  
+	* Automatically fill payment amount when Pay is checked in voucher lines
+	
+1.01 -> 1.02 (2010-11-12) By jabir
+	* Add all the feature in module account_voucher_jdc in this module
+	===============================================================================
+	 Version Change Log (account_voucher_jdc)
+	===============================================================================
+	  1.01 -> 1.02 (2010-11-09) By sinoj
+	  	* in "account.voucher.line", label string "Discount and Credit" changed to "Discount and Credits"
+	  
+	  1.0  -> 1.01 (2010-11-03) By sinoj
+	  	* in "account.voucher.line", label string for amount_original changed from "Original Amount" to "Original Amt." 
+	  	* in "account.voucher.line", label string for amount_unreconciled changed from "Open Balance" to "Amount Due" 
+	  	* in "account.voucher.line", label string for amount changed from "Amount" to "Payment Amt" 
+	  	* in "account.voucher.line", label string for date_original changed from "Date" to "Invoice Date" 
+	  	* in "account.voucher.line", label string for account_id changed from "Account" to "G/L Account" 
+	  	* in "account.voucher.line", New boolean field Pay 
+
+===============================================================================
+ Version Change Log (account_voucher_credits_jdc)
+===============================================================================
+ account_voucher_jdc 1.0 -> account_voucher_credits_jdc 0.01 (2010-11-03) By sinoj

=== added file 'account_voucher_credits_us/__init__.py'
--- account_voucher_credits_us/__init__.py	1970-01-01 00:00:00 +0000
+++ account_voucher_credits_us/__init__.py	2011-10-06 15:24:58 +0000
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 NovaPoint Group LLC (<http://www.novapointgroup.com>)
+#    Copyright (C) 2004-2010 OpenERP SA (<http://www.openerp.com>)
+#
+#    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 voucher
+import wizard
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+

=== added file 'account_voucher_credits_us/__openerp__.py'
--- account_voucher_credits_us/__openerp__.py	1970-01-01 00:00:00 +0000
+++ account_voucher_credits_us/__openerp__.py	2011-10-06 15:24:58 +0000
@@ -0,0 +1,47 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 NovaPoint Group LLC (<http://www.novapointgroup.com>)
+#    Copyright (C) 2004-2010 OpenERP SA (<http://www.openerp.com>)
+#
+#    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" : "Voucher modifications for US",
+    "version" : "1.17",
+    "author" : 'NovaPoint Group LLC',
+    "description": """
+This module will add new functionality to better manage credits and how and when they apply to Sales Payments. 
+The result of this development will enable users to designate which credit(s) will apply to each individual invoice, and how much of an individual credit amount to apply.
+    """,
+    "category" : "US Localisation/Account",
+    "website" : "http://www.novapointgroup.com/",
+    "depends" : ["account", "account_voucher",],
+    "init_xml" : [],
+
+    "demo_xml" : [],
+
+    "update_xml" : [
+        "voucher_payment_receipt_view.xml",
+        "wizard/account_post_voucher.xml",
+        "security/ir.model.access.csv"],
+    "test" : [],
+    "active": False,
+    "installable": True,
+    }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added directory 'account_voucher_credits_us/account_voucher_credits_us'
=== added file 'account_voucher_credits_us/account_voucher_credits_us/Change Log.txt'
--- account_voucher_credits_us/account_voucher_credits_us/Change Log.txt	1970-01-01 00:00:00 +0000
+++ account_voucher_credits_us/account_voucher_credits_us/Change Log.txt	2011-10-06 15:24:58 +0000
@@ -0,0 +1,40 @@
+
+===============================================================================
+ Version Change Log (account_voucher_credits_us)
+===============================================================================
+1.06 -> 1.07 (2010-12-06) By jabir
+	* Remove payment_meth_id from account_voucher_credits_us and add code to check whether this variable exist before using it
+1.05 -> 1.06 (2010-12-06) By jabir
+	* Change the domain of writeoff_account and remove extra whitespace and comments in voucher.py
+1.04 -> 1.05 (2010-12-06) By jabir
+	* Take invoice partner instead of voucher partner
+1.03 -> 1.04 (2010-11-24) By jabir
+	* Fixed unable to open new customer payment form issue occur due to trunk update
+	* Fixed onchange_pay function error occuring when writeoff or discount module uninstalled
+	
+1.02 -> 1.03 (2010-11-24) By jabir
+	* Select credit and debit lines of child partner along with its when a customer is selected  
+	* Automatically fill payment amount when Pay is checked in voucher lines
+	
+1.01 -> 1.02 (2010-11-12) By jabir
+	* Add all the feature in module account_voucher_jdc in this module
+	===============================================================================
+	 Version Change Log (account_voucher_jdc)
+	===============================================================================
+	  1.01 -> 1.02 (2010-11-09) By sinoj
+	  	* in "account.voucher.line", label string "Discount and Credit" changed to "Discount and Credits"
+	  
+	  1.0  -> 1.01 (2010-11-03) By sinoj
+	  	* in "account.voucher.line", label string for amount_original changed from "Original Amount" to "Original Amt." 
+	  	* in "account.voucher.line", label string for amount_unreconciled changed from "Open Balance" to "Amount Due" 
+	  	* in "account.voucher.line", label string for amount changed from "Amount" to "Payment Amt" 
+	  	* in "account.voucher.line", label string for date_original changed from "Date" to "Invoice Date" 
+	  	* in "account.voucher.line", label string for account_id changed from "Account" to "G/L Account" 
+	  	* in "account.voucher.line", New boolean field Pay 
+
+===============================================================================
+ Version Change Log (account_voucher_credits_jdc)
+===============================================================================
+ account_voucher_jdc 1.0 -> account_voucher_credits_jdc 0.01 (2010-11-03) By sinoj
+ 	
+ 	

=== added file 'account_voucher_credits_us/account_voucher_credits_us/__init__.py'
--- account_voucher_credits_us/account_voucher_credits_us/__init__.py	1970-01-01 00:00:00 +0000
+++ account_voucher_credits_us/account_voucher_credits_us/__init__.py	2011-10-06 15:24:58 +0000
@@ -0,0 +1,18 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2010 ZestyBeanz Technologies Pvt. Ltd.
+#    (http://wwww.zbeanztech.com) All Rights Reserved.
+# [e-mail]
+#
+##############################################################################
+
+'''
+    TODO : Add access rules for all objects in the module
+    
+'''
+import voucher
+import wizard
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+

=== added file 'account_voucher_credits_us/account_voucher_credits_us/__openerp__.py'
--- account_voucher_credits_us/account_voucher_credits_us/__openerp__.py	1970-01-01 00:00:00 +0000
+++ account_voucher_credits_us/account_voucher_credits_us/__openerp__.py	2011-10-06 15:24:58 +0000
@@ -0,0 +1,32 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2010 ZestyBeanz Technologies Pvt. Ltd.
+#    (http://wwww.zbeanztech.com) All Rights Reserved.
+# [e-mail]
+#
+##############################################################################
+{
+    "name" : "Voucher modifications for US",
+    "version" : "0.07",
+    "author" : 'Voucher and NovaPoint Group LLC',
+    "description": """
+This module will add new functionality to better manage credits and how and when they apply to Sales Payments. 
+The result of this development will enable users to designate which credit(s) will apply to each individual invoice, and how much of an individual credit amount to apply.
+    """,
+    "category" : "Generic Modules/Accounting",
+    "website" : "http://www.novapointgroup.com/",
+    "depends" : ["account", "account_voucher",],
+    "init_xml" : [],
+
+    "demo_xml" : [],
+
+    "update_xml" : [
+        "voucher_payment_receipt_view.xml",
+        "wizard/account_post_voucher.xml",],
+    "test" : [],
+    "active": False,
+    "installable": True,
+    }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added directory 'account_voucher_credits_us/account_voucher_credits_us/test'
=== added file 'account_voucher_credits_us/account_voucher_credits_us/test/account_voucher.yml'
--- account_voucher_credits_us/account_voucher_credits_us/test/account_voucher.yml	1970-01-01 00:00:00 +0000
+++ account_voucher_credits_us/account_voucher_credits_us/test/account_voucher.yml	2011-10-06 15:24:58 +0000
@@ -0,0 +1,97 @@
+
+-
+  In order to check account voucher module in OpenERP I create a customer voucher
+-
+  !record {model: account.voucher, id: account_voucher_voucherforaxelor0}:
+    account_id: account.cash
+    company_id: base.main_company
+    currency_id: base.EUR
+    journal_id: account.bank_journal
+    name: Voucher for Axelor
+    narration: Basic Pc
+    line_ids:
+      - account_id: account.a_recv
+        amount: 1000.0
+        name: Voucher for Axelor
+        partner_id: base.res_partner_desertic_hispafuentes
+    period_id: account.period_6
+    reference_type: none
+
+-
+  I check that Initially customer voucher is in the "Draft" state
+-
+  !assert {model: account.voucher, id: account_voucher_voucherforaxelor0}:
+    - state == 'draft'
+-
+  I compute the voucher to calculate the taxes by clicking Cpmpute button
+-
+  !workflow {model: account.voucher, action: proforma_voucher, ref: account_voucher_voucherforaxelor0}
+-
+  I check that the voucher state is now "proforma"
+-
+  !assert {model: account.voucher, id: account_voucher_voucherforaxelor0}:
+    - state == 'proforma'
+-
+  I create voucher by clicking on Create button
+-
+  !workflow {model: account.voucher, action: proforma_voucher, ref: account_voucher_voucherforaxelor0}
+-
+  I clicked on Validate Button
+-
+  !assert {model: account.voucher, id: account_voucher_voucherforaxelor0}:
+    - state == 'posted'
+
+-
+  I check that Moves get created for this voucher
+-
+  !python {model: account.voucher}: |
+    acc_id=self.browse(cr, uid, ref("account_voucher_voucherforaxelor0"))
+    assert(acc_id.move_id)
+
+
+-
+  Now I create a Vendor Voucher
+-
+  !record {model: account.voucher, id: account_voucher_voucheraxelor0}:
+    account_id: account.cash
+    company_id: base.main_company
+    currency_id: base.EUR
+    journal_id: account.bank_journal
+    name: Voucher Axelor
+    narration: Basic PC
+    line_ids:
+      - account_id: account.cash
+        amount: 1000.0
+        name: Voucher Axelor
+    period_id: account.period_6
+    reference_type: none
+
+-
+  I check that Initially vendor voucher is in the "Draft" state
+-
+  !assert {model: account.voucher, id: account_voucher_voucheraxelor0}:
+    - state == 'draft'
+-
+  I change the state of voucher to "proforma" by clicking PRO-FORMA button
+-
+  !workflow {model: account.voucher, action: proforma_voucher, ref: account_voucher_voucheraxelor0}
+-
+  I check that the voucher state is now "proforma"
+-
+  !assert {model: account.voucher, id: account_voucher_voucheraxelor0}:
+    - state == 'proforma'
+-
+  I create voucher by clicking on Create button
+-
+  !workflow {model: account.voucher, action: proforma_voucher, ref: account_voucher_voucheraxelor0}
+-
+  I check that the voucher state is "posted"
+-
+  !assert {model: account.voucher, id: account_voucher_voucheraxelor0}:
+    - state == 'posted'
+-
+  I check that moves get created for this voucher
+-
+  !python {model: account.voucher}: |
+    acc_id=self.browse(cr, uid, ref("account_voucher_voucheraxelor0"))
+    assert(acc_id.move_id)

=== added file 'account_voucher_credits_us/account_voucher_credits_us/test/account_voucher_report.yml'
--- account_voucher_credits_us/account_voucher_credits_us/test/account_voucher_report.yml	1970-01-01 00:00:00 +0000
+++ account_voucher_credits_us/account_voucher_credits_us/test/account_voucher_report.yml	2011-10-06 15:24:58 +0000
@@ -0,0 +1,25 @@
+-
+  Demo for Account Voucher
+-
+  !record {model: account.voucher, id: account_voucher_voucheraxelor0}:
+    account_id: account.cash
+    company_id: base.main_company
+    currency_id: base.EUR
+    journal_id: account.bank_journal
+    name: Voucher Axelor
+    narration: Basic PC
+    amount: 1000.0
+    line_ids:
+      - account_id: account.cash
+        amount: 1000.0
+        name: Voucher Axelor
+    period_id: account.period_6
+
+-
+  In order to test the PDF reports defined on a account_voucher, we will print account voucher Report
+-
+  !python {model: account.voucher}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.voucher.cash_receipt.drcr').create(cr, uid, [ref("account_voucher_voucheraxelor0")], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'account_voucher-report.'+format), 'wb+').write(data)

=== added file 'account_voucher_credits_us/account_voucher_credits_us/test/sales_payment.yml'
--- account_voucher_credits_us/account_voucher_credits_us/test/sales_payment.yml	1970-01-01 00:00:00 +0000
+++ account_voucher_credits_us/account_voucher_credits_us/test/sales_payment.yml	2011-10-06 15:24:58 +0000
@@ -0,0 +1,89 @@
+-
+  In order to test account voucher i will create an invoice and pay it through account voucher.
+-
+  I create a new Partner
+-
+  !record {model: res.partner, id: res_partner_micropc0}:
+    address:
+      - country_id: base.be
+        name: Jenifer
+        street: 69 rue de Chimay
+        type: default
+        zip: '5478'
+    category_id:
+      - base.res_partner_category_8
+    credit_limit: 0.0
+    name: Micro PC
+    property_account_payable: account.a_pay
+    property_account_receivable: account.a_recv
+
+-
+  Create an invoice for the partner
+-
+  !record {model: account.invoice, id: account_invoice_0}:
+    account_id: account.a_recv
+    address_contact_id: base.res_partner_address_7
+    address_invoice_id: base.res_partner_address_7
+    company_id: base.main_company
+    currency_id: base.EUR
+    invoice_line:
+      - account_id: account.a_sale
+        name: '[PC1] Basic PC'
+        price_unit: 450.0
+        quantity: 1.0
+        product_id: product.product_product_pc1
+        uos_id: product.product_uom_unit
+    journal_id: account.sales_journal
+    partner_id: res_partner_micropc0
+
+-
+  I check that the customer invoice is in draft state
+-
+  !assert {model: account.invoice, id: account_invoice_0}:
+    - state == 'draft'
+
+-
+  I make the invoice in Open state
+-
+  !workflow {model: account.invoice, action: invoice_open, ref: account_invoice_0}
+
+-
+  I check that a payment entry gets created in the account.move.line
+-
+  !python {model: account.invoice}: |
+    acc_id=self.browse(cr, uid, ref("account_invoice_0"))
+    assert(acc_id.move_id)
+
+-
+  I will create and post an account voucher for the partner.
+-
+  !python {model: account.voucher}: |
+    import netsvc
+    vals = {}
+    journal_id = self.default_get(cr, uid, ['journal_id']).get('journal_id',None)
+    res = self.onchange_partner_id(cr, uid, [], ref("res_partner_micropc0"), journal_id, price=0.0, ttype='receipt')
+    vals = {
+        'account_id': ref('account.cash'),
+        'amount': 450.0,
+        'company_id': ref('base.main_company'),
+        'currency_id': ref('base.EUR'),
+        'journal_id': ref('account.bank_journal'),
+        'partner_id': ref('res_partner_micropc0'),
+        'period_id': ref('account.period_8'),
+        'type': 'receipt',
+    }
+    if not res['value']['line_cr_ids']:
+      res['value']['line_cr_ids'] = [{'type': 'cr', 'account_id': ref('account.a_recv'),}]
+    res['value']['line_cr_ids'][0]['amount'] = 450.0
+    vals['line_cr_ids'] = [(0,0,i) for i in res['value']['line_cr_ids']]
+    id = self.create(cr, uid, vals)
+    voucher_id = self.browse(cr, uid, id)
+    assert (voucher_id.state=='draft'), "Voucher is not in draft state"
+    wf_service = netsvc.LocalService("workflow")
+    wf_service.trg_validate(uid, 'account.voucher', voucher_id.id, 'proforma_voucher', cr)
+
+-
+  Finally i will Confirm the state of the invoice is paid
+-
+  !assert {model: account.invoice, id: account_invoice_0}:
+    - state == 'paid'

=== added file 'account_voucher_credits_us/account_voucher_credits_us/test/sales_receipt.yml'
--- account_voucher_credits_us/account_voucher_credits_us/test/sales_receipt.yml	1970-01-01 00:00:00 +0000
+++ account_voucher_credits_us/account_voucher_credits_us/test/sales_receipt.yml	2011-10-06 15:24:58 +0000
@@ -0,0 +1,74 @@
+
+-
+  In order to test sales receipt i will create a sale receipt and pay it through sales payment
+-
+  First of all I create a voucher
+-
+  !record {model: account.voucher, id: account_voucher_chinaexport_0}:
+    account_id: account.a_recv
+    amount: 30000.0
+    company_id: base.main_company
+    journal_id: account.sales_journal
+    line_cr_ids:
+      - account_id: account.a_sale
+        amount: 30000.0
+    partner_id: base.res_partner_3
+    period_id: account.period_8
+    tax_amount: 0.0
+    type: sale
+
+-
+  I check that the voucher state is Draft
+-
+  !assert {model: account.voucher, id: account_voucher_chinaexport_0}:
+    - state == 'draft'
+
+-
+  I clicked on post button to post the voucher
+-
+  !workflow {model: account.voucher, action: proforma_voucher, ref: account_voucher_chinaexport_0}
+
+-
+  Check the voucher state is Posted
+-
+  !assert {model: account.voucher, id: account_voucher_chinaexport_0}:
+    - state == 'posted'
+
+-
+  I create a voucher record for the same partner
+-
+  !record {model: account.voucher, id: account_voucher_chinaexport_1}:
+    account_id: account.cash
+    amount: 30000.0
+    company_id: base.main_company
+    currency_id: base.EUR
+    journal_id: account.bank_journal
+    line_cr_ids:
+      - account_id: account.a_recv
+        amount: 0.0
+        name: 2010/003
+        type: cr
+      - account_id: account.a_recv
+        amount: 30000.0
+        name: 2010/003
+        type: cr
+    partner_id: base.res_partner_3
+    period_id: account.period_8
+    type: receipt
+
+-
+  Check the voucher state is draft
+-
+  !assert {model: account.voucher, id: account_voucher_chinaexport_1}:
+    - state == 'draft'
+
+-
+  I clicked on Post button to post the voucher
+-
+  !workflow {model: account.voucher, action: proforma_voucher, ref: account_voucher_chinaexport_1}
+
+-
+  Check the voucher state is Posted
+-
+  !assert {model: account.voucher, id: account_voucher_chinaexport_1}:
+    - state == 'posted'

=== added file 'account_voucher_credits_us/account_voucher_credits_us/voucher.py'
--- account_voucher_credits_us/account_voucher_credits_us/voucher.py	1970-01-01 00:00:00 +0000
+++ account_voucher_credits_us/account_voucher_credits_us/voucher.py	2011-10-06 15:24:58 +0000
@@ -0,0 +1,1275 @@
+# -*- 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
+import netsvc
+from osv import fields
+from osv import osv
+from tools.translate import _
+def _combinations(iterable, r):
+    '''
+    @return: combination generator object    
+    
+    Example
+    combinations(’ABCD’, 2) --> AB AC AD BC BD CD
+    combinations(range(4), 3) --> 012 013 023 123    
+    '''
+    pool = tuple(iterable)
+    n = len(pool)
+    if r > n:
+        return
+    indices = range(r)
+    yield tuple(pool[i] for i in indices)
+    while True:
+        for i in reversed(range(r)):
+            if indices[i] != i + n - r:
+                break
+        else:
+            return
+        indices[i] += 1
+        for j in range(i+1, r):
+            indices[j] = indices[j-1] + 1
+        yield tuple(pool[i] for i in indices)
+
+
+class res_company(osv.osv):
+    _name = 'res.company'
+    _inherit = 'res.company'
+    
+    _columns = {
+        'writeoff_account': fields.many2one('account.account', 'Writeoff Account', domain=[('type','!=','view'),('type','!=','consolidation')],
+                                            help="This is the designated write-off gl account that will be used when writing off remaining amounts in customer payment."),
+    }
+res_company()
+
+
+class account_cash_discount(osv.osv):
+    _name = "account.cash.discount"
+    _description = "Cash Discount" #A reduction in the price  if payment is made within a stipulated period.
+    _columns = {
+        'name': fields.char('Name', size=32),
+        'delay': fields.integer('Number of Days', required=True),
+        'discount': fields.float('Discount (%)', digits=(16,6),required=True),
+        'payment_id': fields.many2one('account.payment.term','Associated Payment Term'),
+        'credit_account_id': fields.many2one('account.account', 'Credit Account'),
+        'debit_account_id': fields.many2one('account.account', 'Debit Account'),
+    }
+account_cash_discount()
+
+
+
+class account_move_line(osv.osv):
+    _inherit = 'account.move.line'
+    def _unreconciled(self, cr, uid, ids, prop, unknow_none, context):
+        '''
+        Function to calculate the value of variable Unreconciled Amount
+        '''
+        res={}
+        for line in self.browse(cr, uid, ids, context=context):
+            res[line.id] = line.debit - line.credit
+            if line.reconcile_partial_id:
+                res[line.id] = 0
+                for partial in line.reconcile_partial_id.line_partial_ids:
+                    res[line.id] += partial.debit - partial.credit
+            res[line.id] = abs(res[line.id])
+        return res
+
+    _columns = {
+        'amount_unreconciled': fields.function(_unreconciled, method=True, string='Unreconciled Amount'),
+    }
+account_move_line()
+
+class account_voucher_line(osv.osv):
+    _inherit = 'account.voucher.line'
+    
+                    
+    def _update_credit_lines(self,cr, uid, ids, context):
+        credits_used_pool = self.pool.get('account.voucher.line.credits_to_use')
+        for line in self.browse(cr , uid, ids, context):
+            credits_lines_used = [x.orginal_credit_line_id.id for x in line.available_credits]
+            for credit_line in line.voucher_id.line_dr_ids :
+                if credit_line.id not in credits_lines_used and line.invoice_id and line.invoice_id.payment_term:
+                    print credit_line
+                    credits_used_pool.create(cr, uid, {                                                        
+                                'voucher_line_id': line.id,
+                                'orginal_credit_line_id':credit_line.id,
+                                'use_credit': False, 
+                                'inv_credit': credit_line.move_line_id.id,        
+                                'discount_window_date': credit_line.date_original,        
+                                'orginal_amount': credit_line.amount_original,       
+                                'available_amount': credit_line.amount_unreconciled - credit_line.pending_credits,
+                                'discount_amount': 0.0,
+                                'gl_account' : credit_line.account_id.id,})
+                else :
+                    to_update_credit_line_ids = credits_used_pool.search(cr,uid,[('voucher_line_id','=',line.id),( 'orginal_credit_line_id','=',credit_line.id)], context=context)
+                    credits_used_pool.write(cr, uid,to_update_credit_line_ids,{'available_amount': credit_line.amount_unreconciled-credit_line.pending_credits}, context=context)
+                    
+account_voucher_line()
+
+class account_voucher(osv.osv):
+    def _get_type(self, cr, uid, ids, context={}):
+        '''
+        Initialise the variable Default Type
+        '''
+        return context.get('type', False)
+        
+    def _get_period(self, cr, uid, context={}):
+        '''
+        Initialise the variable Period
+        '''
+        
+        if context.get('period_id', False):
+            return context.get('period_id')
+        periods = self.pool.get('account.period').find(cr, uid)
+        return periods and periods[0] or False
+
+    def _get_journal(self, cr, uid, context={}):
+        '''
+        Initialise the variable Journal
+        '''
+        journal_pool = self.pool.get('account.journal')
+        if context.get('journal_id', False):
+            return context.get('journal_id')
+        if not context.get('journal_id', False) and context.get('search_default_journal_id', False):
+            return context.get('search_default_journal_id')
+        
+        ttype = context.get('type', 'bank')
+        res = journal_pool.search(cr, uid, [('type', '=', ttype)], limit=1)
+        return res and res[0] or False
+
+    def _get_tax(self, cr, uid, context={}):
+        '''
+        Initialise the variable Tax
+        '''
+        journal_pool = self.pool.get('account.journal')
+        journal_id = context.get('journal_id', False)
+        if not journal_id:
+            ttype = context.get('type', 'bank')
+            res = journal_pool.search(cr, uid, [('type', '=', ttype)], limit=1)
+            if not res:
+                return False
+            journal_id = res[0]
+        
+        if not journal_id:
+            return False
+        journal = journal_pool.browse(cr, uid, journal_id)
+        account_id = journal.default_credit_account_id or journal.default_debit_account_id
+        if account_id and account_id.tax_ids:
+            tax_id = account_id.tax_ids[0].id
+            return tax_id
+        return False
+
+    def _get_currency(self, cr, uid, context):
+        '''
+        Initialise the variable Currency
+        '''
+        journal_pool = self.pool.get('account.journal')
+        journal_id = context.get('journal_id', False)
+        if journal_id:
+            journal = journal_pool.browse(cr, uid, journal_id)
+            currency_id = journal.company_id.currency_id.id
+            if journal.currency:
+                currency_id = journal.currency.id
+        return False
+    
+    def _get_partner(self, cr, uid, context={}):
+        '''
+        Initialise the variable Partner
+        '''
+        return context.get('partner_id', False)
+    
+    def _get_reference(self, cr, uid, context={}):
+        '''
+        Initialise the variable Ref #
+        '''
+        return context.get('reference', False)
+    
+    def _get_narration(self, cr, uid, context={}):
+        '''
+        Initialise the field Notes
+        '''
+        return context.get('narration', False)
+    
+    
+    def _find_exact_match(self, cr, uid, lines, amount, mark_pay=False, use_discount=False, context=False):
+        '''
+            accept voucher lines as list of dict and amount to match
+            return : update lines if it found an exact match
+        '''
+        total_amount = 0.0
+        discount_available = {}
+        total_discount_available = 0.0
+        for line in lines:
+            if mark_pay or line.pay == True:
+                if use_discount:
+                    discount_available[line.id] = 0.0
+                    for discount_line in line.available_discounts:
+                        discount_available[line.id] += discount_line.proposed_discount
+                        total_discount_available += discount_line.proposed_discount
+                    total_amount += line.amount_unreconciled - line.credit_used - (line._columns.has_key('writeoff_amount') and line.writeoff_amount)
+                else:
+                    total_amount += line.amount_unreconciled - line.credit_used - line.discount_used- (line._columns.has_key('writeoff_amount') and line.writeoff_amount)
+        if abs(amount - total_amount) < 0.01 :
+            '''
+                Unchecking all the lines other than matched line
+            '''
+            line_ids = self.read(cr,uid,lines[0].voucher_id.id,['line_ids'])['line_ids']
+            self.pool.get('account.voucher.line').write(cr,uid,line_ids,{'pay':False})
+            for line in lines:
+                if mark_pay or line.pay == True:      
+                    line.write({'amount':line.amount_unreconciled - line.credit_used - line.discount_used - (line._columns.has_key('writeoff_amount') and line.writeoff_amount), 'pay':True })
+                else:
+                    line.write({'amount':0.0, 'pay':False })                
+            return True
+        if use_discount and total_amount>amount and  (total_amount - amount ) <=total_discount_available: #It is possible to match using Discount
+            '''
+                Unchecking all the lines other than matched line and uncheck all discount lines
+            '''
+            line_ids = self.read(cr,uid,lines[0].voucher_id.id,['line_ids'])['line_ids']
+            self.pool.get('account.voucher.line').write(cr,uid,line_ids,{'pay':False})
+            for line_id in line_ids:
+                discount_ids = self.pool.get('account.voucher.line').read(cr,uid,line_id,['available_discounts'])['available_discounts']
+                self.pool.get("account.voucher.line.discount_to_use").write(cr,uid,discount_ids,{'use_discount':False, 'discount_amount':0.0})
+            discount_to_use = total_amount - amount  
+            for line in lines:
+                if discount_to_use > 0.0:
+                    for discount_line in line.available_discounts:
+                        discount_line.write({'use_discount':True,'discount_amount':min(discount_to_use, discount_line.proposed_discount)})
+                        discount_to_use = discount_to_use - min(discount_to_use, discount_line.proposed_discount)
+                line = self.pool.get('account.voucher.line').browse(cr, uid, line.id,context=context)
+                line.write({'amount':line.amount_unreconciled - line.credit_used - line.discount_used - (line._columns.has_key('writeoff_amount') and line.writeoff_amount), 'pay':True })
+            return True
+        if len(lines) > 1:
+            for combination in _combinations(lines,len(lines)-1 ):
+                if self._find_exact_match(cr, uid, combination, amount, mark_pay, context=False):
+                    return True
+        return False
+    def calc_diff(self, cr, uid, ids, context={}):
+        res = {'nodestroy':True}
+        amount_cash_discount = 0.0
+        amount_interest = 0.0
+        for vch in self.browse(cr, uid, ids):
+            for line in vch.line_cr_ids:
+                line._update_credit_lines( context=context)
+            if vch.auto_match:
+                ret = self._find_exact_match(cr, uid, vch.line_cr_ids, vch.amount, mark_pay=False, use_discount=False, context=False)
+                if not ret:                
+                    ret = self._find_exact_match(cr, uid, vch.line_cr_ids, vch.amount, mark_pay=True, use_discount=False, context=False)
+                if not ret:
+                    ret = self._find_exact_match(cr, uid, vch.line_cr_ids, vch.amount, mark_pay=True, use_discount=True, context=False)
+        return res
+ 
+    _name = 'account.voucher'
+    _inherit = 'account.voucher'
+    _description = 'Accounting Voucher'
+    _order = "date desc, id desc"
+    _rec_name = 'number'
+    _columns = {
+        'type':fields.selection([
+            ('sale','Sale'),
+            ('purchase','Purchase'),
+            ('payment','Payment'),
+            ('receipt','Receipt'),
+        ],'Default Type', readonly=True, states={'draft':[('readonly',False)]}),
+        'name':fields.char('Memo', size=256, readonly=True, states={'draft':[('readonly',False)]}),
+        'date':fields.date('Date', readonly=True, states={'draft':[('readonly',False)]}, help="Effective date for accounting entries"),
+        'journal_id':fields.many2one('account.journal', 'Journal', required=True, readonly=True, states={'draft':[('readonly',False)]}),
+        'account_id':fields.many2one('account.account', 'Account', required=True, readonly=True, states={'draft':[('readonly',False)]}),
+        'line_ids':fields.one2many('account.voucher.line','voucher_id','Voucher Lines', readonly=True, states={'draft':[('readonly',False)]}),
+        'line_cr_ids':fields.one2many('account.voucher.line','voucher_id','Credits',
+            domain=[('type','=','cr')], context={'default_type':'cr'}, readonly=True, states={'draft':[('readonly',False)]}),
+        'line_dr_ids':fields.one2many('account.voucher.line','voucher_id','Debits',
+            domain=[('type','=','dr')], context={'default_type':'dr'}, readonly=True, states={'draft':[('readonly',False)]}),
+        'period_id': fields.many2one('account.period', 'Period', required=True, readonly=True, states={'draft':[('readonly',False)]}),
+        'narration':fields.text('Notes', readonly=True, states={'draft':[('readonly',False)]}),
+        'currency_id':fields.many2one('res.currency', 'Currency', readonly=True, states={'draft':[('readonly',False)]}),
+#        'currency_id': fields.related('journal_id','currency', type='many2one', relation='res.currency', string='Currency', store=True, readonly=True, states={'draft':[('readonly',False)]}),
+        'company_id': fields.many2one('res.company', 'Company', required=True, readonly=True, states={'draft':[('readonly',False)]}),
+        'state':fields.selection(
+            [('draft','Draft'),
+             ('proforma','Pro-forma'),
+             ('posted','Posted'),
+             ('cancel','Cancelled')
+            ], 'State', readonly=True, size=32,
+            help=' * The \'Draft\' state is used when a user is encoding a new and unconfirmed Voucher. \
+                        \n* The \'Pro-forma\' when voucher is in Pro-forma state,voucher does not have an voucher number. \
+                        \n* The \'Posted\' state is used when user create voucher,a voucher number is generated and voucher entries are created in account \
+                        \n* The \'Cancelled\' state is used when user cancel voucher.'),
+        'amount': fields.float('Total', digits=(16, 2), required=True, readonly=True, states={'draft':[('readonly',False)]}),
+        'tax_amount':fields.float('Tax Amount', digits=(14,2), readonly=True, states={'draft':[('readonly',False)]}),
+        'reference': fields.char('Ref #', size=64, readonly=True, states={'draft':[('readonly',False)]}, help="Transaction reference number."),
+        'number': fields.related('move_id', 'name', type="char", readonly=True, string='Number'),
+        'move_id':fields.many2one('account.move', 'Account Entry'),
+        'move_ids': fields.related('move_id','line_id', type='one2many', relation='account.move.line', string='Journal Items', readonly=True),
+        'partner_id':fields.many2one('res.partner', 'Partner', change_default=1, readonly=True, states={'draft':[('readonly',False)]}),
+        'audit': fields.related('move_id','to_check', type='boolean', relation='account.move', string='Audit Complete ?'),
+        'pay_now':fields.selection([
+            ('pay_now','Pay Directly'),
+            ('pay_later','Pay Later or Group Funds'),
+        ],'Payment', select=True, readonly=True, states={'draft':[('readonly',False)]}),
+        'tax_id':fields.many2one('account.tax', 'Tax', readonly=True, states={'draft':[('readonly',False)]}),
+        'pre_line':fields.boolean('Previous Payments ?', required=False),
+        'date_due': fields.date('Due Date', readonly=True, states={'draft':[('readonly',False)]}),
+        'auto_match':fields.boolean('Use Automatic Matching')
+    }
+    _defaults = {
+        'period_id': _get_period,
+        'partner_id': _get_partner,
+        'journal_id':_get_journal,
+        'currency_id': _get_currency,
+        'reference': _get_reference,
+        'narration':_get_narration,
+        'type':_get_type,
+        'state': lambda *a: 'draft',
+        'pay_now':lambda *a: 'pay_later',
+        'name': lambda *a: '',
+        'date' : lambda *a: time.strftime('%Y-%m-%d'),
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.voucher',context=c),
+        'tax_id': _get_tax,
+    }
+    
+
+    def compute_tax(self, cr, uid, ids, context={}):
+        tax_pool = self.pool.get('account.tax')
+        partner_pool = self.pool.get('res.partner')
+        position_pool = self.pool.get('account.fiscal.position')
+        voucher_line_pool = self.pool.get('account.voucher.line')
+        voucher_pool = self.pool.get('account.voucher')
+        
+        for voucher in voucher_pool.browse(cr, uid, ids, context):
+            voucher_amount = 0.0
+            for line in voucher.line_ids:
+                voucher_amount += line.untax_amount or line.amount
+                line.amount = line.untax_amount or line.amount
+                voucher_line_pool.write(cr, uid, [line.id], {'amount':line.amount, 'untax_amount':line.untax_amount})
+                
+            if not voucher.tax_id:
+                self.write(cr, uid, [voucher.id], {'amount':voucher_amount, 'tax_amount':0.0})
+                continue
+            
+            tax = [tax_pool.browse(cr, uid, voucher.tax_id.id)]
+            partner = partner_pool.browse(cr, uid, voucher.partner_id.id) or False
+            taxes = position_pool.map_tax(cr, uid, partner and partner.property_account_position or False, tax)
+            tax = tax_pool.browse(cr, uid, taxes)
+            
+            total = voucher_amount
+            total_tax = 0.0
+            
+            if not tax[0].price_include:
+                for tax_line in tax_pool.compute_all(cr, uid, tax, voucher_amount, 1).get('taxes',[]):
+                    total_tax += tax_line.get('amount')
+                total += total_tax
+            else:
+                line_ids2 = []
+                for line in voucher.line_ids:
+                    line_total = 0.0
+                    line_tax = 0.0
+                    
+                    for tax_line in tax_pool.compute_all(cr, uid, tax, line.untax_amount or line.amount, 1).get('taxes',[]):
+                        line_tax += tax_line.get('amount')
+                        line_total += tax_line.get('price_unit')
+                    total_tax += line_tax
+                    untax_amount = line.untax_amount or line.amount
+                    voucher_line_pool.write(cr, uid, [line.id], {'amount':line_total, 'untax_amount':untax_amount})
+            
+            self.write(cr, uid, [voucher.id], {'amount':total, 'tax_amount':total_tax})
+        return True
+    
+    def onchange_price(self, cr, uid, ids, line_ids, tax_id, partner_id=False, context={}):
+        tax_pool = self.pool.get('account.tax')
+        partner_pool = self.pool.get('res.partner')
+        position_pool = self.pool.get('account.fiscal.position')
+        voucher_line_pool = self.pool.get('account.voucher.line')
+        res = {
+            'tax_amount':False,
+            'amount':False,
+        }
+        voucher_total_tax = 0.0
+        voucher_total = 0.0
+        voucher_line_ids = []
+        
+        total = 0.0
+        total_tax = 0.0
+        
+        for line in line_ids:
+            line_amount = 0.0
+            line_amount = line[2].get('amount')
+            voucher_line_ids += [line[1]]
+            voucher_total += line_amount
+        
+        total = voucher_total
+        total_tax = 0.0
+        if tax_id:
+            tax = [tax_pool.browse(cr, uid, tax_id)]
+            if partner_id:
+                partner = partner_pool.browse(cr, uid, partner_id) or False
+                taxes = position_pool.map_tax(cr, uid, partner and partner.property_account_position or False, tax)
+                tax = tax_pool.browse(cr, uid, taxes)
+            
+            if not tax[0].price_include:
+                for tax_line in tax_pool.compute_all(cr, uid, tax, voucher_total, 1).get('taxes',[]):
+                    total_tax += tax_line.get('amount')
+                total += total_tax
+        
+        res.update({
+            'amount':total or voucher_total,
+            'tax_amount':total_tax
+        })
+        return {
+            'value':res
+        }
+    
+    def onchange_term_id(self, cr, uid, ids, term_id, amount):
+        term_pool = self.pool.get('account.payment.term')
+        terms = False
+        due_date = False
+        default = {'date_due':False}
+        if term_id and amount:
+            terms = term_pool.compute(cr, uid, term_id, amount)
+        if terms:
+            due_date = terms[-1][0]
+            default.update({
+                'date_due':due_date
+            })
+        return {'value':default}
+    
+    def onchange_journal_voucher(self, cr, uid, ids, line_ids=False, tax_id=False, price=0.0, partner_id=False, journal_id=False, ttype=False, context={}):
+        """price
+        Returns a dict that contains new values and context
+    
+        @param partner_id: latest value from user input for field partner_id
+        @param args: other arguments
+        @param context: context arguments, like lang, time zone
+        
+        @return: Returns a dict which contains new values, and context
+        """
+        default = {
+            'value':{},
+        }
+        
+        if not partner_id or not journal_id:
+            return default
+        
+        partner_pool = self.pool.get('res.partner')
+        journal_pool = self.pool.get('account.journal')
+
+        journal = journal_pool.browse(cr, uid, journal_id)
+        partner = partner_pool.browse(cr, uid, partner_id)
+        account_id = False
+        tr_type = False
+        if journal.type in ('sale','sale_refund'):
+            account_id = partner.property_account_receivable.id
+            tr_type = 'sale'
+        elif journal.type in ('purchase', 'purchase_refund','expense'):
+            account_id = partner.property_account_payable.id
+            tr_type = 'purchase'
+        else:
+            account_id = journal.default_credit_account_id.id or journal.default_debit_account_id.id
+            tr_type = 'receipt'
+
+        default['value']['account_id'] = account_id
+        default['value']['type'] = ttype or tr_type
+        
+        vals = self.onchange_journal(cr, uid, ids, journal_id, line_ids, tax_id, partner_id, context)
+        default['value'].update(vals.get('value'))
+        
+        return default
+    
+    def onchange_partner_id(self, cr, uid, ids, partner_id, journal_id, price, currency_id, ttype, context={}):
+        """price
+        Returns a dict that contains new values and context
+    
+        @param partner_id: latest value from user input for field partner_id
+        @param args: other arguments
+        @param context: context arguments, like lang, time zone
+        
+        @return: Returns a dict which contains new values, and context
+        """
+        currency_pool = self.pool.get('res.currency')
+        move_pool = self.pool.get('account.move')
+        line_pool = self.pool.get('account.voucher.line')
+        move_line_pool = self.pool.get('account.move.line')
+        partner_pool = self.pool.get('res.partner')
+        journal_pool = self.pool.get('account.journal')
+        default = {
+            'value':{'line_ids':[], 'line_dr_ids':[], 'line_cr_ids':[], 'pre_line': False, 'currency_id':currency_id, 'journal_id': False},
+        }
+        if partner_id and not journal_id:
+            partner = partner_pool.browse(cr, uid, partner_id, context)
+            if partner._columns.has_key('payment_meth_id') and partner.payment_meth_id:
+                payment_mode_pool = self.pool.get('payment.mode')
+                payment_meth = payment_mode_pool.browse(cr, uid, partner.payment_meth_id.id, context)
+                if payment_meth:
+                    default['value']['journal_id'] = payment_meth.journal.id
+                    journal_id = payment_meth.journal.id
+        if not journal_id:
+            return {}
+        
+        vals = self.onchange_journal(cr, uid, ids, journal_id, [], False, partner_id, context)
+        vals = vals.get('value')
+        currency_id = vals.get('currency_id', currency_id)
+
+        if not partner_id:
+            return default
+
+        if not partner_id and ids:
+            line_ids = line_pool.search(cr, uid, [('voucher_id','=',ids[0])])
+            if line_ids:
+                line_pool.unlink(cr, uid, line_ids)
+            return default
+
+        journal = journal_pool.browse(cr, uid, journal_id)
+        partner = partner_pool.browse(cr, uid, partner_id)
+        account_id = False
+        if journal.type in ('sale','sale_refund'):
+            account_id = partner.property_account_receivable.id
+        elif journal.type in ('purchase', 'purchase_refund','expense'):
+            account_id = partner.property_account_payable.id
+        elif journal.type in ('cash', 'bank'):
+            account_id = journal.default_debit_account_id.id
+        else:
+            account_id = journal.default_credit_account_id.id or journal.default_debit_account_id.id
+
+        if journal and not default['value']['currency_id']:
+            default['value']['currency_id'] = journal.company_id.currency_id.id
+        default['value']['account_id'] = account_id
+        if journal.type not in ('cash', 'bank'):
+            return default
+        
+        total_credit = 0.0
+        total_debit = 0.0
+        account_type = 'receivable'
+        if ttype == 'payment':
+            account_type = 'payable'
+            total_debit = price or 0.0
+        else:
+            total_credit = price or 0.0
+            account_type = 'receivable'
+        
+        if partner._columns.has_key('nat_acc_parent') and partner.nat_acc_parent:
+            partner_ids = partner_pool.search(cr,uid,[('parent_id','child_of',[partner_id])])
+        else:
+            partner_ids = [partner_id]
+        ids = move_line_pool.search(cr, uid, [('account_id.type','=', account_type), ('reconcile_id','=', False), ('partner_id','in',partner_ids)], context=context)
+        ids.reverse()
+        moves = move_line_pool.browse(cr, uid, ids)
+        
+        company_currency = journal.company_id.currency_id.id
+        if company_currency != currency_id and ttype == 'payment':
+            total_debit = currency_pool.compute(cr, uid, currency_id, company_currency, total_debit)
+        elif company_currency != currency_id and ttype == 'receipt':
+            total_credit = currency_pool.compute(cr, uid, currency_id, company_currency, total_credit)
+        
+        for line in moves:
+            if line.credit and line.reconcile_partial_id and ttype == 'receipt':
+                continue
+            if line.debit and line.reconcile_partial_id and ttype == 'payment':
+                continue            
+            total_credit += line.credit or 0.0
+            total_debit += line.debit or 0.0
+
+        for line in moves:
+            if line.credit and line.reconcile_partial_id and ttype == 'receipt':
+                continue
+            if line.debit and line.reconcile_partial_id and ttype == 'payment':
+                continue
+            
+            original_amount = line.credit or line.debit or 0.0
+            rs = {
+                'name':line.move_id.name,
+                'type': line.credit and 'dr' or 'cr',
+                'move_line_id':line.id,
+                'account_id':line.account_id.id,
+                'amount_original':currency_pool.compute(cr, uid, company_currency, currency_id, original_amount),
+                'date_original':line.date,
+                'date_due':line.date_maturity,
+                'amount_unreconciled':currency_pool.compute(cr, uid, company_currency, currency_id, line.amount_unreconciled)
+            }
+            
+            def calc_amount(line, total):
+                return min(line.amount_unreconciled, total)
+
+            if line.credit:
+                amount = calc_amount(line, total_debit)
+                rs['amount'] = currency_pool.compute(cr, uid, company_currency, currency_id, amount)
+                total_debit -= amount
+            else:
+                amount = calc_amount(line, total_credit)
+                rs['amount'] = currency_pool.compute(cr, uid, company_currency, currency_id, amount)
+                total_credit -= amount
+                
+            default['value']['line_ids'].append(rs)
+            if rs['type'] == 'cr':
+                default['value']['line_cr_ids'].append(rs)
+            else:
+                default['value']['line_dr_ids'].append(rs)
+            
+            if ttype == 'payment' and len(default['value']['line_cr_ids']) > 0:
+                default['value']['pre_line'] = 1
+            elif ttype == 'receipt' and len(default['value']['line_dr_ids']) > 0:
+                default['value']['pre_line'] = 1     
+        for credit_line in default['value']['line_dr_ids']:
+            credit_line['amount'] = 0.0
+        for invoice_line in default['value']['line_cr_ids']:
+            invoice_line['amount'] = 0.0
+            invoice_line['amount_difference'] = invoice_line['amount_unreconciled']
+            
+        return default
+
+    def onchange_date(self, cr, user, ids, date, context={}):
+        """
+        @param date: latest value from user input for field date
+        @param args: other arguments
+        @param context: context arguments, like lang, time zone
+        @return: Returns a dict which contains new values, and context
+        """
+        period_pool = self.pool.get('account.period')
+        pids = period_pool.search(cr, user, [('date_start','<=',date), ('date_stop','>=',date)])
+        if not pids:
+            return {}
+        return {
+            'value':{
+                'period_id':pids[0]
+            }
+        }
+
+    def onchange_journal(self, cr, uid, ids, journal_id, line_ids, tax_id, partner_id, context={}):
+        if not journal_id:
+            return False
+        journal_pool = self.pool.get('account.journal')
+        journal = journal_pool.browse(cr, uid, journal_id)
+        account_id = journal.default_credit_account_id or journal.default_debit_account_id
+        tax_id = False
+        if account_id and account_id.tax_ids:
+            tax_id = account_id.tax_ids[0].id
+        
+        vals = self.onchange_price(cr, uid, ids, line_ids, tax_id, partner_id, context)
+        vals['value'].update({'tax_id':tax_id})
+        currency_id = journal.company_id.currency_id.id
+        if journal.currency:
+            currency_id = journal.currency.id
+        vals['value'].update({'currency_id':currency_id})
+        return vals
+
+    def action_cancel_draft(self, cr, uid, ids, context={}):
+        wf_service = netsvc.LocalService("workflow")
+        for voucher_id in ids:
+            wf_service.trg_create(uid, 'account.voucher', voucher_id, cr)
+        self.write(cr, uid, ids, {'state':'draft'})
+        return True
+
+    def cancel_voucher(self, cr, uid, ids, context={}):
+        reconcile_pool = self.pool.get('account.move.reconcile')
+        move_pool = self.pool.get('account.move')
+        voucher_line_pool = self.pool.get('account.voucher.line')
+        
+        for voucher in self.browse(cr, uid, ids):
+            recs = []
+            for line in voucher.move_ids:
+                if line.reconcile_id:
+                    recs += [line.reconcile_id.id]
+                if line.reconcile_partial_id:
+                    recs += [line.reconcile_partial_id.id]
+
+            reconcile_pool.unlink(cr, uid, recs)
+            
+            if voucher.move_id:
+                move_pool.button_cancel(cr, uid, [voucher.move_id.id])
+                move_pool.unlink(cr, uid, [voucher.move_id.id])
+        res = {
+            'state':'cancel',
+            'move_id':False,
+        }
+        self.write(cr, uid, ids, res)
+        return True
+
+    def unlink(self, cr, uid, ids, context=None):
+        for t in self.read(cr, uid, ids, ['state'], context=context):
+            if t['state'] not in ('draft', 'cancel'):
+                raise osv.except_osv(_('Invalid action !'), _('Cannot delete Voucher(s) which are already opened or paid !'))
+        return super(account_voucher, self).unlink(cr, uid, ids, context=context)
+
+    # TODO: may be we can remove this method if not used anyware
+    def onchange_payment(self, cr, uid, ids, pay_now, journal_id, partner_id, ttype='sale'):
+        res = {}
+        if not partner_id:
+            return res
+        res = {'account_id':False}
+        partner_pool = self.pool.get('res.partner')
+        journal_pool = self.pool.get('account.journal')
+        if pay_now == 'pay_later':
+            partner = partner_pool.browse(cr, uid, partner_id)
+            journal = journal_pool.browse(cr, uid, journal_id)
+            if journal.type in ('sale','sale_refund'):
+                account_id = partner.property_account_receivable.id
+            elif journal.type in ('purchase', 'purchase_refund','expense'):
+                account_id = partner.property_account_payable.id
+            elif journal.type in ('cash', 'bank'):
+                account_id = journal.default_debit_account_id.id
+            else:
+                account_id = journal.default_credit_account_id.id or journal.default_debit_account_id.id
+            res['account_id'] = account_id
+        return {'value':res}
+
+    def calc_cash_discount(self, vch, line, amount=0):
+        # hook method for cash discount
+        return 0.0
+    
+    def calc_interest(self, vch, line, amount=0):
+        # hook method for interest posting
+        return 0.0
+    
+    def action_move_line_create(self, cr, uid, ids, context=None):
+    
+        def _get_payment_term_lines(term_id, amount):
+            term_pool = self.pool.get('account.payment.term')
+            if term_id and amount:
+                terms = term_pool.compute(cr, uid, term_id, amount)
+                return terms
+            return False
+        if not context:
+            context = {}
+        move_pool = self.pool.get('account.move')
+        move_line_pool = self.pool.get('account.move.line')
+        analytic_pool = self.pool.get('account.analytic.line')
+        currency_pool = self.pool.get('res.currency')
+        invoice_pool = self.pool.get('account.invoice')
+        company_pool = self.pool.get('res.company')
+        for vch in self.browse(cr, uid, ids):
+            if vch.move_id:
+                continue
+
+            if 'force_name' in context and context['force_name']: 
+                name = context['force_name']
+            elif vch.journal_id.sequence_id:
+                name = self.pool.get('ir.sequence').get_id(cr, uid, vch.journal_id.sequence_id.id)
+            else:
+                raise osv.except_osv(_('Error !'), _('Please define a sequence on the journal !'))
+
+            move = {
+                'name' : name,
+                'journal_id': vch.journal_id.id,
+                'narration' : vch.narration,
+                'date':vch.date,
+                'ref':vch.reference,
+                'period_id': vch.period_id and vch.period_id.id or False
+            }
+            move_id = move_pool.create(cr, uid, move)
+            
+            #create the first line manually
+            company_currency = vch.journal_id.company_id.currency_id.id
+            debit = 0.0
+            credit = 0.0
+            # TODO: is there any other alternative then the voucher type ?? 
+            # -for sale, purchase we have but for the payment and receipt we do not have as based on the bank/cash journal we can not know its payment or receipt
+            if vch.type in ('purchase', 'payment'):
+                credit = currency_pool.compute(cr, uid, vch.currency_id.id, company_currency, vch.amount)
+            elif vch.type in ('sale', 'receipt'):
+                debit = currency_pool.compute(cr, uid, vch.currency_id.id, company_currency, vch.amount)
+            if debit < 0:
+                credit = -debit
+                debit = 0.0
+            if credit < 0:
+                debit = -credit
+                credit = 0.0
+            
+            move_line = {
+                'name':vch.name or '/',
+                'debit':debit,
+                'credit':credit,
+                'account_id':vch.account_id.id,
+                'move_id':move_id ,
+                'journal_id':vch.journal_id.id,
+                'period_id':vch.period_id.id,
+                'partner_id':vch.partner_id.id,
+                'currency_id':vch.currency_id.id,
+                'amount_currency':vch.amount,
+                'date':vch.date,
+                'date_maturity':vch.date_due
+            }
+
+            if (debit == 0.0 or credit == 0.0 or debit+credit > 0) and (debit > 0.0 or credit > 0.0):
+                master_line = move_line_pool.create(cr, uid, move_line)
+            company = company_pool.browse(cr, uid, vch.company_id.id, context)
+            rec_list_ids = []
+            line_total = debit - credit
+            if vch.type == 'sale':
+                line_total = line_total - currency_pool.compute(cr, uid, vch.currency_id.id, company_currency, vch.tax_amount)
+            elif vch.type == 'purchase':
+                line_total = line_total + currency_pool.compute(cr, uid, vch.currency_id.id, company_currency, vch.tax_amount)
+
+            writeoff_ids = []
+            for line in vch.line_ids:
+                if not line.amount:
+                    continue
+                amount_cash_discount = 0.0#self.calc_cash_discount(line, line.amount)
+                amount_writeoff = 0.0#calc_writeoff(line, amount_cash_discount)
+                amount_interest = 0.0#calc_interest(line, amount_cash_discount + amount_writeoff)
+                amount_currency = currency_pool.compute(cr, uid, vch.currency_id.id, company_currency, line.amount)
+                amount = amount_currency
+                    
+                move_line = {
+                    'journal_id':vch.journal_id.id,
+                    'period_id':vch.period_id.id,
+                    'name':line.name and line.name or '/',
+                    'account_id':line.account_id.id,
+                    'move_id':move_id,
+                    'partner_id':vch.partner_id.id,
+                    'currency_id':vch.currency_id.id,
+                    'amount_currency':amount,
+                    'analytic_account_id':line.account_analytic_id and line.account_analytic_id.id or False,
+                    'quantity':1,
+                    'credit':0.0,
+                    'debit':0.0,
+                    'date':vch.date
+                }
+                if line.invoice_id:
+                    move_line['partner_id'] = line.invoice_id.partner_id.id
+                if amount < 0:
+                    amount = -amount
+                    if line.type == 'dr':
+                        line.type = 'cr'
+                    else:
+                        line.type = 'dr'
+                    
+                if (line.type=='dr'):
+                    line_total += amount
+                    move_line['debit'] = amount
+                else:
+                    line_total -= (amount+line.credit_used)
+                    move_line['credit'] = (amount+line.credit_used)
+
+                if vch.tax_id and vch.type in ('sale', 'purchase'):
+                    move_line.update({
+                        'account_tax_id':vch.tax_id.id,
+                    })
+                master_line = move_line_pool.create(cr, uid, move_line)
+                if line.move_line_id.id:
+                    rec_ids = [master_line, line.move_line_id.id]
+                    rec_list_ids.append(rec_ids)
+            if not self.pool.get('res.currency').is_zero(cr, uid, vch.currency_id, line_total):
+                diff = line_total
+                move_line = {
+                    'name':name,
+                    'account_id':False,
+                    'move_id':move_id ,
+                    'partner_id':vch.partner_id.id,
+                    'date':vch.date,
+                    'credit':diff>0 and diff or 0.0,
+                    'debit':diff<0 and -diff or 0.0,
+                }
+                account_id = False
+                if vch.type in ('sale', 'receipt'):
+                    account_id = vch.partner_id.property_account_receivable.id
+                else:
+                    account_id = vch.partner_id.property_account_payable.id
+                move_line['account_id'] = account_id
+                move_line_id = move_line_pool.create(cr, uid, move_line)
+                if line.move_line_id.id:
+                    rec_ids = [move_line, line.move_line_id.id]
+                    rec_list_ids.append(rec_ids)
+
+            self.write(cr, uid, [vch.id], {
+                'move_id': move_id,
+                'state':'posted'
+            })
+            move_pool.post(cr, uid, [move_id], context={})
+            for rec_ids in rec_list_ids:
+                if len(rec_ids) >= 2:
+                    move_line_pool.reconcile_partial(cr, uid, rec_ids)
+        return True
+
+    def copy(self, cr, uid, id, default={}, context=None):
+        default.update({
+            'state':'draft',
+            'number':False,
+            'move_id':False,
+            'line_cr_ids':False,
+            'line_dr_ids':False,
+            'reference':False
+        })
+        if 'date' not in default:
+            default['date'] = time.strftime('%Y-%m-%d')
+        return super(account_voucher, self).copy(cr, uid, id, default, context)
+
+
+account_voucher()
+
+class account_voucher_line(osv.osv):
+    _name = 'account.voucher.line'
+    _inherit = 'account.voucher.line'
+    _description = 'Voucher Lines'
+    _order = "date_due"
+   
+    def write(self, cr, user, ids, vals, context=None):
+        '''
+            Add invoice and description in payment modification line
+        '''
+        if type(ids) == type([]):
+            move = self.browse(cr, user,ids[0]).move_line_id
+        else:
+            move = self.browse(cr, user,ids).move_line_id
+        if move:
+            vals['invoice_id'] = move.invoice and move.invoice.id
+            vals['name'] = move.invoice and move.invoice.number
+                
+        return super(account_voucher_line, self).write(cr, user, ids, vals, context)
+    
+    def create(self, cr, user, vals, context=None):
+        '''
+            Add invoice and description in payment modification line
+        '''
+        if vals.has_key('move_line_id') and vals['move_line_id']:
+            move = self.pool.get('account.move.line').browse(cr, user,vals['move_line_id'])
+            vals['invoice_id'] = move.invoice and move.invoice.id
+            vals['name'] = move.invoice and move.invoice.number
+        return super(account_voucher_line, self).create(cr, user, vals, context)
+    
+    def calc_amt(self, cr, uid, ids, context={}):
+        '''
+            Function to calculate Pending Credits Used
+        '''
+        res = {}
+        result = 0.0
+        
+        for id in ids:
+            res[id] = result
+        return res
+
+    def _credits_calc(self, cr, uid, ids, name, args, context):   
+        credits_used_pool = self.pool.get('account.voucher.line.credits_to_use')     
+        res={}
+        for line in self.browse(cr, uid, ids):
+            credits_used_ids = credits_used_pool.search(cr, uid, [('orginal_credit_line_id','=',line.id)])
+            res[line.id] = 0.0
+            if line.voucher_id.state != 'draft':
+                continue
+            for credit_used in credits_used_pool.browse(cr, uid, credits_used_ids, context=context):
+                if credit_used.use_credit:
+                    res[line.id] += credit_used.discount_amount
+        return res
+    def _compute_credit_used(self, cr, uid, ids, name, args, context=None):
+        res = {}
+        for line in self.browse(cr, uid, ids):
+            res[line.id] = 0.0
+            for credit_line in line.available_credits:
+                if credit_line.use_credit :
+                    res[line.id] +=  credit_line.discount_amount
+        return res
+
+    def _compute_balance(self, cr, uid, ids, name, args, context=None):
+        currency_pool = self.pool.get('res.currency')
+        rs_data = {}
+        for line in self.browse(cr, uid, ids):
+            res = {}
+            company_currency = line.voucher_id.journal_id.company_id.currency_id.id
+            voucher_currency = line.voucher_id.currency_id.id
+            move_line = line.move_line_id or False
+            if not move_line:
+                res['amount_original'] = 0.0
+                res['amount_unreconciled'] = 0.0
+                
+            elif move_line and move_line.credit > 0:
+                res['amount_original'] = currency_pool.compute(cr, uid, company_currency, voucher_currency, move_line.credit)
+            else:
+                res['amount_original'] = currency_pool.compute(cr, uid, company_currency, voucher_currency, move_line.debit)
+            
+            if move_line:
+                res['amount_unreconciled'] = currency_pool.compute(cr, uid, company_currency, voucher_currency, move_line.amount_unreconciled - line.pending_credits )
+                if line.amount > 0.0:
+                    res['amount_difference'] = res['amount_unreconciled'] - line.amount - line.credit_used
+                else:
+                    res['amount_difference'] = 0.0
+            rs_data[line.id] = res
+        return rs_data
+
+    def _get_due_date(self, cr, uid, ids, context=None):
+        result = {}
+        for line in self.pool.get('account.move.line').browse(cr, uid, ids, context=context):
+#            result[line.invoice_id.id] = True        ##Changed by Jabir to fix error when clicking Post button from Customer Payment form. 2010/11/24
+            result[line.invoice.id] = True
+        return result.keys()
+    def _compute_discount_used(self, cr, uid, ids, name, args, context=None):
+        res = {}
+        for id in ids:
+            res[id] = 0.0
+        return res
+    def _calc_writeoff(self, cr, uid, ids, name, args, context):
+        res={}
+        for id in ids:
+            res[id] = 0.0
+        return res
+    
+    
+    def _order_compute_credit_used(self, cr, uid, ids, context=None):
+        """ Compute which all records to update
+        @return: List of ids
+        """
+        operation_ids = []
+        for credits_to_use in self.pool.get('account.voucher.line.credits_to_use').browse(cr,uid,ids,context=context):
+            operation_ids.append(credits_to_use.voucher_line_id and credits_to_use.voucher_line_id.id)
+        return operation_ids
+    
+    def _get_voucher_line_ids(self, cr, uid, ids, context=None):
+        result = []
+        for vch_lines in self.pool.get('account.voucher').read(cr, uid, ids, ['line_ids'], context=context):
+            result +=vch_lines['line_ids']
+        return result
+    _columns = {
+        'voucher_id':fields.many2one('account.voucher', 'Voucher', required=1, ondelete='cascade'),
+        'invoice_id': fields.many2one('account.invoice', 'Invoice'),
+        'name':fields.char('Description', size=256),
+        'account_id':fields.many2one('account.account','G/L Account', required=True),
+        'partner_id':fields.related('voucher_id', 'partner_id', type='many2one', relation='res.partner', string='Partner'),
+        'untax_amount':fields.float('Untax Amount'),
+        'amount':fields.float('Payment Amt', digits=(14,2), required=True),
+        'type':fields.selection([('dr','Debit'),('cr','Credit')], 'Cr/Dr'),
+        'account_analytic_id':  fields.many2one('account.analytic.account', 'Analytic Account'),
+        'move_line_id': fields.many2one('account.move.line', 'Invoice'),
+        'date_original': fields.related('move_line_id','date', type='date', relation='account.move.line', string='Invoice Date', readonly=True),
+        'date_due': fields.related('move_line_id','date_maturity', type='date', relation='account.move.line', string='Due Date', readonly=True , store={
+                'account.voucher.line': (lambda self, cr, uid, ids, c={}: ids, ['move_line_id'], 20),
+                'account.move.line': (_get_due_date, ['date_maturity'], 20),
+            }),
+        'amount_original': fields.function(_compute_balance, method=True, multi='dc', type='float', string='Original Amt', store=True, readonly=True),
+        'amount_unreconciled': fields.function(_compute_balance, method=True, multi='dc', type='float', string='Amt Due', store=True, readonly=True),
+        'company_id': fields.related('voucher_id','company_id',type='many2one', relation='res.company', string='Company', store={
+                'account.voucher': (_get_voucher_line_ids, ['company_id'], 20),
+            }),
+        'credit_used': fields.function(_compute_credit_used, method=True, type='float', string='Credit Used', 
+                                       store={'account.voucher.line.credits_to_use':(_order_compute_credit_used,['use_credit','discount_amount'], 10)}, readonly=True),
+        'amount_difference': fields.function(_compute_balance, method=True, multi='dc', type='float', string='Unpaid Amt', digits=(16, 2) ),
+        'writeoff': fields.boolean("Writeoff"),
+        'pay': fields.boolean("Pay", required=True),
+        'pending_credits':fields.function(_credits_calc, method=True, string='Pending Credits Used', type='float'),
+        'available_credits':fields.one2many('account.voucher.line.credits_to_use', 'voucher_line_id', 'Available credits'  ),
+        'discount_used': fields.function(_compute_discount_used, method=True, type='float', string='Discount Used', store=False, readonly=True),
+        'writeoff_amount':fields.function(_calc_writeoff, method=True, string='Write-off Amt', type='float', store=False,),
+        'discount_used': fields.function(_compute_discount_used, method=True, type='float', string='Discount Used', store=False, readonly=True),
+    }
+    _defaults = {
+        'name': lambda *a: ''
+    }
+
+    def default_get(self, cr, user, fields_list, context=None):
+        """
+        Returns default values for fields
+        @param fields_list: list of fields, for which default values are required to be read 
+        @param context: context arguments, like lang, time zone
+        
+        @return: Returns a dict that contains default values for fields
+        """
+        journal_id = context.get('journal_id', False)
+        partner_id = context.get('partner_id', False)
+        journal_pool = self.pool.get('account.journal')
+        partner_pool = self.pool.get('res.partner')
+        values = super(account_voucher_line, self).default_get(cr, user, fields_list, context=context)
+        if (not journal_id) or ('account_id' not in fields_list):
+            return values
+        journal = journal_pool.browse(cr, user, journal_id)
+        account_id = False
+        ttype = 'cr'
+        if journal.type in ('sale', 'sale_refund'):
+            account_id = journal.default_credit_account_id and journal.default_credit_account_id.id or False
+            ttype = 'cr'
+        elif journal.type in ('purchase', 'expense', 'purchase_refund'):
+            account_id = journal.default_debit_account_id and journal.default_debit_account_id.id or False
+            ttype = 'dr'
+        elif partner_id:
+            partner = partner_pool.browse(cr, user, partner_id, context=context)
+            if context.get('type') == 'payment':
+                ttype = 'dr'
+                account_id = partner.property_account_payable.id
+            elif context.get('type') == 'receipt':
+                account_id = partner.property_account_receivable.id
+
+        if (not account_id) and 'account_id' in fields_list:
+            raise osv.except_osv(_('Invalid Error !'), _('Unable to locate account.  Please change partner or payment method and try again !'))
+        values.update({
+            'account_id':account_id,
+            'type':ttype
+        })
+        return values
+    
+    def recalculate_values(self, cr, uid, ids, context={}):
+        if type(ids) == type([]):
+            voucher_line = self.browse(cr,uid,ids[0])
+        else:
+            voucher_line = self.browse(cr,uid,ids)
+        self.pool.get('account.voucher').calc_diff(cr, uid, [voucher_line.voucher_id.id])
+        return True
+    def clear_values(self, cr, uid, ids, context={}):
+        '''
+        Clear all selected discounts, credits and writeoffs and manually entered values
+        '''
+        voucher_line = self.browse(cr,uid,ids[0])
+        if voucher_line._columns.has_key('writeoff_ids'):
+            if voucher_line._columns.has_key('available_discounts'):
+                for lines in self.read(cr,uid,ids,['available_credits','writeoff_ids','available_discounts']):
+                    lines['writeoff_ids'] and self.pool.get('account.voucher.line.writeoff').unlink(cr,uid,lines['writeoff_ids'])
+                    lines['available_credits'] and self.pool.get('account.voucher.line.credits_to_use').write(cr,uid,lines['available_credits'],
+                                                                                                        {'use_credit':False, 'discount_amount':0.0})
+                    lines['available_discounts'] and self.pool.get('account.voucher.line.discount_to_use').write(cr,uid,lines['available_discounts'],
+                                                                                                        {'use_discount':False, 'discount_amount':0.0})
+            else:
+                for lines in self.read(cr,uid,ids,['available_credits','writeoff_ids']):
+                    lines['writeoff_ids'] and self.pool.get('account.voucher.line.writeoff').unlink(cr,uid,lines['writeoff_ids'])
+                    lines['available_credits'] and self.pool.get('account.voucher.line.credits_to_use').write(cr,uid,lines['available_credits'],
+                                                                                                        {'use_credit':False, 'discount_amount':0.0})
+        elif voucher_line._columns.has_key('available_discounts'):
+            for lines in self.read(cr,uid,ids,['available_credits','available_discounts']):
+                    lines['available_credits'] and self.pool.get('account.voucher.line.credits_to_use').write(cr,uid,lines['available_credits'],
+                                                                                                            {'use_credit':False, 'discount_amount':0.0})
+                    lines['available_discounts'] and self.pool.get('account.voucher.line.discount_to_use').write(cr,uid,lines['available_discounts'],
+                                                                                                                 {'use_discount':False, 'discount_amount':0.0})
+        else:
+            for lines in self.read(cr,uid,ids,['available_credits']):
+                lines['available_credits'] and self.pool.get('account.voucher.line.credits_to_use').write(cr,uid,lines['available_credits'],
+                                                                                                    {'use_credit':False, 'discount_amount':0.0})
+        return True
+
+    def onchange_pay(self, cr, uid, ids, pay, amount_unreconciled,par_cr_ids, par_amount, credit_used, discount_used=0, writeoff_amount=0,context={}):
+        '''
+        Function to automativally fill the values when the pay checkbox is selected
+        '''
+        ret = {}
+        writeoff_amount = (not writeoff_amount and [0] or [writeoff_amount])[0]
+        discount_used = (not discount_used and [0] or [discount_used])[0]
+        credit_used = (not credit_used and [0] or [credit_used])[0]
+        if pay:
+            tot_amt = par_amount
+            for credit in par_cr_ids:
+                if credit[2]['pay']:
+                    tot_amt -= (credit[2]['amount'])
+            if tot_amt < 0:
+                ret['amount'] = 0.0
+            else:
+                amount_unreconciled -= (discount_used+writeoff_amount+credit_used)
+                ret['amount'] = min(tot_amt,(amount_unreconciled<0) and 0 or amount_unreconciled)
+        else:
+            ret['amount'] = 0.0
+        return {'value':ret}
+    
+
+account_voucher_line()
+
+class account_bank_statement(osv.osv):
+    _inherit = 'account.bank.statement'
+
+    def create_move_from_st_line(self, cr, uid, st_line_id, company_currency_id, next_number, context=None):
+        st_line = self.pool.get('account.bank.statement.line').browse(cr, uid, st_line_id, context=context)
+        if st_line.voucher_id:
+            res = self.pool.get('account.voucher').proforma_voucher(cr, uid, [st_line.voucher_id.id], context={'force_name': next_number})
+            return self.pool.get('account.move.line').write(cr, uid, [x.id for x in st_line.voucher_id.move_ids], {'statement_id': st_line.statement_id.id}, context=context) 
+        return super(account_bank_statement, self).create_move_from_st_line(cr, uid, st_line, company_currency_id, next_number, context=context)
+account_bank_statement()
+
+class account_bank_statement_line(osv.osv):
+    _inherit = 'account.bank.statement.line'
+
+    def _amount_reconciled(self, cursor, user, ids, name, args, context=None):
+        '''
+        Function to calculate the value of variable Amount reconciled
+        '''
+        if not ids:
+            return {}
+        res_currency_obj = self.pool.get('res.currency')
+        res = {}
+        company_currency_id = False
+
+        for line in self.browse(cursor, user, ids, context=context):
+            if not company_currency_id:
+                company_currency_id = line.company_id.id
+            if line.voucher_id:
+                res[line.id] = res_currency_obj.compute(cursor, user,
+                        company_currency_id, line.statement_id.currency.id,
+                        line.voucher_id.amount, context=context)
+            else:
+                res[line.id] = 0.0
+        return res
+
+    _columns = {
+        'amount_reconciled': fields.function(_amount_reconciled,
+            string='Amount reconciled', method=True, type='float'),
+        'voucher_id': fields.many2one('account.voucher', 'Payment'),
+
+    }
+
+account_bank_statement_line()
+
+class account_voucher_line_credits_to_use(osv.osv):
+    _name = "account.voucher.line.credits_to_use"
+    _rec_name = 'inv_credit'
+
+    def _credit_balance(self, cr, uid, ids, name, args, context=None):
+        '''
+        Function to calculate the value of variable Credit Balance
+        '''
+        res = {}
+        for line in self.browse(cr, uid, ids, context=context):
+            if line.use_credit:
+                res[line.id] = line.available_amount - line.discount_amount
+            else:
+                res[line.id] = line.available_amount
+        return res
+    
+    _columns = {
+        'voucher_line_id': fields.many2one('account.voucher.line', 'Account Voucher line', ondelete='cascade', readonly=True),
+        'orginal_credit_line_id': fields.many2one('account.voucher.line', 'Account Voucher Credit Line', ondelete='cascade', readonly=True),
+        'use_credit': fields.boolean('Use Credit',help='Used to indicate if credit should used against the invoice.', required=True), 
+        'inv_credit': fields.many2one('account.move.line', 'Invoice', help='Invoice of the credit', readonly=True),       
+        'discount_window_date': fields.date('Date',help='Date of the original credit', readonly=True),        
+        'orginal_amount': fields.float('Original Credit Amt', readonly=True),       
+        'available_amount': fields.float('Credit Amt Available', readonly=True),
+        'discount_amount': fields.float('Amt to Use',help='Enter the amount of discount to be given.', required=True),
+        'gl_account' : fields.many2one('account.account', 'G/L Account',help='Enter the General Ledger account number to record taking the cash discount.', required=True,readonly=True),
+        'credit_bal': fields.function(_credit_balance, string='Credit Balance', method=True, type='float', store=False),
+    }
+    def onchage_use_credit(self, cr, uid, ids, use_credit, available_amount, amount_difference, context=None):
+        '''
+        Function to automatically fill or remove the discount amount when use credit checkbox checked or unchecked
+        '''
+        res = {}
+        if use_credit:
+            res['value'] = {'discount_amount': min(available_amount, amount_difference)}
+        else: 
+            res['value'] = {'discount_amount': 0}
+        return res
+    def onchage_discount_amount(self, cr, uid, ids, available_amount, discount_amount, context=None):
+        '''
+        Function to validate the discount amount
+        '''
+        res = {}
+        if discount_amount < 0:
+            res['value'] = {'discount_amount': 0, 'use_credit':False }
+            res['warning'] = {'title': 'Credit not in the limit', 'message': 'Credit should not be a negative value.'}
+            return res        
+        if discount_amount > available_amount:
+            res['value'] = {'discount_amount': available_amount, 'use_credit':True }
+            res['warning'] = {'title': 'Credit not in the limit', 'message': 'Please adjust the Credit Amt value to be less than or equal the Credit Available.'}
+            return res
+        if discount_amount == 0.0:
+            res['value'] = { 'use_credit':False }
+        else:
+            res['value'] = { 'use_credit':True }
+        return res
+account_voucher_line_credits_to_use()
+

=== added file 'account_voucher_credits_us/account_voucher_credits_us/voucher_payment_receipt_view.xml'
--- account_voucher_credits_us/account_voucher_credits_us/voucher_payment_receipt_view.xml	1970-01-01 00:00:00 +0000
+++ account_voucher_credits_us/account_voucher_credits_us/voucher_payment_receipt_view.xml	2011-10-06 15:24:58 +0000
@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="view_vendor_receipt_form_1">
+            <field name="name">account.voucher.receipt.form.1</field>
+            <field name="model">account.voucher</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account_voucher.view_vendor_receipt_form"/>
+            <field name="arch" type="xml">
+            
+				<xpath expr="/form/group/field[@name='amount']" position="replace">
+                    <field name="amount" string="Paid Amount" />
+				</xpath>    
+				<xpath expr="/form/group[@col='10']/button[@name='cancel_voucher']" position="after">
+                    <button name="calc_diff" string="Calculate" type="object" states="draft" icon="gtk-execute"  default_focus="1" />
+				</xpath>
+				<xpath expr="/form/notebook/page[@string='Payment Information']/group[@colspan='1']/group[@colspan='1']/field[@name='number']" position="after">
+                    <field name="auto_match"  />
+				</xpath>    
+				<xpath expr="/form/notebook/page[@string='Payment Information']/field[@name='line_dr_ids']/tree" position="replace">
+                    <tree string="Credits" editable="bottom">
+                        <field name="move_line_id"/>
+                        <field name="date_original" readonly="1"/>
+                        <field name="amount_original" readonly="1"/>
+                        <field name="amount" sum="Total Amt Used" string="Amt Used" />
+                        <field name="pending_credits" sum="Total Pending Credit Used" readonly="1"/>
+                        <field name="amount_unreconciled" string="Amt Available" readonly="1"/>
+                        <field name="account_id"  groups="base.group_extended" domain="[('type','=','receivable')]"/>
+                    </tree>
+                    <form string="Credits">
+                        <field name="move_line_id" />
+                        <field name="date_original" readonly="1"/>
+                        <field name="amount_original" readonly="1"/>
+                        <field name="amount" string="Amount Used" readonly="False"/>
+                        <field name="pending_credits" readonly="1" sum="Total Credit Used"/>
+                        <field name="amount_unreconciled" string="Amount Available" readonly="1"/>
+                        <field name="account_id"  groups="base.group_extended" domain="[('type','=','receivable')]"/>
+                    </form>
+				</xpath>
+				
+				<xpath expr="/form/notebook/page[@string='Payment Information']/field[@name='line_cr_ids']" position="replace">
+					<field name="line_cr_ids" default_get="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" colspan="4" nolabel="1" height="140" string="Payment Modification">
+                        <tree string="Invoices and Outstanding Transactions" editable="bottom">
+                            <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
+                                on_change="onchange_move_line_id(move_line_id)"
+                                domain="[('account_id.type','in',('receivable','payable')), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]"
+                                />
+                            <field name="date_original" readonly="1"/>
+                            <field name="date_due" readonly="1"/>
+                            <field name="amount_original" readonly="1"/>
+                            <field name="amount_unreconciled" sum="Open Balance" readonly="1"/>
+							<field name="pay" on_change="onchange_pay(pay, amount_unreconciled, parent.line_cr_ids, parent.amount, credit_used, discount_used, writeoff_amount)"/>
+                            <field name="amount" sum="Payment"/>
+							<field name="amount_difference"/>
+							<field name="credit_used"/>
+							<field name="account_id"/>
+                        </tree>						            
+                        
+				
+						<form >
+							<group string="Invoice" colspan="4" col="4" >
+						        <group colspan="2" cols="2">
+						            <field name="name" readonly="True"/>
+						            <newline/>
+						            <field name="invoice_id" readonly="True"/>
+						            <newline/>
+						            <field name="date_original" readonly="True"/>
+						        </group>
+						        
+						        <group color="red" colspan="2" cols="2" >
+						            <field name="amount_original"/>
+						            <newline/>
+						            <field name="amount_unreconciled"/>
+						            <newline/>
+							        <field name='amount' />
+						            <newline/>
+						            <field name="credit_used"/>
+						            <newline />
+						            <field name="amount_difference"/>
+						            <!--field name="discount_used"/>		
+						            <field name="tot_disc_amt"/>
+						            <newline/>
+						            <field name="tot_cred_amt"/>
+						            <newline/>
+						            <field name="tot_dis_cred_amt"/>
+						            <newline/>
+						            <field name="rem_due"/-->
+						        </group>
+						    </group>
+						    <notebook tabpos="up" colspan="4" >
+						        <page string="Credit">
+						            <field name="available_credits" nolabel="1" colspan="4" string="Avilable Credits" view_mode="tree"  >
+						            </field>
+						        </page>
+						        <page string="Other Info" readonly="1">
+							        <field name='account_id'/>
+							        <field name='partner_id' readonly="1"/>
+							        <field name='untax_amount' readonly="1"/>
+							        <field name='type' readonly="1"/>
+							        <field name='account_analytic_id' readonly="1"/>
+							        <field name='date_due' readonly="1"/>
+							        <field name='company_id' readonly="1"/>
+							        <field name='pay'  on_change="onchange_pay(pay, amount_unreconciled, parent.line_cr_ids, parent.amount, credit_used, discount_used, writeoff_amount)"/>
+						        </page>
+						    </notebook>
+						    <group colspan="1" cols="1">
+						    <label/><label/>
+                        		<button name="clear_values" icon='gtk-clear' string="Clear" type="object" colspan="1"/>
+                        		<button name="recalculate_values" icon='gtk-refresh' string="Re-Calculate" type="object" colspan="1"/>
+                        	</group>
+						</form>
+					
+                	</field>
+				</xpath>
+				
+            </field>
+        </record>
+        
+        
+        <record model="ir.ui.view" id="view_account_voucher_line_credits_to_use_tree">
+            <field name="name">account.voucher.line.credits_to_use.tree</field>
+            <field name="model">account.voucher.line.credits_to_use</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+	            	<tree string="Available Credits" editable="top" >
+	            		<field name="use_credit" width="100" on_change="onchage_use_credit(use_credit, available_amount, parent.amount_difference)"/>
+	            		<field name="inv_credit"/>
+	            		<field name="discount_window_date"/>
+	            		<field name="orginal_amount"/>
+	            		<field name="available_amount"/>
+	            		<field name="discount_amount" on_change="onchage_discount_amount(available_amount, discount_amount)"/>
+	            		<field name="credit_bal"/>
+	            		<field name="gl_account"/>
+	            	</tree>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_vendor_receipt_form_2">
+            <field name="name">account.voucher.receipt.form.2</field>
+            <field name="model">account.voucher</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account_voucher.view_vendor_receipt_form"/>
+            <field name="arch" type="xml">
+				<xpath expr="/form/notebook/page[@string='Payment Information']/field/tree/field[@name='move_line_id']" position="replace">
+                     <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
+                         domain="[('account_id.type','in',('receivable','payable')), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]"
+                         />
+				</xpath>
+            </field>
+        </record>
+        <record model="ir.ui.view" id="view_vendor_receipt_form_3">
+            <field name="name">account.voucher.receipt.form.3</field>
+            <field name="model">account.voucher</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account_voucher.view_vendor_receipt_form"/>
+            <field name="arch" type="xml">
+				<xpath expr="/form/notebook/page[@string='Payment Information']/field/tree/field[@name='account_id']" position="replace">
+                     <field name="account_id"  groups="base.group_extended" domain="[('type','=','receivable')]"/>
+				</xpath>
+            </field>
+        </record>
+        <record model="ir.ui.view" id="view_vendor_receipt_form_4">
+            <field name="name">account.voucher.receipt.form.4</field>
+            <field name="model">account.voucher</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account_voucher.view_vendor_receipt_form"/>
+            <field name="arch" type="xml">
+				<xpath expr="/form/notebook/page[@string='Payment Information']/field/tree/field[@name='amount']" position="replace">
+                     <field name="amount" sum="Payment" />
+ 				</xpath>
+            </field>
+        </record>
+
+        <record id="action_proforma_voucher" model="ir.actions.act_window">
+            <field name="name">Post Voucher</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.post.voucher</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+        <record model="ir.ui.view" id="view_vendor_receipt_form_5">
+            <field name="name">account.voucher.receipt.form.5</field>
+            <field name="model">account.voucher</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account_voucher.view_vendor_receipt_form"/>
+            <field name="arch" type="xml">
+				<xpath expr="/form/group[@col='10']/button[@name='proforma_voucher']" position="replace">
+                    <button name="%(action_proforma_voucher)d" string="Post" states="draft" type="action" icon="terp-camera_test"/>
+				</xpath>
+            </field>
+        </record>
+        <!--
+        Company
+        -->
+        <record id="view_company_form_jdc3" model="ir.ui.view">
+            <field name="name">res.company.form.jdc3</field>
+            <field name="model">res.company</field>
+            <field name="type">form</field>
+			<field name="inherit_id"  ref="base.view_company_form"/>
+			<field name="priority" eval="1"/>
+            <field name="arch" type="xml">
+				<xpath expr="/form/notebook" position="inside">
+					<page string="Accounting">
+	                        <field name="writeoff_account" colspan="2"/>
+					</page>
+	            </xpath>
+            </field>
+        </record>
+
+
+      </data>
+</openerp>

=== added directory 'account_voucher_credits_us/account_voucher_credits_us/wizard'
=== added file 'account_voucher_credits_us/account_voucher_credits_us/wizard/__init__.py'
--- account_voucher_credits_us/account_voucher_credits_us/wizard/__init__.py	1970-01-01 00:00:00 +0000
+++ account_voucher_credits_us/account_voucher_credits_us/wizard/__init__.py	2011-10-06 15:24:58 +0000
@@ -0,0 +1,25 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 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 account_post_voucher
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+

=== added file 'account_voucher_credits_us/account_voucher_credits_us/wizard/account_post_voucher.py'
--- account_voucher_credits_us/account_voucher_credits_us/wizard/account_post_voucher.py	1970-01-01 00:00:00 +0000
+++ account_voucher_credits_us/account_voucher_credits_us/wizard/account_post_voucher.py	2011-10-06 15:24:58 +0000
@@ -0,0 +1,73 @@
+# -*- 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/>.
+#
+##############################################################################
+from osv import fields, osv
+
+class account_post_voucher(osv.osv_memory):
+    _name = 'account.post.voucher'
+    _description = 'Account Pay Voucher'
+
+    _columns = {
+        'total_paid': fields.float('Total Received'),
+        'total_allocated': fields.float('Total Allocated'),
+        'ok_to_go': fields.float('OK to Go'),
+    }
+    
+    def _get_total_paid(self, cr, uid, context={}):
+        obj_voucher = self.pool.get('account.voucher')
+        return obj_voucher.browse(cr, uid, context['active_id'], context).amount
+
+    def _get_total_allocated(self, cr, uid, context={}):
+        obj_voucher = self.pool.get('account.voucher')
+        voucher = obj_voucher.browse(cr, uid, context['active_id'], context)
+        total_allocated = 0.0
+        for line in voucher.line_cr_ids:
+            total_allocated += line.amount
+        return total_allocated
+
+    def _get_ok_to_go(self,cr, uid, context={}):
+        obj_voucher = self.pool.get('account.voucher')
+        voucher = obj_voucher.browse(cr, uid, context['active_id'], context)
+        total_allocated = 0.0
+        for line in voucher.line_cr_ids:
+            total_allocated += line.amount
+        return total_allocated - voucher.amount
+
+    _defaults = {
+        'total_paid': _get_total_paid,
+        'total_allocated': _get_total_allocated,
+        'ok_to_go': _get_ok_to_go,
+    }
+    def onchange_ok_to_go(self,cr, uid, ids, ok_to_go, context={}):
+        if ok_to_go > 0.0:
+            return {'warning': {'title': 'Overallocated invoices', 'message': 'Reduce allocations to match Total Receipt'}}
+        else:
+            return {}
+    def launch_wizard(self, cr, uid, ids, context=None):
+        """
+        Don't allow post if total_allocated > total_paid.
+        """
+        obj_voucher = self.pool.get('account.voucher')
+        obj_voucher.action_move_line_create(cr, uid, context['active_ids'], context)
+        return {}
+
+account_post_voucher()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'account_voucher_credits_us/account_voucher_credits_us/wizard/account_post_voucher.xml'
--- account_voucher_credits_us/account_voucher_credits_us/wizard/account_post_voucher.xml	1970-01-01 00:00:00 +0000
+++ account_voucher_credits_us/account_voucher_credits_us/wizard/account_post_voucher.xml	2011-10-06 15:24:58 +0000
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+     <data>
+
+        <record id="account_voucher_post_view" model="ir.ui.view">
+             <field name="name">account.post.voucher.form</field>
+             <field name="model">account.post.voucher</field>
+             <field name="type">form</field>
+             <field name="arch" type="xml">
+				<form string="Post Voucher">
+					<group colspan="2" col="4">
+						<field name="total_paid" readonly="True"/>
+						<field name="total_allocated" readonly="True"/>
+						<field name="ok_to_go" invisible="True" on_change="onchange_ok_to_go(ok_to_go)"/>
+					</group>
+					<group height="100" width="320">
+						<separator string="Confirm Amounts?"/>
+						<newline/>
+						<group  colspan="2" col="4">
+							<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+							<button name="launch_wizard" string="Yes" type="object" attrs="{'invisible':[('ok_to_go', '>', 0.0)]}" icon="gtk-ok" default_focus="1"/>
+		 				</group>
+ 					</group>
+				</form>
+			</field>
+		</record>
+
+        <record id="action_proforma_voucher" model="ir.actions.act_window">
+            <field name="name">Post Voucher</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.post.voucher</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+			<field name="view_id" ref="account_voucher_post_view"/>
+            <field name="target">new</field>
+        </record>
+
+
+	</data>
+</openerp>

=== added directory 'account_voucher_credits_us/security'
=== added file 'account_voucher_credits_us/security/ir.model.access.csv'
--- account_voucher_credits_us/security/ir.model.access.csv	1970-01-01 00:00:00 +0000
+++ account_voucher_credits_us/security/ir.model.access.csv	2011-10-06 15:24:58 +0000
@@ -0,0 +1,2 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_account_voucher_line_credits_to_use","account.voucher.line.credits_to_use","model_account_voucher_line_credits_to_use","base.group_user",1,1,1,1
\ No newline at end of file

=== added directory 'account_voucher_credits_us/test'
=== added file 'account_voucher_credits_us/test/account_voucher.yml'
--- account_voucher_credits_us/test/account_voucher.yml	1970-01-01 00:00:00 +0000
+++ account_voucher_credits_us/test/account_voucher.yml	2011-10-06 15:24:58 +0000
@@ -0,0 +1,97 @@
+
+-
+  In order to check account voucher module in OpenERP I create a customer voucher
+-
+  !record {model: account.voucher, id: account_voucher_voucherforaxelor0}:
+    account_id: account.cash
+    company_id: base.main_company
+    currency_id: base.EUR
+    journal_id: account.bank_journal
+    name: Voucher for Axelor
+    narration: Basic Pc
+    line_ids:
+      - account_id: account.a_recv
+        amount: 1000.0
+        name: Voucher for Axelor
+        partner_id: base.res_partner_desertic_hispafuentes
+    period_id: account.period_6
+    reference_type: none
+
+-
+  I check that Initially customer voucher is in the "Draft" state
+-
+  !assert {model: account.voucher, id: account_voucher_voucherforaxelor0}:
+    - state == 'draft'
+-
+  I compute the voucher to calculate the taxes by clicking Cpmpute button
+-
+  !workflow {model: account.voucher, action: proforma_voucher, ref: account_voucher_voucherforaxelor0}
+-
+  I check that the voucher state is now "proforma"
+-
+  !assert {model: account.voucher, id: account_voucher_voucherforaxelor0}:
+    - state == 'proforma'
+-
+  I create voucher by clicking on Create button
+-
+  !workflow {model: account.voucher, action: proforma_voucher, ref: account_voucher_voucherforaxelor0}
+-
+  I clicked on Validate Button
+-
+  !assert {model: account.voucher, id: account_voucher_voucherforaxelor0}:
+    - state == 'posted'
+
+-
+  I check that Moves get created for this voucher
+-
+  !python {model: account.voucher}: |
+    acc_id=self.browse(cr, uid, ref("account_voucher_voucherforaxelor0"))
+    assert(acc_id.move_id)
+
+
+-
+  Now I create a Vendor Voucher
+-
+  !record {model: account.voucher, id: account_voucher_voucheraxelor0}:
+    account_id: account.cash
+    company_id: base.main_company
+    currency_id: base.EUR
+    journal_id: account.bank_journal
+    name: Voucher Axelor
+    narration: Basic PC
+    line_ids:
+      - account_id: account.cash
+        amount: 1000.0
+        name: Voucher Axelor
+    period_id: account.period_6
+    reference_type: none
+
+-
+  I check that Initially vendor voucher is in the "Draft" state
+-
+  !assert {model: account.voucher, id: account_voucher_voucheraxelor0}:
+    - state == 'draft'
+-
+  I change the state of voucher to "proforma" by clicking PRO-FORMA button
+-
+  !workflow {model: account.voucher, action: proforma_voucher, ref: account_voucher_voucheraxelor0}
+-
+  I check that the voucher state is now "proforma"
+-
+  !assert {model: account.voucher, id: account_voucher_voucheraxelor0}:
+    - state == 'proforma'
+-
+  I create voucher by clicking on Create button
+-
+  !workflow {model: account.voucher, action: proforma_voucher, ref: account_voucher_voucheraxelor0}
+-
+  I check that the voucher state is "posted"
+-
+  !assert {model: account.voucher, id: account_voucher_voucheraxelor0}:
+    - state == 'posted'
+-
+  I check that moves get created for this voucher
+-
+  !python {model: account.voucher}: |
+    acc_id=self.browse(cr, uid, ref("account_voucher_voucheraxelor0"))
+    assert(acc_id.move_id)

=== added file 'account_voucher_credits_us/test/account_voucher_report.yml'
--- account_voucher_credits_us/test/account_voucher_report.yml	1970-01-01 00:00:00 +0000
+++ account_voucher_credits_us/test/account_voucher_report.yml	2011-10-06 15:24:58 +0000
@@ -0,0 +1,25 @@
+-
+  Demo for Account Voucher
+-
+  !record {model: account.voucher, id: account_voucher_voucheraxelor0}:
+    account_id: account.cash
+    company_id: base.main_company
+    currency_id: base.EUR
+    journal_id: account.bank_journal
+    name: Voucher Axelor
+    narration: Basic PC
+    amount: 1000.0
+    line_ids:
+      - account_id: account.cash
+        amount: 1000.0
+        name: Voucher Axelor
+    period_id: account.period_6
+
+-
+  In order to test the PDF reports defined on a account_voucher, we will print account voucher Report
+-
+  !python {model: account.voucher}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.voucher.cash_receipt.drcr').create(cr, uid, [ref("account_voucher_voucheraxelor0")], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'account_voucher-report.'+format), 'wb+').write(data)

=== added file 'account_voucher_credits_us/test/sales_payment.yml'
--- account_voucher_credits_us/test/sales_payment.yml	1970-01-01 00:00:00 +0000
+++ account_voucher_credits_us/test/sales_payment.yml	2011-10-06 15:24:58 +0000
@@ -0,0 +1,89 @@
+-
+  In order to test account voucher i will create an invoice and pay it through account voucher.
+-
+  I create a new Partner
+-
+  !record {model: res.partner, id: res_partner_micropc0}:
+    address:
+      - country_id: base.be
+        name: Jenifer
+        street: 69 rue de Chimay
+        type: default
+        zip: '5478'
+    category_id:
+      - base.res_partner_category_8
+    credit_limit: 0.0
+    name: Micro PC
+    property_account_payable: account.a_pay
+    property_account_receivable: account.a_recv
+
+-
+  Create an invoice for the partner
+-
+  !record {model: account.invoice, id: account_invoice_0}:
+    account_id: account.a_recv
+    address_contact_id: base.res_partner_address_7
+    address_invoice_id: base.res_partner_address_7
+    company_id: base.main_company
+    currency_id: base.EUR
+    invoice_line:
+      - account_id: account.a_sale
+        name: '[PC1] Basic PC'
+        price_unit: 450.0
+        quantity: 1.0
+        product_id: product.product_product_pc1
+        uos_id: product.product_uom_unit
+    journal_id: account.sales_journal
+    partner_id: res_partner_micropc0
+
+-
+  I check that the customer invoice is in draft state
+-
+  !assert {model: account.invoice, id: account_invoice_0}:
+    - state == 'draft'
+
+-
+  I make the invoice in Open state
+-
+  !workflow {model: account.invoice, action: invoice_open, ref: account_invoice_0}
+
+-
+  I check that a payment entry gets created in the account.move.line
+-
+  !python {model: account.invoice}: |
+    acc_id=self.browse(cr, uid, ref("account_invoice_0"))
+    assert(acc_id.move_id)
+
+-
+  I will create and post an account voucher for the partner.
+-
+  !python {model: account.voucher}: |
+    import netsvc
+    vals = {}
+    journal_id = self.default_get(cr, uid, ['journal_id']).get('journal_id',None)
+    res = self.onchange_partner_id(cr, uid, [], ref("res_partner_micropc0"), journal_id, price=0.0, ttype='receipt')
+    vals = {
+        'account_id': ref('account.cash'),
+        'amount': 450.0,
+        'company_id': ref('base.main_company'),
+        'currency_id': ref('base.EUR'),
+        'journal_id': ref('account.bank_journal'),
+        'partner_id': ref('res_partner_micropc0'),
+        'period_id': ref('account.period_8'),
+        'type': 'receipt',
+    }
+    if not res['value']['line_cr_ids']:
+      res['value']['line_cr_ids'] = [{'type': 'cr', 'account_id': ref('account.a_recv'),}]
+    res['value']['line_cr_ids'][0]['amount'] = 450.0
+    vals['line_cr_ids'] = [(0,0,i) for i in res['value']['line_cr_ids']]
+    id = self.create(cr, uid, vals)
+    voucher_id = self.browse(cr, uid, id)
+    assert (voucher_id.state=='draft'), "Voucher is not in draft state"
+    wf_service = netsvc.LocalService("workflow")
+    wf_service.trg_validate(uid, 'account.voucher', voucher_id.id, 'proforma_voucher', cr)
+
+-
+  Finally i will Confirm the state of the invoice is paid
+-
+  !assert {model: account.invoice, id: account_invoice_0}:
+    - state == 'paid'

=== added file 'account_voucher_credits_us/test/sales_receipt.yml'
--- account_voucher_credits_us/test/sales_receipt.yml	1970-01-01 00:00:00 +0000
+++ account_voucher_credits_us/test/sales_receipt.yml	2011-10-06 15:24:58 +0000
@@ -0,0 +1,74 @@
+
+-
+  In order to test sales receipt i will create a sale receipt and pay it through sales payment
+-
+  First of all I create a voucher
+-
+  !record {model: account.voucher, id: account_voucher_chinaexport_0}:
+    account_id: account.a_recv
+    amount: 30000.0
+    company_id: base.main_company
+    journal_id: account.sales_journal
+    line_cr_ids:
+      - account_id: account.a_sale
+        amount: 30000.0
+    partner_id: base.res_partner_3
+    period_id: account.period_8
+    tax_amount: 0.0
+    type: sale
+
+-
+  I check that the voucher state is Draft
+-
+  !assert {model: account.voucher, id: account_voucher_chinaexport_0}:
+    - state == 'draft'
+
+-
+  I clicked on post button to post the voucher
+-
+  !workflow {model: account.voucher, action: proforma_voucher, ref: account_voucher_chinaexport_0}
+
+-
+  Check the voucher state is Posted
+-
+  !assert {model: account.voucher, id: account_voucher_chinaexport_0}:
+    - state == 'posted'
+
+-
+  I create a voucher record for the same partner
+-
+  !record {model: account.voucher, id: account_voucher_chinaexport_1}:
+    account_id: account.cash
+    amount: 30000.0
+    company_id: base.main_company
+    currency_id: base.EUR
+    journal_id: account.bank_journal
+    line_cr_ids:
+      - account_id: account.a_recv
+        amount: 0.0
+        name: 2010/003
+        type: cr
+      - account_id: account.a_recv
+        amount: 30000.0
+        name: 2010/003
+        type: cr
+    partner_id: base.res_partner_3
+    period_id: account.period_8
+    type: receipt
+
+-
+  Check the voucher state is draft
+-
+  !assert {model: account.voucher, id: account_voucher_chinaexport_1}:
+    - state == 'draft'
+
+-
+  I clicked on Post button to post the voucher
+-
+  !workflow {model: account.voucher, action: proforma_voucher, ref: account_voucher_chinaexport_1}
+
+-
+  Check the voucher state is Posted
+-
+  !assert {model: account.voucher, id: account_voucher_chinaexport_1}:
+    - state == 'posted'

=== added file 'account_voucher_credits_us/voucher.py'
--- account_voucher_credits_us/voucher.py	1970-01-01 00:00:00 +0000
+++ account_voucher_credits_us/voucher.py	2011-10-06 15:24:58 +0000
@@ -0,0 +1,1100 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 NovaPoint Group LLC (<http://www.novapointgroup.com>)
+#    Copyright (C) 2004-2010 OpenERP SA (<http://www.openerp.com>)
+#
+#    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 time
+import netsvc
+from osv import fields
+from osv import osv
+from tools.translate import _
+def _combinations(iterable, r):
+    '''
+    @return: combination generator object
+
+    Example
+    combinations(’ABCD’, 2) --> AB AC AD BC BD CD
+    combinations(range(4), 3) --> 012 013 023 123
+    '''
+    pool = tuple(iterable)
+    n = len(pool)
+    if r > n:
+        return
+    indices = range(r)
+    yield tuple(pool[i] for i in indices)
+    while True:
+        for i in reversed(range(r)):
+            if indices[i] != i + n - r:
+                break
+        else:
+            return
+        indices[i] += 1
+        for j in range(i+1, r):
+            indices[j] = indices[j-1] + 1
+        yield tuple(pool[i] for i in indices)
+
+
+class account_move_line(osv.osv):
+    '''
+        Show unreconciled amount on partial reconciled/none reconciled move line
+    '''
+    _inherit = 'account.move.line'
+    def _unreconciled(self, cr, uid, ids, prop, unknow_none, context):
+        '''
+        Calculate Amount yet to reconcile
+        '''
+        res={}
+        for line in self.browse(cr, uid, ids, context=context):
+            res[line.id] = line.debit - line.credit
+            if line.reconcile_partial_id:
+                res[line.id] = 0
+                for partial in line.reconcile_partial_id.line_partial_ids:
+                    res[line.id] += partial.debit - partial.credit
+            res[line.id] = abs(res[line.id])
+        return res
+    
+    def write(self, cr, uid, ids, vals, context=None, check=True, update_check=True):
+        if type(ids)!=type([]):
+            ids = [ids]
+        return super(account_move_line, self).write(cr, uid, ids, vals, context=context, check=check, update_check=update_check)
+
+    _columns = {
+        'amount_unreconciled': fields.function(_unreconciled, method=True, string='Unreconciled Amount'),
+    }
+account_move_line()
+
+class account_voucher(osv.osv):
+
+
+    def default_get(self, cr, user, fields_list, context=None):
+        """
+        Returns default values for fields
+        @param fields_list: list of fields, for which default values are required to be read
+        @param context: context arguments, like lang, time zone
+
+        @return: Returns a dict that contains default values for fields
+        """
+        values = super(account_voucher, self).default_get(cr, user, fields_list, context=context)
+        if values.get('type') == 'payment':
+            company = self.pool.get('res.users').browse(cr, user, user, context=context).company_id
+            if company.def_supp_journal:
+                values['journal_id'] = company.def_supp_journal.id
+        return values
+
+
+    def _find_exact_match(self, cr, uid, lines, amount, mark_pay=False, use_discount=False, context=False):
+        '''
+            Accept voucher lines as list of dict and amount to match
+            return : update lines if it found an exact match
+        '''
+        total_amount = 0.0
+        discount_available = {}
+        total_discount_available = 0.0
+        for line in lines:
+            if mark_pay or line.pay == True:
+                if use_discount:
+                    discount_available[line.id] = 0.0
+                    for discount_line in line.available_discounts:
+                        discount_available[line.id] += discount_line.proposed_discount
+                        total_discount_available += discount_line.proposed_discount
+                    total_amount += line.amount_unreconciled - line.credit_used - (line._columns.has_key('writeoff_amount') and line.writeoff_amount)
+                else:
+                    total_amount += line.amount_unreconciled - line.credit_used - line.discount_used- (line._columns.has_key('writeoff_amount') and line.writeoff_amount)
+        if abs(amount - total_amount) < 0.01 :
+            '''
+                Unchecking all the lines other than matched line
+            '''
+            line_ids = self.read(cr,uid,lines[0].voucher_id.id,['line_ids'])['line_ids']
+            self.pool.get('account.voucher.line').write(cr,uid,line_ids,{'pay':False})
+            for line in lines:
+                if mark_pay or line.pay == True:
+                    line.write({'amount':line.amount_unreconciled - line.credit_used - line.discount_used - (line._columns.has_key('writeoff_amount') and line.writeoff_amount), 'pay':True })
+                else:
+                    line.write({'amount':0.0, 'pay':False })
+            return True
+        if use_discount and total_amount>amount and  (total_amount - amount ) <=total_discount_available: #It is possible to match using Discount
+            '''
+                Unchecking all the lines other than matched line and uncheck all discount lines
+            '''
+            line_ids = self.read(cr,uid,lines[0].voucher_id.id,['line_ids'])['line_ids']
+            self.pool.get('account.voucher.line').write(cr,uid,line_ids,{'pay':False})
+            for line_id in line_ids:
+                discount_ids = self.pool.get('account.voucher.line').read(cr,uid,line_id,['available_discounts'])['available_discounts']
+                self.pool.get("account.voucher.line.discount_to_use").write(cr,uid,discount_ids,{'use_discount':False, 'discount_amount':0.0})
+            discount_to_use = total_amount - amount
+            for line in lines:
+                if discount_to_use > 0.0:
+                    for discount_line in line.available_discounts:
+                        discount_line.write({'use_discount':True,'discount_amount':min(discount_to_use, discount_line.proposed_discount)})
+                        discount_to_use = discount_to_use - min(discount_to_use, discount_line.proposed_discount)
+                line = self.pool.get('account.voucher.line').browse(cr, uid, line.id,context=context)
+                line.write({'amount':line.amount_unreconciled - line.credit_used - line.discount_used - (line._columns.has_key('writeoff_amount') and line.writeoff_amount), 'pay':True })
+            return True
+        if len(lines) > 1:
+            for combination in _combinations(lines,len(lines)-1 ):
+                if self._find_exact_match(cr, uid, combination, amount, mark_pay, context=False):
+                    return True
+        return False
+    
+    def calc_diff(self, cr, uid, ids, context={}):
+        '''
+            Called by calculate/re-calculate action.
+            This method will update the credit lines on voucher lines.
+            If the field "auto_match" marked, this method will run a matching routine
+        '''
+        res = {'nodestroy':True}
+        amount_cash_discount = 0.0
+        amount_interest = 0.0
+        for vch in self.browse(cr, uid, ids):
+            for line in vch.line_cr_ids:
+                '''
+                    Update the credit lines and discount lines so that matching routine can use the latest available credits and discounts
+                '''
+                line._update_credit_lines( context=context)
+                line._update_discount_lines(context=context)
+                
+            if vch.auto_match:
+                '''
+                    Try the matching routine including the manual selection
+                '''
+                ret = self._find_exact_match(cr, uid, vch.line_cr_ids, vch.amount, mark_pay=False, use_discount=False, context=False)
+                if not ret:
+                    '''
+                        Try to match considering all voucher lines
+                    '''
+                    ret = self._find_exact_match(cr, uid, vch.line_cr_ids, vch.amount, mark_pay=True, use_discount=False, context=False)
+                if not ret:
+                    '''
+                        Try to match considering discount
+                    '''
+                    ret = self._find_exact_match(cr, uid, vch.line_cr_ids, vch.amount, mark_pay=True, use_discount=True, context=False)
+        return res
+
+    def onchange_date(self, cr, user, ids, partner_id, journal_id, price, currency_id, ttype, date, context={}):
+        """
+        @param date: latest value from user input for field date
+        @param args: other arguments
+        @param context: context arguments, like lang, time zone
+        @return: Returns a dict which contains new values, and context
+        """
+        period_pool = self.pool.get('account.period')
+        pids = period_pool.search(cr, user, [('date_start','<=',date), ('date_stop','>=',date)])
+        if not pids:
+            return {}
+        return {
+            'value':{
+                'period_id':pids[0]
+            }
+        }
+
+    def _update_discounts(self, lines, vch_date):
+        # hook method for account_cash_discount_us module
+        return True
+        
+    _inherit = 'account.voucher'
+    _columns = {
+        'number': fields.related('move_id', 'name', type="char", readonly=True, string='Number'),
+        'auto_match':fields.boolean('Use Automatic Matching')
+    }
+
+    def onchange_partner_id(self, cr, uid, ids, partner_id, journal_id, price, currency_id, ttype, date, context={}):
+        """price
+        Returns a dict that contains new values and context
+
+        @param partner_id: latest value from user input for field partner_id
+        @param args: other arguments
+        @param context: context arguments, like lang, time zone
+
+        @return: Returns a dict which contains new values, and context
+        """
+        '''
+            function ported from account_voucher_jds module
+            This function is redefined and do not use functionality provided by account_voucher module
+            Possible issue is that the latest function from updated account_voucher module will have no effect if this module is installed
+        '''
+        if context is None:
+            context = {}
+        currency_pool = self.pool.get('res.currency')
+        move_pool = self.pool.get('account.move')
+        line_pool = self.pool.get('account.voucher.line')
+        move_line_pool = self.pool.get('account.move.line')
+        partner_pool = self.pool.get('res.partner')
+        journal_pool = self.pool.get('account.journal')
+        default = {
+            'value':{'line_ids':[], 'line_dr_ids':[], 'line_cr_ids':[], 'pre_line': False, 'currency_id':currency_id, 'journal_id': False},
+        }
+        if partner_id and not journal_id:
+            partner = partner_pool.browse(cr, uid, partner_id, context)
+            if partner._columns.has_key('payment_meth_id') and partner.payment_meth_id:
+                payment_mode_pool = self.pool.get('payment.mode')
+                payment_meth = payment_mode_pool.browse(cr, uid, partner.payment_meth_id.id, context)
+                if payment_meth:
+                    default['value']['journal_id'] = payment_meth.journal.id
+                    journal_id = payment_meth.journal.id
+        if not journal_id:
+            return {}
+        context_multi_currency = context.copy()
+        if date:
+            context_multi_currency.update({'date': date})
+
+        vals = self.onchange_journal(cr, uid, ids, journal_id, [], False, partner_id, context)
+        vals = vals.get('value')
+        currency_id = vals.get('currency_id', currency_id)
+
+        if not partner_id:
+            return default
+
+        if not partner_id and ids:
+            line_ids = line_pool.search(cr, uid, [('voucher_id','=',ids[0])])
+            if line_ids:
+                line_pool.unlink(cr, uid, line_ids)
+            return default
+
+        journal = journal_pool.browse(cr, uid, journal_id, context=context)
+        partner = partner_pool.browse(cr, uid, partner_id, context=context)
+        account_id = False
+        if journal.type in ('sale','sale_refund'):
+            account_id = partner.property_account_receivable.id
+        elif journal.type in ('purchase', 'purchase_refund','expense'):
+            account_id = partner.property_account_payable.id
+        elif journal.type in ('cash', 'bank'):
+            account_id = journal.default_debit_account_id.id
+        else:
+            account_id = journal.default_credit_account_id.id or journal.default_debit_account_id.id
+
+        if journal and not default['value']['currency_id']:
+            default['value']['currency_id'] = journal.company_id.currency_id.id
+        default['value']['account_id'] = account_id
+        if journal.type not in ('cash', 'bank'):
+            return default
+
+        total_credit = 0.0
+        total_debit = 0.0
+        account_type = 'receivable'
+        if ttype == 'payment':
+            account_type = 'payable'
+            total_debit = price or 0.0
+        else:
+            total_credit = price or 0.0
+            account_type = 'receivable'
+
+        if partner._columns.has_key('nat_acc_parent') and partner.nat_acc_parent:
+            partner_ids = partner_pool.search(cr,uid,[('parent_id','child_of',[partner_id])])
+        else:
+            partner_ids = [partner_id]
+        ids = move_line_pool.search(cr, uid, [('account_id.type','=', account_type), ('reconcile_id','=', False), ('partner_id','in',partner_ids)], context=context)
+        ids.reverse()
+        moves = move_line_pool.browse(cr, uid, ids)
+
+        company_currency = journal.company_id.currency_id.id
+        if company_currency != currency_id and ttype == 'payment':
+            total_debit = currency_pool.compute(cr, uid, currency_id, company_currency, total_debit, context=context_multi_currency)
+        elif company_currency != currency_id and ttype == 'receipt':
+            total_credit = currency_pool.compute(cr, uid, currency_id, company_currency, total_credit, context=context_multi_currency)
+
+        for line in moves:
+            if line.credit and line.reconcile_partial_id and ttype == 'receipt':
+                continue
+            if line.debit and line.reconcile_partial_id and ttype == 'payment':
+                continue
+            total_credit += line.credit or 0.0
+            total_debit += line.debit or 0.0
+
+        for line in moves:
+            if line.credit and line.reconcile_partial_id and ttype == 'receipt':
+                continue
+            if line.debit and line.reconcile_partial_id and ttype == 'payment':
+                continue
+
+            original_amount = line.credit or line.debit or 0.0
+            rs = {
+                'name':line.move_id.name,
+                'type': line.credit and 'dr' or 'cr',
+                'move_line_id':line.id,
+                'account_id':line.account_id.id,
+                'amount_original':currency_pool.compute(cr, uid, company_currency, currency_id, original_amount, context=context_multi_currency),
+                'date_original':line.date,
+                'date_due':line.date_maturity,
+                'amount_unreconciled':currency_pool.compute(cr, uid, company_currency, currency_id, line.amount_unreconciled, context=context_multi_currency)
+            }
+
+            def calc_amount(line, total):
+                return min(line.amount_unreconciled, total)
+
+            if line.credit:
+                amount = calc_amount(line, total_debit)
+                rs['amount'] = currency_pool.compute(cr, uid, company_currency, currency_id, amount, context=context_multi_currency)
+                total_debit -= amount
+            else:
+                amount = calc_amount(line, total_credit)
+                rs['amount'] = currency_pool.compute(cr, uid, company_currency, currency_id, amount, context=context_multi_currency)
+                total_credit -= amount
+
+            default['value']['line_ids'].append(rs)
+            if rs['type'] == 'cr':
+                default['value']['line_cr_ids'].append(rs)
+            else:
+                default['value']['line_dr_ids'].append(rs)
+
+            if ttype == 'payment' and len(default['value']['line_cr_ids']) > 0:
+                default['value']['pre_line'] = 1
+            elif ttype == 'receipt' and len(default['value']['line_dr_ids']) > 0:
+                default['value']['pre_line'] = 1
+        for credit_line in default['value']['line_dr_ids']:
+            credit_line['amount'] = 0.0
+        for invoice_line in default['value']['line_cr_ids']:
+            invoice_line['amount'] = 0.0
+            invoice_line['amount_difference'] = invoice_line['amount_unreconciled']
+
+        return default
+
+    def calc_cash_discount(self, vch, line, amount=0):
+        # hook method for cash discount
+        return 0.0
+
+    def calc_interest(self, vch, line, amount=0):
+        # hook method for interest posting
+        return 0.0
+
+    def action_move_line_create(self, cr, uid, ids, context=None):
+        '''
+            Function overridden from account voucher module
+            account posting include amount after currency conversion 
+            TODO :  Function need more analysis and testing
+        '''
+
+        def _get_payment_term_lines(term_id, amount):
+            term_pool = self.pool.get('account.payment.term')
+            if term_id and amount:
+                terms = term_pool.compute(cr, uid, term_id, amount)
+                return terms
+            return False
+        if not context:
+            context = {}
+        move_pool = self.pool.get('account.move')
+        move_line_pool = self.pool.get('account.move.line')
+        analytic_pool = self.pool.get('account.analytic.line')
+        currency_pool = self.pool.get('res.currency')
+        invoice_pool = self.pool.get('account.invoice')
+        company_pool = self.pool.get('res.company')
+        for vch in self.browse(cr, uid, ids):
+            if vch.move_id:
+                continue
+
+            if 'force_name' in context and context['force_name']:
+                name = context['force_name']
+            elif vch.journal_id.sequence_id:
+                name = self.pool.get('ir.sequence').get_id(cr, uid, vch.journal_id.sequence_id.id)
+            else:
+                raise osv.except_osv(_('Error !'), _('Please define a sequence on the journal !'))
+
+            move = {
+                'name' : name,
+                'journal_id': vch.journal_id.id,
+                'narration' : vch.narration,
+                'date':vch.date,
+                'ref':vch.reference,
+                'period_id': vch.period_id and vch.period_id.id or False
+            }
+            move_id = move_pool.create(cr, uid, move)
+
+            #create the first line manually
+            company_currency = vch.journal_id.company_id.currency_id.id
+            debit = 0.0
+            credit = 0.0
+            # TODO: is there any other alternative then the voucher type ??
+            # -for sale, purchase we have but for the payment and receipt we do not have as based on the bank/cash journal we can not know its payment or receipt
+            if vch.type in ('purchase', 'payment'):
+                credit = currency_pool.compute(cr, uid, vch.currency_id.id, company_currency, vch.amount)
+            elif vch.type in ('sale', 'receipt'):
+                debit = currency_pool.compute(cr, uid, vch.currency_id.id, company_currency, vch.amount)
+            if debit < 0:
+                credit = -debit
+                debit = 0.0
+            if credit < 0:
+                debit = -credit
+                credit = 0.0
+            move_line = {
+                'name':vch.name or '/',
+                'debit':debit,
+                'credit':credit,
+                'account_id':vch.account_id.id,
+                'move_id':move_id ,
+                'journal_id':vch.journal_id.id,
+                'period_id':vch.period_id.id,
+                'partner_id':vch.partner_id.id,
+                'currency_id':vch.currency_id.id,
+                'amount_currency':vch.amount,
+                'date':vch.date,
+                'date_maturity':vch.date_due
+            }
+
+            if (debit == 0.0 or credit == 0.0 or debit+credit > 0) and (debit > 0.0 or credit > 0.0):
+                master_line = move_line_pool.create(cr, uid, move_line)
+            company = company_pool.browse(cr, uid, vch.company_id.id, context)
+            rec_list_ids = []
+            line_total = debit - credit
+            if vch.type == 'sale':
+                line_total = line_total - currency_pool.compute(cr, uid, vch.currency_id.id, company_currency, vch.tax_amount)
+            elif vch.type == 'purchase':
+                line_total = line_total + currency_pool.compute(cr, uid, vch.currency_id.id, company_currency, vch.tax_amount)
+
+            writeoff_ids = []
+            for line in vch.line_ids:
+                if not line.amount:
+                    skip_flag = True
+                    if line.available_credits:
+                        for av_credits in  line.available_credits:
+                            if av_credits.use_credit and av_credits.discount_amount:
+                                skip_flag=False
+                    if skip_flag:
+                        continue
+                amount_cash_discount = 0.0#self.calc_cash_discount(line, line.amount)
+                amount_writeoff = 0.0#calc_writeoff(line, amount_cash_discount)
+                amount_interest = 0.0#calc_interest(line, amount_cash_discount + amount_writeoff)
+                amount_currency = currency_pool.compute(cr, uid, vch.currency_id.id, company_currency, line.amount)
+                amount = amount_currency
+                move_line = {
+                    'journal_id':vch.journal_id.id,
+                    'period_id':vch.period_id.id,
+                    'name':line.name and line.name or '/',
+                    'account_id':line.account_id.id,
+                    'move_id':move_id,
+                    'partner_id':vch.partner_id.id,
+                    'currency_id':vch.currency_id.id,
+                    #Posting amount after currency conversion
+                    'amount_currency':amount,
+                    'analytic_account_id':line.account_analytic_id and line.account_analytic_id.id or False,
+                    'quantity':1,
+                    'credit':0.0,
+                    'debit':0.0,
+                    'date':vch.date
+                }
+                if line.invoice_id:
+                    move_line['partner_id'] = line.invoice_id.partner_id.id
+                if amount < 0:
+                    amount = -amount
+                    if line.type == 'dr':
+                        line.type = 'cr'
+                    else:
+                        line.type = 'dr'
+
+                if (line.type=='dr'):
+                    line_total += amount
+                    move_line['debit'] = amount
+                else:
+                    line_total -= (amount+line.credit_used)
+                    move_line['credit'] = (amount+line.credit_used)
+
+                if vch.tax_id and vch.type in ('sale', 'purchase'):
+                    move_line.update({
+                        'account_tax_id':vch.tax_id.id,
+                    })
+                
+                if line_total < 0.01 and line_total > -0.01:
+                    line_total = 0.0
+                    
+                master_line = move_line_pool.create(cr, uid, move_line)
+                if line.move_line_id.id:
+                    rec_ids = [master_line, line.move_line_id.id]
+                    rec_list_ids.append(rec_ids)
+
+                if line.invoice_id.id:
+                    invoice = self.pool.get('account.invoice').browse(cr, uid, line.invoice_id.id)
+                    types = {'out_invoice': -1, 'in_invoice': 1, 'out_refund': 1, 'in_refund': -1}
+                    direction = types[invoice.type]
+
+                '''
+                    Post Discount Lines for supplier
+                '''
+                
+                if line.type == 'dr' and line._columns.has_key('available_discounts') and line.available_discounts: # and line.cash_discount > 0.0:
+                    for available_discounts in line.available_discounts:
+                        if available_discounts.use_discount:
+                            l1 = {
+                                'journal_id':vch.journal_id.id,
+                                'period_id':vch.period_id.id,
+                                'debit': direction * available_discounts.discount_amount>0 and direction * available_discounts.discount_amount,
+                                'credit': direction * available_discounts.discount_amount<0 and - direction * available_discounts.discount_amount,
+                                'account_id': line.account_id.id,
+                                'partner_id': line.move_line_id.partner_id.id, #line.partner_id.id,
+                                'move_id':move_id,
+                                'ref':'Cash Discount',
+                                'name':line.name and line.name or '/',
+                                'date': vch.date,
+                                'currency_id':vch.currency_id.id,
+                                'amount_currency':available_discounts.discount_amount and - direction * available_discounts.discount_amount or 0.0,
+                                'company_id': line.company_id.id,
+                            }
+                            l2 = {
+                                'journal_id':vch.journal_id.id,
+                                'period_id':vch.period_id.id,
+                                'debit': direction * available_discounts.discount_amount<0 and - direction * available_discounts.discount_amount,
+                                'credit': direction * available_discounts.discount_amount>0 and direction * available_discounts.discount_amount,
+                                'account_id': available_discounts.gl_account.id,
+                                'partner_id': line.move_line_id.partner_id.id,
+                                'move_id':move_id,
+                                'ref':'Cash Discount',
+                                'name':line.name and line.name or '/',
+                                'date': vch.date,
+                                'currency_id':vch.currency_id.id,
+                                'amount_currency':available_discounts.discount_amount and - direction * available_discounts.discount_amount or 0.0,
+                                'company_id': line.company_id.id,
+                            }
+                            name = invoice.number
+                            l1['name'] = name
+                            l2['name'] = name
+                            move_lines = [l1,l2]
+                            for move_line in move_lines:
+                                master_line = move_line_pool.create(cr, uid, move_line)
+                                if line.move_line_id.id and move_line['account_id'] == line.move_line_id.account_id.id:
+                                    rec_ids = [master_line, line.move_line_id.id]
+                                    rec_list_ids.append(rec_ids)
+
+                
+                
+                '''
+                    Post Discount Lines for customer
+                '''
+                
+                
+                if line.type == 'cr' and line._columns.has_key('available_discounts') and line.available_discounts: # and line.cash_discount > 0.0:
+                    for available_discounts in line.available_discounts:
+                        if available_discounts.use_discount:
+                            l1 = {
+                                'journal_id':vch.journal_id.id,
+                                'period_id':vch.period_id.id,
+                                'debit': direction * available_discounts.discount_amount>0 and direction * available_discounts.discount_amount,
+                                'credit': direction * available_discounts.discount_amount<0 and - direction * available_discounts.discount_amount,
+                                'account_id': line.account_id.id,
+                                'partner_id': line.move_line_id.partner_id.id, #line.partner_id.id,
+                                'move_id':move_id,
+                                'ref':'Cash Discount',
+                                'name':line.name and line.name or '/',
+                                'date': vch.date,
+                                'currency_id':vch.currency_id.id,
+                                'amount_currency':available_discounts.discount_amount and - direction * available_discounts.discount_amount or 0.0,
+                                'company_id': line.company_id.id,
+                            }
+                            l2 = {
+                                'journal_id':vch.journal_id.id,
+                                'period_id':vch.period_id.id,
+                                'debit': direction * available_discounts.discount_amount<0 and - direction * available_discounts.discount_amount,
+                                'credit': direction * available_discounts.discount_amount>0 and direction * available_discounts.discount_amount,
+                                'account_id': available_discounts.gl_account.id,
+                                'partner_id': line.move_line_id.partner_id.id,
+                                'move_id':move_id,
+                                'ref':'Cash Discount',
+                                'name':line.name and line.name or '/',
+                                'date': vch.date,
+                                'currency_id':vch.currency_id.id,
+                                'amount_currency':available_discounts.discount_amount and - direction * available_discounts.discount_amount or 0.0,
+                                'company_id': line.company_id.id,
+                            }
+                            name = invoice.number
+                            l1['name'] = name
+                            l2['name'] = name
+                            move_lines = [l1,l2]
+                            for move_line in move_lines:
+                                master_line = move_line_pool.create(cr, uid, move_line)
+                                if line.move_line_id.id and move_line['account_id'] == line.move_line_id.account_id.id:
+                                    rec_ids = [master_line, line.move_line_id.id]
+                                    rec_list_ids.append(rec_ids)
+                '''
+                    Post Writeoff
+                '''
+                if line.type == 'cr' and line._columns.has_key('writeoff_ids') and line.writeoff_ids:
+                    for writeoff in line.writeoff_ids:
+                        l1 = {
+                            'journal_id':vch.journal_id.id,
+                            'period_id':vch.period_id.id,
+                            'debit': direction * writeoff.writeoff_amount>0 and direction * writeoff.writeoff_amount,
+                            'credit': direction * writeoff.writeoff_amount<0 and - direction * writeoff.writeoff_amount,
+                            'account_id': line.account_id.id,
+                            'partner_id': line.move_line_id.partner_id.id, #,
+                            'move_id':move_id,
+                            'ref':'Writeoff',
+                            'name':line.name and line.name or '/',
+                            'date': vch.date,
+                            'currency_id':vch.currency_id.id,
+                            'amount_currency':writeoff.writeoff_amount and - direction * writeoff.writeoff_amount or 0.0,
+                            'company_id': line.company_id.id,
+                        }
+                        l2 = {
+                            'journal_id':vch.journal_id.id,
+                            'period_id':vch.period_id.id,
+                            'debit': direction * writeoff.writeoff_amount<0 and - direction * writeoff.writeoff_amount,
+                            'credit': direction * writeoff.writeoff_amount>0 and direction * writeoff.writeoff_amount,
+                            'account_id': writeoff.gl_account.id,
+                            'partner_id': line.partner_id.id,
+                            'move_id':move_id,
+                            'ref':'Writeoff',
+                            'name':line.name and line.name or '/',
+                            'date': vch.date,
+                            'currency_id':vch.currency_id.id,
+                            'amount_currency':writeoff.writeoff_amount and - direction * writeoff.writeoff_amount or 0.0,
+                            'company_id': line.company_id.id,
+                        }
+                        name = invoice.number
+                        l1['name'] = name
+                        l2['name'] = name
+                        move_lines = [l1,l2]
+                        for move_line in move_lines:
+                            master_line = move_line_pool.create(cr, uid, move_line)
+                            if line.move_line_id.id and move_line['account_id'] == line.move_line_id.account_id.id:
+                                rec_ids = [master_line, line.move_line_id.id]
+                                rec_list_ids.append(rec_ids)
+
+                if line.type == 'dr':
+                    line.write({ 'pending_credits':0})
+
+            diff = line_total
+            if not self.pool.get('res.currency').is_zero(cr, uid, vch.currency_id, line_total):
+                move_line = {
+                    'name':name,
+                    'account_id':False,
+                    'move_id':move_id ,
+                    'partner_id':vch.partner_id.id,
+                    'date':vch.date,
+                    'credit':diff>0 and diff or 0.0,
+                    'debit':diff<0 and -diff or 0.0,
+                }
+                account_id = False
+                if vch.type in ('sale', 'receipt'):
+                    account_id = vch.partner_id.property_account_receivable.id
+                else:
+                    account_id = vch.partner_id.property_account_payable.id
+                move_line['account_id'] = account_id
+                move_line_id = move_line_pool.create(cr, uid, move_line)
+#                if line.move_line_id.id:
+#                    rec_ids = [move_line, line.move_line_id.id]
+#                    rec_list_ids.append(rec_ids)
+
+            self.write(cr, uid, [vch.id], {
+                'move_id': move_id,
+                'state':'posted'
+            })
+            move_pool.post(cr, uid, [move_id], context={})
+            
+            # let's see if we can incorporate this in the reconciliation
+            #diff = 0
+            if diff > 0.0:
+                diff = line_total
+                rec_ids = []
+                debit_ids = []
+                applied_amount = 0.0
+                move = move_pool.browse(cr, uid, move_id, context={})
+                for line in move.line_id:
+                    if line.account_id.id == vch.journal_id.default_credit_account_id.id:
+                        applied_amount += line.debit
+                        if line.id and line.credit > 0.0:
+                            if line.id not in rec_ids:
+                                rec_ids.append(line.id)
+                        if line.id and line.debit > 0.0:
+                            if line.id not in debit_ids:
+                                debit_ids.append(line.id)
+                    if applied_amount == diff:
+                        for vchcr in vch.line_cr_ids:
+                            if vchcr.amount and vchcr.move_line_id.id not in rec_ids:
+                                rec_ids.append(vchcr.move_line_id.id)
+                        for vchdr in vch.line_dr_ids:
+                            if vchdr.amount and vchdr.move_line_id.id not in debit_ids:
+                                debit_ids.append(vchdr.move_line_id.id)
+                        rec_list_ids = [rec_ids, debit_ids]
+            for rec_ids in rec_list_ids:
+                if len(rec_ids) >= 2:
+                    move_line_pool.reconcile_partial(cr, uid, rec_ids)
+        return True
+
+account_voucher()
+
+class account_voucher_line(osv.osv):
+    _inherit = 'account.voucher.line'
+    _order = "date_due"
+
+
+    def _update_credit_lines(self,cr, uid, ids, context):
+        '''
+            Create or update the list of credit that can be used under each voucher line.
+            To be called from the calculate/re-calculate action
+        '''
+        credits_used_pool = self.pool.get('account.voucher.line.credits_to_use')
+        for line in self.browse(cr , uid, ids, context):
+            credits_lines_used = [x.orginal_credit_line_id.id for x in line.available_credits]
+            for credit_line in line.voucher_id.line_dr_ids :
+                if credit_line.id not in credits_lines_used and line.invoice_id and line.invoice_id.payment_term:
+                    # 
+                    credits_used_pool.create(cr, uid, {
+                                'voucher_line_id': line.id,
+                                'orginal_credit_line_id':credit_line.id,
+                                'use_credit': False,
+                                'inv_credit': credit_line.move_line_id.id,
+                                'discount_window_date': credit_line.date_original,
+                                'orginal_amount': credit_line.amount_original,
+                                'available_amount': credit_line.amount_unreconciled - credit_line.pending_credits,
+                                'discount_amount': 0.0,
+                                'gl_account' : credit_line.account_id.id,})
+                else :
+                    to_update_credit_line_ids = credits_used_pool.search(cr,uid,[('voucher_line_id','=',line.id),( 'orginal_credit_line_id','=',credit_line.id)], context=context)                    
+                    if to_update_credit_line_ids:
+                        credits_used_pool.write(cr, uid,to_update_credit_line_ids,{'available_amount': credit_line.amount_unreconciled-credit_line.pending_credits}, context=context)
+
+
+    def write(self, cr, user, ids, vals, context=None):
+        '''
+            Add invoice and description in payment modification line
+        '''
+        if type(ids) == type([]):
+            move = self.browse(cr, user,ids[0]).move_line_id
+        else:
+            move = self.browse(cr, user,ids).move_line_id
+        if move:
+            vals['invoice_id'] = move.invoice and move.invoice.id
+            vals['name'] = move.invoice and move.invoice.number
+
+        return super(account_voucher_line, self).write(cr, user, ids, vals, context)
+
+    def create(self, cr, user, vals, context=None):
+        '''
+            Add invoice and description in payment modification line
+        '''
+        if vals.has_key('move_line_id') and vals['move_line_id']:
+            move = self.pool.get('account.move.line').browse(cr, user,vals['move_line_id'])
+            vals['invoice_id'] = move.invoice and move.invoice.id
+            vals['name'] = move.invoice and move.invoice.number
+        return super(account_voucher_line, self).create(cr, user, vals, context)
+
+    def calc_amt(self, cr, uid, ids, context={}):
+        '''
+            Function to calculate Pending Credits Used
+            can be removed : Not used anymore : verify first
+        '''
+        res = {}
+        result = 0.0
+
+        for id in ids:
+            res[id] = result
+        return res
+
+    def _credits_calc(self, cr, uid, ids, name, args, context):
+        '''
+            Function to calculate Pending Credits Used
+        '''
+        credits_used_pool = self.pool.get('account.voucher.line.credits_to_use')
+        res={}
+        for line in self.browse(cr, uid, ids):
+            credits_used_ids = credits_used_pool.search(cr, uid, [('orginal_credit_line_id','=',line.id)])
+            res[line.id] = 0.0
+            if line.voucher_id.state != 'draft':
+                continue
+            for credit_used in credits_used_pool.browse(cr, uid, credits_used_ids, context=context):
+                if credit_used.use_credit:
+                    res[line.id] += credit_used.discount_amount
+        return res
+    def _compute_credit_used(self, cr, uid, ids, name, args, context=None):
+        '''
+            Field function for credit_used
+        '''
+        res = {}
+        for line in self.browse(cr, uid, ids):
+            res[line.id] = 0.0
+            for credit_line in line.available_credits:
+                if credit_line.use_credit :
+                    res[line.id] +=  credit_line.discount_amount
+        return res
+
+    def _compute_balance(self, cr, uid, ids, name, args, context=None):
+        '''
+            Field function [multi] to calculate amount_original, amount_unreconciled and amount_difference
+        '''
+        currency_pool = self.pool.get('res.currency')
+        rs_data = {}
+        for line in self.browse(cr, uid, ids):
+            ctx = context.copy()
+            ctx.update({'date': line.voucher_id.date})
+            res = {}
+            company_currency = line.voucher_id.journal_id.company_id.currency_id.id
+            voucher_currency = line.voucher_id.currency_id.id
+            move_line = line.move_line_id or False
+            if not move_line:
+                res['amount_original'] = 0.0
+                res['amount_unreconciled'] = 0.0
+
+            elif move_line and move_line.credit > 0:
+                res['amount_original'] = currency_pool.compute(cr, uid, company_currency, voucher_currency, move_line.credit, context=ctx)
+            else:
+                res['amount_original'] = currency_pool.compute(cr, uid, company_currency, voucher_currency, move_line.debit, context=ctx)
+
+            if move_line:
+                res['amount_unreconciled'] = currency_pool.compute(cr, uid, company_currency, voucher_currency, move_line.amount_unreconciled - line.pending_credits , context=ctx)
+                if line.amount > 0.0:
+                    res['amount_difference'] = res['amount_unreconciled'] - line.amount - line.credit_used
+                else:
+                    res['amount_difference'] = 0.0
+            rs_data[line.id] = res
+        return rs_data
+
+    def _get_due_date(self, cr, uid, ids, context=None):
+        '''
+            Store function to identify the voucher lines that need recalculation of date_due in the case of any change on account move line
+            Fixme: make sure that it return a list of voucher line id only   
+        '''
+        result = {}
+        for line in self.pool.get('account.move.line').browse(cr, uid, ids, context=context):
+#            result[line.invoice_id.id] = True        ##Changed by Jabir to fix error when clicking Post button from Customer Payment form. 2010/11/24
+            result[line.invoice.id] = True
+        return result.keys()
+    
+    def _compute_discount_used(self, cr, uid, ids, name, args, context=None):
+        '''
+            Field function to calculate discount_used
+            Hook function : to be redefined on account_cash_discount_us 
+        '''
+        res = {}
+        for id in ids:
+            res[id] = 0.0
+        return res
+    def _calc_writeoff(self, cr, uid, ids, name, args, context):
+        '''
+            Field function to calculate writeoff_amount
+            Hook function : to be redefined on account_voucher_writeoff_us 
+        '''
+        res={}
+        for id in ids:
+            res[id] = 0.0
+        return res
+
+
+    def _order_compute_credit_used(self, cr, uid, ids, context=None):
+        """ 
+            Store function - Field : credit_used, model : account.voucher.line.credits_to_use
+        """
+        operation_ids = []
+        for credits_to_use in self.pool.get('account.voucher.line.credits_to_use').browse(cr,uid,ids,context=context):
+            operation_ids.append(credits_to_use.voucher_line_id and credits_to_use.voucher_line_id.id)
+        return operation_ids
+
+    def _get_voucher_line_ids(self, cr, uid, ids, context=None):
+        '''
+            Store function - field : company_id, model :account.voucher
+        '''
+        result = []
+        for vch_lines in self.pool.get('account.voucher').read(cr, uid, ids, ['line_ids'], context=context):
+            result +=vch_lines['line_ids']
+        return result
+    
+    _columns = {
+        'invoice_id': fields.many2one('account.invoice', 'Invoice'),
+        'account_id':fields.many2one('account.account','G/L Account', required=True),
+        'amount':fields.float('Payment Amt', digits=(14,2), required=True),
+        'date_due': fields.related('move_line_id','date_maturity', type='date', relation='account.move.line', string='Due Date', readonly=True , store={
+                'account.voucher.line': (lambda self, cr, uid, ids, c={}: ids, ['move_line_id'], 20),
+                'account.move.line': (_get_due_date, ['date_maturity'], 20),
+            }),
+        'amount_original': fields.function(_compute_balance, method=True, multi='dc', type='float', string='Original Amt', store=True, readonly=True),
+        'amount_unreconciled': fields.function(_compute_balance, method=True, multi='dc', type='float', string='Amt Due', store=True, readonly=True),
+        'company_id': fields.related('voucher_id','company_id',type='many2one', relation='res.company', string='Company', store={
+                'account.voucher': (_get_voucher_line_ids, ['company_id'], 20),
+            }),
+        'credit_used': fields.function(_compute_credit_used, method=True, type='float', string='Credit Used',
+                                       store={'account.voucher.line.credits_to_use':(_order_compute_credit_used,['use_credit','discount_amount'], 10)}, readonly=True),
+        'amount_difference': fields.function(_compute_balance, method=True, multi='dc', type='float', string='Unpaid Amt', digits=(16, 2) ),
+        'writeoff': fields.boolean("Writeoff"),
+        'pay': fields.boolean("Pay", required=True),
+        'pending_credits':fields.function(_credits_calc, method=True, string='Pending Credits Used', type='float'),
+        'available_credits':fields.one2many('account.voucher.line.credits_to_use', 'voucher_line_id', 'Available credits'  ),
+        'discount_used': fields.function(_compute_discount_used, method=True, type='float', string='Discount Used', store=False, readonly=True),
+        'writeoff_amount':fields.function(_calc_writeoff, method=True, string='Write-off Amt', type='float', store=False,),
+    }
+
+    def recalculate_values(self, cr, uid, ids, context={}):
+        '''
+            Re-calculate button action
+        '''
+        if type(ids) == type([]):
+            voucher_line = self.browse(cr,uid,ids[0])
+        else:
+            voucher_line = self.browse(cr,uid,ids)
+        self.pool.get('account.voucher').calc_diff(cr, uid, [voucher_line.voucher_id.id])
+        return True
+    def clear_values(self, cr, uid, ids, context={}):
+        '''
+        Clear all selected discounts, credits and writeoffs and manually entered values
+        '''
+        voucher_line = self.browse(cr,uid,ids[0])
+        if voucher_line._columns.has_key('writeoff_ids'):
+            if voucher_line._columns.has_key('available_discounts'):
+                for lines in self.read(cr,uid,ids,['available_credits','writeoff_ids','available_discounts']):
+                    lines['writeoff_ids'] and self.pool.get('account.voucher.line.writeoff').unlink(cr,uid,lines['writeoff_ids'])
+                    lines['available_credits'] and self.pool.get('account.voucher.line.credits_to_use').write(cr,uid,lines['available_credits'],
+                                                                                                        {'use_credit':False, 'discount_amount':0.0})
+                    lines['available_discounts'] and self.pool.get('account.voucher.line.discount_to_use').write(cr,uid,lines['available_discounts'],
+                                                                                                        {'use_discount':False, 'discount_amount':0.0})
+            else:
+                for lines in self.read(cr,uid,ids,['available_credits','writeoff_ids']):
+                    lines['writeoff_ids'] and self.pool.get('account.voucher.line.writeoff').unlink(cr,uid,lines['writeoff_ids'])
+                    lines['available_credits'] and self.pool.get('account.voucher.line.credits_to_use').write(cr,uid,lines['available_credits'],
+                                                                                                        {'use_credit':False, 'discount_amount':0.0})
+        elif voucher_line._columns.has_key('available_discounts'):
+            for lines in self.read(cr,uid,ids,['available_credits','available_discounts']):
+                    lines['available_credits'] and self.pool.get('account.voucher.line.credits_to_use').write(cr,uid,lines['available_credits'],
+                                                                                                            {'use_credit':False, 'discount_amount':0.0})
+                    lines['available_discounts'] and self.pool.get('account.voucher.line.discount_to_use').write(cr,uid,lines['available_discounts'],
+                                                                                                                 {'use_discount':False, 'discount_amount':0.0})
+        else:
+            for lines in self.read(cr,uid,ids,['available_credits']):
+                lines['available_credits'] and self.pool.get('account.voucher.line.credits_to_use').write(cr,uid,lines['available_credits'],
+                                                                                                    {'use_credit':False, 'discount_amount':0.0})
+        return True
+
+    def onchange_pay(self, cr, uid, ids, line_amount, pay, amount_unreconciled,par_cr_ids, par_amount, credit_used, discount_used=0, writeoff_amount=0, context={}):
+        '''
+        Function to automatically fill the values when the pay checkbox is selected
+        '''
+        ret = {}
+        writeoff_amount = (not writeoff_amount and [0] or [writeoff_amount])[0]
+        discount_used = (not discount_used and [0] or [discount_used])[0]
+        credit_used = (not credit_used and [0] or [credit_used])[0]
+        if pay:
+            tot_amt = par_amount + line_amount
+            for credit in par_cr_ids:
+                if credit[2]['pay']:
+                    tot_amt -= (credit[2]['amount'])
+            if tot_amt < 0:
+                ret['amount'] = 0.0
+            else:
+                amount_unreconciled -= (discount_used+writeoff_amount+credit_used)
+                ret['amount'] = min(tot_amt,(amount_unreconciled<0) and 0 or amount_unreconciled)
+        else:
+            ret['amount'] = 0.0
+        return {'value':ret}
+
+
+
+account_voucher_line()
+
+class account_bank_statement(osv.osv):
+    _inherit = 'account.bank.statement'
+
+    def create_move_from_st_line(self, cr, uid, st_line_id, company_currency_id, next_number, context=None):
+        '''
+            TODO : Need careful testing of this function.
+        '''
+#        st_line = self.pool.get('account.bank.statement.line').browse(cr, uid, st_line_id, context=context)
+#        if st_line.voucher_id:
+#            res = self.pool.get('account.voucher').proforma_voucher(cr, uid, [st_line.voucher_id.id], context={'force_name': next_number})
+#            return self.pool.get('account.move.line').write(cr, uid, [x.id for x in st_line.voucher_id.move_ids], {'statement_id': st_line.statement_id.id}, context=context)
+#        return super(account_bank_statement, self).create_move_from_st_line(cr, uid, st_line, company_currency_id, next_number, context=context)
+    
+        voucher_obj = self.pool.get('account.voucher')
+        wf_service = netsvc.LocalService("workflow")
+        move_line_obj = self.pool.get('account.move.line')
+        bank_st_line_obj = self.pool.get('account.bank.statement.line')
+        st_line = bank_st_line_obj.browse(cr, uid, st_line_id, context=context)
+        if st_line.voucher_id:
+            voucher_obj.write(cr, uid, [st_line.voucher_id.id], {'number': next_number}, context=context)
+            if st_line.voucher_id.state == 'cancel':
+                voucher_obj.action_cancel_draft(cr, uid, [st_line.voucher_id.id], context=context)
+            wf_service.trg_validate(uid, 'account.voucher', st_line.voucher_id.id, 'proforma_voucher', cr)
+
+            v = voucher_obj.browse(cr, uid, st_line.voucher_id.id, context=context)
+            bank_st_line_obj.write(cr, uid, [st_line_id], {
+                'move_ids': [(4, v.move_id.id, False)]
+            })
+
+            return move_line_obj.write(cr, uid, [x.id for x in v.move_ids], {'statement_id': st_line.statement_id.id}, context=context)
+        return super(account_bank_statement, self).create_move_from_st_line(cr, uid, st_line.id, company_currency_id, next_number, context=context)
+
+account_bank_statement()
+
+class account_voucher_line_credits_to_use(osv.osv):
+    _name = "account.voucher.line.credits_to_use"
+    _rec_name = 'inv_credit'
+
+    def _credit_balance(self, cr, uid, ids, name, args, context=None):
+        '''
+        Function to calculate the value of variable Credit Balance
+        '''
+        res = {}
+        for line in self.browse(cr, uid, ids, context=context):
+            if line.use_credit:
+                res[line.id] = line.available_amount - line.discount_amount
+            else:
+                res[line.id] = line.available_amount
+        return res
+
+    _columns = {
+        'voucher_line_id': fields.many2one('account.voucher.line', 'Account Voucher line', ondelete='cascade', readonly=True),
+        'orginal_credit_line_id': fields.many2one('account.voucher.line', 'Account Voucher Credit Line', ondelete='cascade', readonly=True),
+        'use_credit': fields.boolean('Use Credit',help='Used to indicate if credit should used against the invoice.', required=True),
+        'inv_credit': fields.many2one('account.move.line', 'Invoice', help='Invoice of the credit', readonly=True),
+        'discount_window_date': fields.date('Date',help='Date of the original credit', readonly=True),
+        'orginal_amount': fields.float('Original Credit Amt', readonly=True),
+        'available_amount': fields.float('Credit Amt Available', readonly=True),
+        'discount_amount': fields.float('Amt to Use',help='Enter the amount of discount to be given.', required=True),
+        'gl_account' : fields.many2one('account.account', 'G/L Account',help='Enter the General Ledger account number to record taking the cash discount.', required=True,readonly=True),
+        'credit_bal': fields.function(_credit_balance, string='Credit Balance', method=True, type='float', store=False),
+    }
+    def onchage_use_credit(self, cr, uid, ids, use_credit, available_amount, amount_difference, context=None):
+        '''
+        Function to automatically fill or remove the discount amount when use credit checkbox checked or unchecked
+        '''
+        res = {}
+        if use_credit:
+            res['value'] = {'discount_amount': min(available_amount, amount_difference)}
+        else:
+            res['value'] = {'discount_amount': 0}
+        return res
+    def onchage_discount_amount(self, cr, uid, ids, available_amount, discount_amount, context=None):
+        '''
+        Function to validate the discount amount
+        '''
+        res = {}
+        if discount_amount < 0:
+            res['value'] = {'discount_amount': 0, 'use_credit':False }
+            res['warning'] = {'title': 'Credit not in the limit', 'message': 'Credit should not be a negative value.'}
+            return res
+        if discount_amount > available_amount:
+            res['value'] = {'discount_amount': available_amount, 'use_credit':True }
+            res['warning'] = {'title': 'Credit not in the limit', 'message': 'Please adjust the Credit Amt value to be less than or equal the Credit Available.'}
+            return res
+        if discount_amount == 0.0:
+            res['value'] = { 'use_credit':False }
+        else:
+            res['value'] = { 'use_credit':True }
+        return res
+account_voucher_line_credits_to_use()
+
+'''
+    Hook for account_voucher_writeoff_us
+'''
+class res_company(osv.osv):
+    '''
+        New field to keep the write-off account configuration on company
+        This Write-off account will be used on Account voucher.
+    '''
+    _name = 'res.company'
+    _inherit = 'res.company'
+    _columns = {
+        'def_supp_journal': fields.many2one('account.journal','Default Supplier Payment Method',readonly=False),
+        'writeoff_account': fields.many2one('account.account', 'Writeoff Account', domain=[('type','!=','view'),('type','!=','consolidation')],
+                                            help="This is the designated write-off gl account that will be used when writing off remaining amounts in customer payment."),
+    }
+res_company()

=== added file 'account_voucher_credits_us/voucher_payment_receipt_view.xml'
--- account_voucher_credits_us/voucher_payment_receipt_view.xml	1970-01-01 00:00:00 +0000
+++ account_voucher_credits_us/voucher_payment_receipt_view.xml	2011-10-06 15:24:58 +0000
@@ -0,0 +1,220 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+    
+    
+    
+        <record model="ir.ui.view" id="view_vendor_receipt_form_1">
+            <field name="name">account.voucher.receipt.form.1</field>
+            <field name="model">account.voucher</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account_voucher.view_vendor_receipt_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="/form/group/field[@name='amount']" position="attributes" >
+                    <attribute name='on_change'></attribute>            
+                </xpath>
+				<xpath expr="/form/group/field[@name='amount']" position="replace">
+                    <field name="amount" string="Paid Amount" />
+				</xpath>    
+				<xpath expr="/form/group[@col='10']/button[@name='cancel_voucher']" position="after">
+                    <button name="calc_diff" string="Calculate" type="object" states="draft" icon="gtk-execute"  />
+				</xpath>
+				<xpath expr="/form/notebook/page[@string='Payment Information']/group[@colspan='1']/group[@colspan='1']/field[@name='number']" position="after">
+                    <field name="auto_match"  />
+				</xpath>    
+				<xpath expr="/form/notebook/page[@string='Payment Information']/field[@name='line_dr_ids']/tree" position="replace">
+                    <tree string="Credits" editable="bottom">
+                        <field name="move_line_id"/>
+                        <field name="date_original" readonly="1"/>
+                        <field name="amount_original" readonly="1"/>
+                        <field name="amount" sum="Total Amt Used" string="Amt Used" />
+                        <field name="pending_credits" sum="Total Pending Credit Used" readonly="1"/>
+                        <field name="amount_unreconciled" string="Amt Available" readonly="1"/>
+                        <field name="account_id"  groups="base.group_extended" domain="[('type','=','receivable')]"/>
+                    </tree>
+                    <form string="Credits">
+                        <field name="move_line_id" />
+                        <field name="date_original" readonly="1"/>
+                        <field name="amount_original" readonly="1"/>
+                        <field name="amount" string="Amount Used" readonly="False"/>
+                        <field name="pending_credits" readonly="1" sum="Total Credit Used"/>
+                        <field name="amount_unreconciled" string="Amount Available" readonly="1"/>
+                        <field name="account_id"  groups="base.group_extended" domain="[('type','=','receivable')]"/>
+                    </form>
+				</xpath>
+				
+				<xpath expr="/form/notebook/page[@string='Payment Information']/field[@name='line_cr_ids']" position="replace">
+					<field name="line_cr_ids" default_get="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" colspan="4" nolabel="1" height="140" string="Payment Modification">
+                        <tree string="Invoices and Outstanding Transactions" editable="bottom">
+                            <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
+                                on_change="onchange_move_line_id(move_line_id)"
+                                domain="[('account_id.type','in',('receivable','payable')), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]"
+                                />
+                            <field name="date_original" readonly="1"/>
+                            <field name="date_due" readonly="1"/>
+                            <field name="amount_original" readonly="1"/>
+                            <field name="amount_unreconciled" sum="Open Balance" readonly="1"/>
+							<field name="pay" on_change="onchange_pay(amount, pay, amount_unreconciled, parent.line_cr_ids, parent.amount, credit_used, discount_used, writeoff_amount)"/>
+                            <field name="amount" sum="Payment"/>
+                            <field name="discount" />
+							<field name="amount_difference"/>
+							<field name="credit_used"/>
+							<field name="account_id"/>
+							<field name="discount_used" invisible="1"/>
+							<field name="writeoff_amount" invisible="1"/>
+                        </tree>						            
+                        
+				
+						<form >
+							<group string="Invoice" colspan="4" col="4" >
+						        <group colspan="2" cols="2">
+						            <field name="name" readonly="True"/>
+						            <newline/>
+						            <field name="invoice_id" readonly="True"/>
+						            <newline/>
+						            <field name="date_original" readonly="True"/>
+						        </group>
+						        
+						        <group color="red" colspan="2" cols="2" >
+						            <field name="amount_original"/>
+						            <newline/>
+						            <field name="amount_unreconciled"/>
+						            <newline/>
+							        <field name='amount' />
+						            <newline/>
+						            <field name="credit_used"/>
+						            <newline />
+						            <field name="amount_difference"/>
+						        </group>
+						    </group>
+						    <notebook tabpos="up" colspan="4" >
+						        <page string="Credit">
+						            <field name="available_credits" nolabel="1" colspan="4" string="Avilable Credits" view_mode="tree"  >
+						            </field>
+						        </page>
+						        <page string="Other Info" readonly="1">
+							        <field name='account_id'/>
+							        <field name='partner_id' readonly="1"/>
+							        <field name='untax_amount' readonly="1"/>
+							        <field name='type' readonly="1"/>
+							        <field name='account_analytic_id' readonly="1"/>
+							        <field name='date_due' readonly="1"/>
+							        <field name='company_id' readonly="1"/>
+							        <field name='pay'  on_change="onchange_pay(amount, pay, amount_unreconciled, parent.line_cr_ids, parent.amount, credit_used, discount_used, writeoff_amount)"/>
+						        </page>
+						    </notebook>
+						    <group colspan="1" cols="1">
+						    <label/><label/>
+                        		<button name="clear_values" icon='gtk-clear' string="Clear" type="object" colspan="1"/>
+                        		<button name="recalculate_values" icon='gtk-refresh' string="Re-Calculate" type="object" colspan="1"/>
+                        	</group>
+						</form>
+					
+                	</field>
+				</xpath>
+				
+            </field>
+        </record>
+        
+        
+        <record model="ir.ui.view" id="view_account_voucher_line_credits_to_use_tree">
+            <field name="name">account.voucher.line.credits_to_use.tree</field>
+            <field name="model">account.voucher.line.credits_to_use</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+	            	<tree string="Available Credits" editable="top" >
+	            		<field name="use_credit" width="100" on_change="onchage_use_credit(use_credit, available_amount, parent.amount_difference)"/>
+	            		<field name="inv_credit"/>
+	            		<field name="discount_window_date"/>
+	            		<field name="orginal_amount"/>
+	            		<field name="available_amount"/>
+	            		<field name="discount_amount" on_change="onchage_discount_amount(available_amount, discount_amount)"/>
+	            		<field name="credit_bal"/>
+	            		<field name="gl_account"/>
+	            	</tree>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_vendor_receipt_form_2">
+            <field name="name">account.voucher.receipt.form.2</field>
+            <field name="model">account.voucher</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account_voucher.view_vendor_receipt_form"/>
+            <field name="arch" type="xml">
+				<xpath expr="/form/notebook/page[@string='Payment Information']/field/tree/field[@name='move_line_id']" position="replace">
+                     <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
+                         domain="[('account_id.type','in',('receivable','payable')), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]"
+                         />
+				</xpath>
+            </field>
+        </record>
+        <record model="ir.ui.view" id="view_vendor_receipt_form_3">
+            <field name="name">account.voucher.receipt.form.3</field>
+            <field name="model">account.voucher</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account_voucher.view_vendor_receipt_form"/>
+            <field name="arch" type="xml">
+				<xpath expr="/form/notebook/page[@string='Payment Information']/field/tree/field[@name='account_id']" position="replace">
+                     <field name="account_id"  groups="base.group_extended" domain="[('type','=','receivable')]"/>
+				</xpath>
+            </field>
+        </record>
+        <record model="ir.ui.view" id="view_vendor_receipt_form_4">
+            <field name="name">account.voucher.receipt.form.4</field>
+            <field name="model">account.voucher</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account_voucher.view_vendor_receipt_form"/>
+            <field name="arch" type="xml">
+				<xpath expr="/form/notebook/page[@string='Payment Information']/field/tree/field[@name='amount']" position="replace">
+                     <field name="amount" sum="Payment" />
+ 				</xpath>
+            </field>
+        </record>
+
+        <record id="action_proforma_voucher" model="ir.actions.act_window">
+            <field name="name">Post Voucher</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.post.voucher</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+        <record model="ir.ui.view" id="view_vendor_receipt_form_5">
+            <field name="name">account.voucher.receipt.form.5</field>
+            <field name="model">account.voucher</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account_voucher.view_vendor_receipt_form"/>
+            <field name="arch" type="xml">
+				<xpath expr="/form/group[@col='10']/button[@name='proforma_voucher']" position="replace">
+                    <button name="%(action_proforma_voucher)d" string="Post" states="draft" type="action" attrs="{'invisible': ['|',('cc_info_hide','=',False),('state','&lt;&gt;','draft')]}" icon="terp-camera_test"/>
+				</xpath>
+            </field>
+        </record>
+        <!--
+        Company
+        -->
+        <record id="view_company_form_jdc3" model="ir.ui.view">
+            <field name="name">res.company.form.jdc3</field>
+            <field name="model">res.company</field>
+            <field name="type">form</field>
+			<field name="inherit_id"  ref="base.view_company_form"/>
+			<field name="priority" eval="1"/>
+            <field name="arch" type="xml">
+				<xpath expr="/form/notebook/page[@string='Configuration']" position="inside">
+					<group>
+						<separator string="Supplier Payment"  colspan="2"/><newline/>
+	                    <field name="def_supp_journal" domain="[('type','in',['bank','cash'])]"/>
+                   	</group>
+	            </xpath>
+            
+				<xpath expr="/form/notebook" position="inside">
+					<page string="Accounting">
+	                        <field name="writeoff_account" colspan="2"/>
+					</page>
+	            </xpath>
+            </field>
+        </record>
+
+
+      </data>
+</openerp>

=== added directory 'account_voucher_credits_us/wizard'
=== added file 'account_voucher_credits_us/wizard/__init__.py'
--- account_voucher_credits_us/wizard/__init__.py	1970-01-01 00:00:00 +0000
+++ account_voucher_credits_us/wizard/__init__.py	2011-10-06 15:24:58 +0000
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 NovaPoint Group LLC (<http://www.novapointgroup.com>)
+#    Copyright (C) 2004-2010 OpenERP SA (<http://www.openerp.com>)
+#
+#    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_post_voucher
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+

=== added file 'account_voucher_credits_us/wizard/account_post_voucher.py'
--- account_voucher_credits_us/wizard/account_post_voucher.py	1970-01-01 00:00:00 +0000
+++ account_voucher_credits_us/wizard/account_post_voucher.py	2011-10-06 15:24:58 +0000
@@ -0,0 +1,75 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 NovaPoint Group LLC (<http://www.novapointgroup.com>)
+#    Copyright (C) 2004-2010 OpenERP SA (<http://www.openerp.com>)
+#
+#    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
+
+class account_post_voucher(osv.osv_memory):
+    _name = 'account.post.voucher'
+    _description = 'Account Pay Voucher'
+
+    _columns = {
+        'total_paid': fields.float('Total Received'),
+        'total_allocated': fields.float('Total Allocated'),
+        'ok_to_go': fields.float('OK to Go'),
+    }
+
+    def _get_total_paid(self, cr, uid, context={}):
+        obj_voucher = self.pool.get('account.voucher')
+        return obj_voucher.browse(cr, uid, context['active_id'], context).amount
+
+    def _get_total_allocated(self, cr, uid, context={}):
+        obj_voucher = self.pool.get('account.voucher')
+        voucher = obj_voucher.browse(cr, uid, context['active_id'], context)
+        total_allocated = 0.0
+        for line in voucher.line_cr_ids:
+            total_allocated += line.amount
+        return total_allocated
+
+    def _get_ok_to_go(self,cr, uid, context={}):
+        obj_voucher = self.pool.get('account.voucher')
+        voucher = obj_voucher.browse(cr, uid, context['active_id'], context)
+        total_allocated = 0.0
+        for line in voucher.line_cr_ids:
+            total_allocated += line.amount
+        return total_allocated - voucher.amount
+
+    _defaults = {
+        'total_paid': _get_total_paid,
+        'total_allocated': _get_total_allocated,
+        'ok_to_go': _get_ok_to_go,
+    }
+    def onchange_ok_to_go(self,cr, uid, ids, ok_to_go, context={}):
+        if ok_to_go > 0.0:
+            return {'warning': {'title': 'Overallocated invoices', 'message': 'Reduce allocations to match Total Receipt'}}
+        else:
+            return {'value':{}}
+    def launch_wizard(self, cr, uid, ids, context=None):
+        """
+        Don't allow post if total_allocated > total_paid.
+        """
+        obj_voucher = self.pool.get('account.voucher')
+        obj_voucher.action_move_line_create(cr, uid, context['active_ids'], context)
+        return {}
+
+account_post_voucher()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'account_voucher_credits_us/wizard/account_post_voucher.xml'
--- account_voucher_credits_us/wizard/account_post_voucher.xml	1970-01-01 00:00:00 +0000
+++ account_voucher_credits_us/wizard/account_post_voucher.xml	2011-10-06 15:24:58 +0000
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+     <data>
+
+        <record id="account_voucher_post_view" model="ir.ui.view">
+             <field name="name">account.post.voucher.form</field>
+             <field name="model">account.post.voucher</field>
+             <field name="type">form</field>
+             <field name="arch" type="xml">
+				<form string="Post Voucher">
+					<group colspan="2" col="4">
+						<field name="total_paid" readonly="True"/>
+						<field name="total_allocated" readonly="True"/>
+						<field name="ok_to_go" invisible="True" on_change="onchange_ok_to_go(ok_to_go)"/>
+					</group>
+					<group height="100" width="320">
+						<separator string="Confirm Amounts?"/>
+						<newline/>
+						<group  colspan="2" col="4">
+							<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+							<button name="launch_wizard" string="Yes" type="object" attrs="{'invisible':[('ok_to_go', '>', 0.0)]}" icon="gtk-ok" default_focus="1"/>
+		 				</group>
+ 					</group>
+				</form>
+			</field>
+		</record>
+
+        <record id="action_proforma_voucher" model="ir.actions.act_window">
+            <field name="name">Post Voucher</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.post.voucher</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+			<field name="view_id" ref="account_voucher_post_view"/>
+            <field name="target">new</field>
+        </record>
+
+
+	</data>
+</openerp>