From eedaea0948a9ed6f46256caa3bfc8a4f0032aa5d Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Tue, 24 Aug 2010 18:10:08 +0200
Subject: [PATCH] [IMP] account: small changes of useabilty in invoice refund
 wizard

bzr revid: qdp-launchpad@tinyerp.com-20100824161008-1bejqrdfewhzkr5m
---
 addons/account/wizard/account_invoice_refund.py   |  4 ++--
 .../wizard/account_invoice_refund_view.xml        | 15 ++++++---------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/addons/account/wizard/account_invoice_refund.py b/addons/account/wizard/account_invoice_refund.py
index 50d6770fd3c..e6fc938b2ac 100644
--- a/addons/account/wizard/account_invoice_refund.py
+++ b/addons/account/wizard/account_invoice_refund.py
@@ -34,7 +34,7 @@ class account_invoice_refund(osv.osv_memory):
     _columns = {
        'date': fields.date('Operation date', help='This date will be used as the invoice date for Refund Invoice and Period will be chosen accordingly!'),
        'period': fields.many2one('account.period', 'Force period'),
-       'journal_id': fields.many2one('account.journal', 'Journal'),
+       'journal_id': fields.many2one('account.journal', 'Refund Journal', help='You can select here the journal to use for the refund invoice that will be created. If you leave that field empty, it will use the same journal as the current invoice.'),
        'description': fields.char('Description', size=128, required=True),
     }
 
@@ -206,4 +206,4 @@ class account_invoice_refund(osv.osv_memory):
 
 account_invoice_refund()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_invoice_refund_view.xml b/addons/account/wizard/account_invoice_refund_view.xml
index e4849823d52..8ee56eacf61 100644
--- a/addons/account/wizard/account_invoice_refund_view.xml
+++ b/addons/account/wizard/account_invoice_refund_view.xml
@@ -7,25 +7,22 @@
             <field name="model">account.invoice.refund</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Refund">
-                    <separator string="This wizard is used to refund the invoice" colspan="4"/>
+                <form string="Refund Invoice">
+                    <separator string="Refund Invoice Options" colspan="4"/>
                     <group colspan="4" >
-                         <label string="Are you sure you want to refund this invoice ?" colspan="2"/>
-                         <newline/>
                          <field name="description"/>
+                         <field name="journal_id"/>
                          <field name="date"/>
                          <field name="period"/>
-                         <field name="journal_id" />
                     </group>
                     <separator colspan="4"/>
                     <group col="4" colspan="4" fill="1">
-                        <label align="0.0" width="300" string="Refund Invoice: creates a refund invoice"/>
-                        <label align="0.0" width="500" colspan="4" string="Cancel Invoice: creates a reverse accounting entries to cancel the invoice"/>
-                        <label align="0.0" width="550" colspan="4" string="Modify Invoice: creates a refund invoice, and new copy of the same invoice ready for editing"/>
+                        <label align="0.0" width="300" string="Refund Invoice: creates the refund invoice, ready for editing."/>
+                        <label align="0.0" width="500" colspan="4" string="Cancel Invoice: creates the refund invoice, validate and reconcile it to cancel the current invoice."/>
+                        <label align="0.0" width="550" colspan="4" string="Modify Invoice: cancels the current invoice and creates a new copy of it ready for editing."/>
                     </group>
                     <separator colspan="4"/>
                     <group colspan="4" col="6">
-                        <label string ="" colspan="2"/>
                         <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                         <button icon="gtk-redo" string="Refund Invoice" name="invoice_refund" type="object"/>
                         <button icon="gtk-ok" string="Cancel Invoice" name="invoice_cancel" type="object"/>