From ca733e4f0e333e65227330d2994e7c1913a80d78 Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Tue, 24 Aug 2010 10:25:43 +0200
Subject: [PATCH 1/5] [IMP] account: useability improvements

bzr revid: qdp-launchpad@tinyerp.com-20100824082543-w8248h9zw0veqj5u
---
 addons/account/account_move_line.py |  2 +-
 addons/account/account_view.xml     | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 148227b8082..043f365bac2 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -447,7 +447,7 @@ class account_move_line(osv.osv):
         'analytic_lines': fields.one2many('account.analytic.line', 'move_id', 'Analytic lines'),
         'centralisation': fields.selection([('normal','Normal'),('credit','Credit Centralisation'),('debit','Debit Centralisation')], 'Centralisation', size=6),
         'balance': fields.function(_balance, fnct_search=_balance_search, method=True, string='Balance'),
-        'state': fields.selection([('draft','Draft'), ('valid','Valid')], 'State', readonly=True,
+        'state': fields.selection([('draft','Unbalanced'), ('valid','Valid')], 'State', readonly=True,
                                   help='When new move line is created the state will be \'Draft\'.\n* When all the payments are done it will be in \'Valid\' state.'),
         'tax_code_id': fields.many2one('account.tax.code', 'Tax Account', help="The Account can either be a base tax code or a tax code account."),
         'tax_amount': fields.float('Tax/Base Amount', digits_compute=dp.get_precision('Account'), select=True, help="If the Tax account is a tax code account, this field will contain the taxed amount.If the tax account is base tax code, "\
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 111fafdd18c..22c1f4ea795 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -925,16 +925,16 @@
 
                             <group col="2" colspan="2">
                                 <separator colspan="2" string="Accounting Documents"/>
-                                <field name="invoice"/>
-                                <field name="move_id" required="False"/>
-                                <field name="statement_id"/>
+                                <field name="invoice" readonly="True"/>
+                                <field name="move_id" readonly="True"/>
+                                <field name="statement_id" readonly="True"/>
                             </group>
 
                             <group col="2" colspan="2">
                                 <separator colspan="2" string="Dates"/>
                                 <field name="date" select="1"/>
                                 <field name="date_maturity"/>
-                                <field name="date_created"/>
+                                <field name="date_created" readonly="True"/>
                             </group>
 
                             <group col="2" colspan="2">
@@ -1044,13 +1044,13 @@
             <field name="arch" type="xml">
                 <search string="Search Entry Lines">
                     <group col='10' colspan='4'>
-                        <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Entry Lines"/>
+                        <filter icon="terp-document-new" string="Unbalanced" domain="[('state','=','draft')]" help="Unbalanced Entry Lines"/>
                         <separator orientation="vertical"/>
-                        <filter icon="terp-camera_test" string="Posted" domain="[('state','=','valid')]" help="Posted Entry Lines"/>
+                        <filter icon="terp-camera_test" string="Posted" domain="[('move_id.state','=','posted')]" help="Posted Entry Lines"/>
                         <filter icon="terp-stock_symbol-selection" string="Unposted" domain="[('move_id.state','=','draft')]" help="Unposted Entry Lines"/>
                         <separator orientation="vertical"/>
                         <filter
-                            icon="terp-stock_symbol-selection"
+                            icon="terp-dolar_ok!"
                             string="Unreconciled"
                             domain="[('reconcile_id','=',False), ('account_id.type','in',['receivable', 'payable'])]" help="Unreconciled Journal Items"
                             name="unreconciled"/>

From 5a1e54a6ae47e830ea0860cf4679a85e766cb956 Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Tue, 24 Aug 2010 11:16:33 +0200
Subject: [PATCH 2/5] [IMP] account: useability improvements

bzr revid: qdp-launchpad@tinyerp.com-20100824091633-1nm9k861ee2dr796
---
 addons/account/wizard/account_reconcile_view.xml    |  2 +-
 addons/account/wizard/account_unreconcile_view.xml  |  4 ++--
 .../account/wizard/account_validate_move_view.xml   | 13 +++++++++----
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/addons/account/wizard/account_reconcile_view.xml b/addons/account/wizard/account_reconcile_view.xml
index 06dccb5f801..a80ffbc05cd 100644
--- a/addons/account/wizard/account_reconcile_view.xml
+++ b/addons/account/wizard/account_reconcile_view.xml
@@ -63,7 +63,7 @@
                     <group colspan="4" col="6">
                         <label string ="" colspan="2"/>
                         <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="gtk-stock_effects-object-colorize" string="Reconcile" name="trans_rec_reconcile" type="object" default_focus="1"/>
+                        <button icon="terp-stock_effects-object-colorize" string="Reconcile" name="trans_rec_reconcile" type="object" default_focus="1"/>
                    </group>
                </form>
             </field>
diff --git a/addons/account/wizard/account_unreconcile_view.xml b/addons/account/wizard/account_unreconcile_view.xml
index 4d5a9da623a..9d4b25204e3 100644
--- a/addons/account/wizard/account_unreconcile_view.xml
+++ b/addons/account/wizard/account_unreconcile_view.xml
@@ -8,9 +8,9 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Unreconciliation">
-                <separator string="Unreconciliation transactions" colspan="4"/>
+                <separator string="Unreconciliate transactions" colspan="4"/>
                 <image name="gtk-dialog-info"/>
-                <label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable" colspan="2"/>
+                <label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disabled" colspan="2"/>
                 <separator colspan="4"/>
                     <group colspan="4" col="6">
                         <button icon="gtk-cancel" special="cancel" string="Cancel"/>
diff --git a/addons/account/wizard/account_validate_move_view.xml b/addons/account/wizard/account_validate_move_view.xml
index 69e26c90f9a..f9a9aa3e23e 100644
--- a/addons/account/wizard/account_validate_move_view.xml
+++ b/addons/account/wizard/account_validate_move_view.xml
@@ -45,10 +45,15 @@
             <field name="model">validate.account.move.lines</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-              <form string="Validate Moves">
-              <separator string="Validate Ledger Postings" colspan="4"/>
-                  <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-                <button name="validate_move_lines" string="Approve" type="object" icon="gtk-go-forward" default_focus="1"/>
+            <form string="Validate Ledger Posting">
+                <separator string="Post Entry Lines" colspan="4"/>
+                <image name="gtk-dialog-info"/>
+                <label string="All selected entry lines will be posted. It means you won't be able to modify their accouting fields." colspan="2"/>
+                <separator colspan="4"/>
+                <group colspan="4" col="6">
+                    <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    <button icon="terp-camera_test" string="Approve" name="validate_move_lines" type="object" default_focus="1"/>
+               </group>
             </form>
             </field>
         </record>

From d6954f7e4a196a29ed1dd5abcb9e408d223f355e Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Tue, 24 Aug 2010 11:32:13 +0200
Subject: [PATCH 3/5] [IMP] account: corrected typo

bzr revid: qdp-launchpad@tinyerp.com-20100824093213-w2g31akxskcyvl5j
---
 addons/account/partner.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/partner.py b/addons/account/partner.py
index cd4d34976d4..04c97c32c9d 100644
--- a/addons/account/partner.py
+++ b/addons/account/partner.py
@@ -187,8 +187,8 @@ class res_partner(osv.osv):
             help="This payment term will be used instead of the default one for the current partner"),
         'ref_companies': fields.one2many('res.company', 'partner_id',
             'Companies that refers to partner'),
-        'last_reconciliation_date': fields.datetime('Last Reconciliation Date', help='Date on which partner account entries reconciled last time')
+        'last_reconciliation_date': fields.datetime('Last Reconciliation Date', help='Date on which the partner accounting entries were reconciled last time')
     }
 res_partner()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 39be0dc546c19587bef1579db67d6edf8bc1c1be Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Tue, 24 Aug 2010 12:27:10 +0200
Subject: [PATCH 4/5] [IMP] account: useability improvement

bzr revid: qdp-launchpad@tinyerp.com-20100824102710-vbpvwz1v10v6ojev
---
 addons/account/account_view.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 22c1f4ea795..5ade15ff918 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1289,13 +1289,12 @@
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Entries"/>
                         <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Entries"/>
                         <separator orientation="vertical"/>
-                        <filter icon="terp-stock_effects-object-colorize" string="To Review" domain="[('to_check','=',True)]" groups="base.group_extended" help="To Review"/>
+                        <filter icon="terp-stock_zoom" string="To Review" domain="[('to_check','=',True)]" groups="base.group_extended" help="To Review"/>
                         <separator orientation="vertical"/>
                         <field name="ref" select="1"/>
                         <field name="name" select="1"/>
                         <field name="partner_id" select='1'/>
                         <field name="date" select='1'/>
-                        <field name="narration" select="1"/>
                     </group>
                     <newline/>
                     <group col='8' colspan='4'>

From d6a478e7889f32fdfdb5f144c1251896f6b38497 Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Tue, 24 Aug 2010 13:04:14 +0200
Subject: [PATCH 5/5] [IMP] account: put the move_id field of account.move.line
 object as required on the model object. Force that attribute to False in the
 views, as the system is already creating a new when needed. This change is
 not supposed to change the behavior, put it puts a constraint NOT NULL on the
 link between account.move.line and account.move

bzr revid: qdp-launchpad@tinyerp.com-20100824110414-6gj3asrsj8zxc8m1
---
 addons/account/account_move_line.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 043f365bac2..7acdb119a11 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -424,7 +424,7 @@ class account_move_line(osv.osv):
         'debit': fields.float('Debit', digits_compute=dp.get_precision('Account')),
         'credit': fields.float('Credit', digits_compute=dp.get_precision('Account')),
         'account_id': fields.many2one('account.account', 'Account', required=True, ondelete="cascade", domain=[('type','<>','view'), ('type', '<>', 'closed')], select=2),
-        'move_id': fields.many2one('account.move', 'Move', ondelete="cascade", help="The move of this entry line.", select=2),
+        'move_id': fields.many2one('account.move', 'Move', ondelete="cascade", help="The move of this entry line.", select=2, required=True),
         'narration': fields.related('move_id','narration', type='text', relation='account.move', string='Narration'),
         'ref': fields.char('Ref.', size=64),
         'statement_id': fields.many2one('account.bank.statement', 'Statement', help="The bank statement used for bank reconciliation", select=1),
@@ -917,6 +917,9 @@ class account_move_line(osv.osv):
             elif field == 'credit':
                 attrs.append('sum="Total credit"')
 
+            elif field == 'move_id':
+                attrs.append('required="False"')
+
             elif field == 'account_tax_id':
                 attrs.append('domain="[(\'parent_id\',\'=\',False)]"')
                 attrs.append("context=\"{'journal_id':journal_id}\"")