From f554fe7496f41f3aa1f101214551b6e46b70204d Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Wed, 24 Nov 2010 15:48:29 +0530
Subject: [PATCH] [IMP] account_voucher: add writeoff_amount filed which will
 show the writhoff amount in case of writeoff

bzr revid: psi@tinyerp.co.in-20101124101829-qa1dktqg9r7drq71
---
 addons/account_voucher/account_voucher.py     | 24 +++++++++++++++----
 .../voucher_payment_receipt_view.xml          | 20 +++++++++-------
 2 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 37a418c0941..7ec87552984 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -26,7 +26,6 @@ import netsvc
 from osv import fields
 from osv import osv
 from tools.translate import _
-import decimal_precision as dp
 
 class account_move_line(osv.osv):
     _inherit = 'account.move.line'
@@ -141,6 +140,20 @@ class account_voucher(osv.osv):
             res['arch'] = etree.tostring(doc)
         return res
 
+    def _get_writeoff_amount(self, cr, uid, ids, name, args, context=None):
+        if not ids: return {}
+        res = {}
+        for voucher in self.browse(cr, uid, ids, context=context):
+            debit= credit = 0.0
+            if voucher.line_dr_ids:
+                for line in voucher.line_dr_ids:
+                    debit += line.amount_unreconciled
+            if voucher.line_cr_ids:
+                for line in voucher.line_cr_ids:
+                    credit += line.amount_unreconciled
+            res[voucher.id] = abs(voucher.amount - abs(credit - debit))
+        return res
+
     _name = 'account.voucher'
     _description = 'Accounting Voucher'
     _order = "date desc, id desc"
@@ -192,13 +205,14 @@ class account_voucher(osv.osv):
         'pre_line':fields.boolean('Previous Payments ?', required=False),
         'date_due': fields.date('Due Date', readonly=True, states={'draft':[('readonly',False)]}),
         'payment_option':fields.selection([
-                                           ('not_reconcile', 'Without Write-off'),
-                                           ('close_balance', 'With Write-off'),
+                                           ('without_writeoff', 'Without Write-off'),
+                                           ('with_writeoff', 'With Write-off'),
                                            ], 'Payment Option', required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'writeoff_acc_id': fields.many2one('account.account', 'Write-Off account', readonly=True, states={'draft': [('readonly', False)]}),
         'writeoff_journal_id': fields.many2one('account.journal', 'Write-Off journal', readonly=True, states={'draft': [('readonly', False)]}),
         'comment': fields.char('Comment', size=64, readonly=True, states={'draft': [('readonly', False)]}),
         'analytic_id': fields.many2one('account.analytic.account','Analytic Account', readonly=True, states={'draft': [('readonly', False)]}),
+        'writeoff_amount': fields.function(_get_writeoff_amount, method=True, string='Writeoff Amount', type='float', readonly=True),
     }
     _defaults = {
         'period_id': _get_period,
@@ -214,7 +228,7 @@ class account_voucher(osv.osv):
         '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,
-        'payment_option': 'not_reconcile',
+        'payment_option': 'without_writeoff',
         'comment': 'Write-Off',
     }
 
@@ -734,7 +748,7 @@ class account_voucher(osv.osv):
                 move_line_pool.create(cr, uid, move_line)
             for rec_ids in rec_list_ids:
                 if len(rec_ids) >= 2:
-                    if inv.payment_option == 'close_balance':
+                    if inv.payment_option == 'with_writeoff':
                         writeoff_account_id = inv.writeoff_acc_id.id
                         writeoff_journal_id = inv.writeoff_journal_id.id
                         comment = inv.comment
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 487cf5aa38d..0d960e72f96 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -199,16 +199,18 @@
                                 <group col="2" colspan="1">
                                     <separator string="Payment Options" colspan="2"/>
                                     <field name="payment_option" required="1"/>
+                                    <field name="writeoff_amount"
+                                           attrs="{'invisible':[('payment_option','!=','with_writeoff')]}"/>
                                     <field name="writeoff_acc_id"
-                                           attrs="{'invisible':[('payment_option','!=','close_balance')], 'required':[('payment_option','=','close_balance')]}"
+                                           attrs="{'invisible':[('payment_option','!=','with_writeoff')], 'required':[('payment_option','=','with_writeoff')]}"
                                            domain="[('type','=','liquidity')]"/>
                                          <!-- should select income accounts only. Or use the journal for this ? -->
                                     <field name="writeoff_journal_id"
-                                           attrs="{'invisible':[('payment_option','!=','close_balance')], 'required':[('payment_option','=','close_balance')]}"/>
+                                           attrs="{'invisible':[('payment_option','!=','with_writeoff')], 'required':[('payment_option','=','with_writeoff')]}"/>
                                     <field name="comment"
-                                           attrs="{'invisible':[('payment_option','!=','close_balance')]}"/>
+                                           attrs="{'invisible':[('payment_option','!=','with_writeoff')]}"/>
                                     <field name="analytic_id"
-                                           attrs="{'invisible':[('payment_option','!=','close_balance')]}"
+                                           attrs="{'invisible':[('payment_option','!=','with_writeoff')]}"
                                            groups="analytic.group_analytic_accounting"/>
                                 </group>
                                 <separator string="Other Information" colspan="2"/>
@@ -324,16 +326,18 @@
                                 <group col="2" colspan="1">
                                     <separator string="Payment Options" colspan="2"/>
                                     <field name="payment_option" required="1"/>
+                                    <field name="writeoff_amount"
+                                           attrs="{'invisible':[('payment_option','!=','with_writeoff')]}"/>
                                     <field name="writeoff_acc_id"
-                                           attrs="{'invisible':[('payment_option','!=','close_balance')], 'required':[('payment_option','=','close_balance')]}"
+                                           attrs="{'invisible':[('payment_option','!=','with_writeoff')], 'required':[('payment_option','=','with_writeoff')]}"
                                            domain="[('type','=','liquidity')]"/>
                                          <!-- should select income accounts only. Or use the journal for this ? -->
                                     <field name="writeoff_journal_id"
-                                           attrs="{'invisible':[('payment_option','!=','close_balance')], 'required':[('payment_option','=','close_balance')]}"/>
+                                           attrs="{'invisible':[('payment_option','!=','with_writeoff')], 'required':[('payment_option','=','with_writeoff')]}"/>
                                     <field name="comment"
-                                           attrs="{'invisible':[('payment_option','!=','close_balance')]}"/>
+                                           attrs="{'invisible':[('payment_option','!=','with_writeoff')]}"/>
                                     <field name="analytic_id"
-                                           attrs="{'invisible':[('payment_option','!=','close_balance')]}"
+                                           attrs="{'invisible':[('payment_option','!=','with_writeoff')]}"
                                            groups="analytic.group_analytic_accounting"/>
                                 </group>
                                 <separator string="Other Information" colspan="2"/>