From ade18f9376a21291462fce6feb0658d8910e0ecf Mon Sep 17 00:00:00 2001
From: Tejas Tank <tta@openerp.com>
Date: Wed, 6 Mar 2013 14:38:32 +0530
Subject: [PATCH 01/57] [FIX] Account: Cash register money in/out context issue
 fixed.

bzr revid: tta@openerp.com-20130306090832-w4y78ml131osbru0
---
 addons/account/wizard/pos_box.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/wizard/pos_box.py b/addons/account/wizard/pos_box.py
index 49178dfd3ea..65766c888d6 100644
--- a/addons/account/wizard/pos_box.py
+++ b/addons/account/wizard/pos_box.py
@@ -23,7 +23,7 @@ class CashBox(osv.osv_memory):
 
         records = self.pool.get(active_model).browse(cr, uid, active_ids, context=context)
 
-        return self._run(cr, uid, ids, records, context=None)
+        return self._run(cr, uid, ids, records, context=context)
 
     def _run(self, cr, uid, ids, records, context=None):
         for box in self.browse(cr, uid, ids, context=context):

From 1e48c245167c4d887b2c3c2aa36aa4be23ddefa6 Mon Sep 17 00:00:00 2001
From: Tejas Tank <tta@openerp.com>
Date: Wed, 6 Mar 2013 15:08:28 +0530
Subject: [PATCH 02/57] [FIX] Point Of Sale: Added Closing Subtotal in Cashbox
 lines.

bzr revid: tta@openerp.com-20130306093828-ult0l5tnxdsvm8eb
---
 addons/point_of_sale/point_of_sale_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 8a53015b7d7..216d811be98 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -915,7 +915,7 @@
                                     <tree string="Cashbox Lines" editable="bottom">
                                         <field name="pieces" readonly="1" />
                                         <field name="number_closing" />
-                                        <field name="subtotal_closing"/>
+                                        <field name="subtotal_closing" string="Closing Subtotal" sum="Total"/>
                                     </tree>
                                 </field>
                             </group>

From cba3ed3da4715cbf850847ddab6d469cf56238bc Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Fri, 8 Mar 2013 11:56:22 +0530
Subject: [PATCH 03/57] [IMP] Improve cash register's cash control tab view &
 made it like pos

bzr revid: cha@tinyerp.com-20130308062622-4aln2cagaj1pyzvt
---
 addons/account/account_view.xml | 46 +++++++++++++++++++++------------
 1 file changed, 29 insertions(+), 17 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 3ce60902d94..28483d1a194 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2311,23 +2311,35 @@
                         </page>
                         <page string="Cash Control">
                             <group col="2" expand="1">
-                                <field name="opening_details_ids" nolabel="1" colspan="4" attrs="{'invisible' : [('state', '!=', 'draft')]}">
-                                    <tree string="Opening Cashbox Lines" editable="bottom">
-                                        <field name="pieces"/>
-                                        <field name="number_opening" string="Opening Unit Numbers" on_change="on_change_sub_opening(pieces, number_opening, parent.balance_end)"/>
-                                        <field name="subtotal_opening" string="Opening Subtotal"/>
-                                    </tree>
-                                </field>
-                                <field name="closing_details_ids" nolabel="1" colspan="4" attrs="{'invisible' : [('state', '=', 'draft')]}">
-                                    <tree string="Closing Cashbox Lines" editable="bottom">
-                                        <field name="pieces" readonly="1" />
-                                        <field name="number_opening" string="Opening Unit Numbers" readonly="1" />
-                                        <field name="subtotal_opening" string="Opening Subtotal" readonly="1" />
-
-                                        <field name="number_closing" string="Closing Unit Numbers" on_change="on_change_sub_closing(pieces, number_closing, parent.balance_end)"/>
-                                        <field name="subtotal_closing" string="Closing Subtotal"/>
-                                    </tree>
-                                </field>
+                                <group string="Opening Cash Control" attrs="{'invisible' : [('state', '!=', 'draft')]}">
+                                    <field name="opening_details_ids" colspan="2" nolabel="1">
+                                        <tree string="Opening Cashbox Lines" editable="bottom">
+                                            <field name="pieces"/>
+                                            <field name="number_opening" string="Opening Unit Numbers" on_change="on_change_sub_opening(pieces, number_opening, parent.balance_end)"/>
+                                            <field name="subtotal_opening" string="Opening Subtotal" sum="Total"/>
+                                        </tree>
+                                    </field>    
+                                </group>
+                                <group>
+                                    <group string="Opening Cash Control" attrs="{'invisible' : [('state', '=', 'draft')]}">
+                                        <field name="details_ids" colspan="2" nolabel="1">
+                                            <tree string="Opening Cashbox Lines" editable="bottom">
+                                                <field name="pieces"/>
+                                                <field name="number_opening" string="Opening Unit Numbers" on_change="on_change_sub_opening(pieces, number_opening, parent.balance_end)"/>
+                                                <field name="subtotal_opening" string="Opening Subtotal" sum="Total"/>
+                                            </tree>
+                                        </field>
+                                    </group>
+                                    <group string="Closing Cash Control" attrs="{'invisible' : [('state', '=', 'draft')]}">
+                                        <field name="closing_details_ids" colspan="2" nolabel="1">
+                                            <tree string="Closing Cashbox Lines" editable="bottom">
+                                                <field name="pieces" readonly="1" />
+                                                <field name="number_closing" string="Closing Unit Numbers" on_change="on_change_sub_closing(pieces, number_closing, parent.balance_end)"/>
+                                                <field name="subtotal_closing" string="Closing Subtotal"/>
+                                            </tree>
+                                        </field>
+                                    </group>
+                                </group>
                             </group>
                         </page>
                         <page string="Journal Entries" attrs="{'invisible': [('state','!=','confirm')]}">

From 02237190ccfebdf5e9654f2cc85875e228c833fd Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Fri, 8 Mar 2013 12:28:37 +0530
Subject: [PATCH 04/57] added difference field in cash control tab

bzr revid: cha@tinyerp.com-20130308065837-ag6jp60q27mjrqwf
---
 addons/account/account_view.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 28483d1a194..20ac1d30653 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2353,8 +2353,9 @@
                             <field name="last_closing_balance" readonly="1" string="Last Closing Balance" widget="monetary" options="{'currency_field': 'currency_id'}"/>
                             <field name="total_entry_encoding" widget="monetary" options="{'currency_field': 'currency_id'}"/>
                         </group>
-                        <group string="Closing Balance">
+                        <group string="Closing Balance" attrs="{'invisible' : [('state', '=', 'draft')]}">
                             <field name="balance_end" widget="monetary" options="{'currency_field': 'currency_id'}"/>
+                            <field name="difference"/>
                         </group>
                     </group>
                 </sheet>

From 3a554a94867160bf2d7455ff9abd170257dfe21d Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Fri, 8 Mar 2013 12:50:42 +0530
Subject: [PATCH 05/57] [IMP] added sum attribute to subtotal_closing

bzr revid: cha@tinyerp.com-20130308072042-e088oo32vyzpf2f4
---
 addons/account/account_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 20ac1d30653..c52f8bc9779 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2335,7 +2335,7 @@
                                             <tree string="Closing Cashbox Lines" editable="bottom">
                                                 <field name="pieces" readonly="1" />
                                                 <field name="number_closing" string="Closing Unit Numbers" on_change="on_change_sub_closing(pieces, number_closing, parent.balance_end)"/>
-                                                <field name="subtotal_closing" string="Closing Subtotal"/>
+                                                <field name="subtotal_closing" string="Closing Subtotal" sum="Total"/>
                                             </tree>
                                         </field>
                                     </group>

From 771792555decfea12ef9457bd8e487f14b4b1ada Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Fri, 8 Mar 2013 16:03:25 +0530
Subject: [PATCH 06/57] [IMP] made total fields in cash register like pos

bzr revid: cha@tinyerp.com-20130308103325-w9po1yqhuz84um1y
---
 addons/account/account_view.xml | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index c52f8bc9779..384553701ee 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2322,7 +2322,7 @@
                                 </group>
                                 <group>
                                     <group string="Opening Cash Control" attrs="{'invisible' : [('state', '=', 'draft')]}">
-                                        <field name="details_ids" colspan="2" nolabel="1">
+                                        <field name="details_ids" colspan="2" nolabel="1" attrs="{'readonly' : [('state', '!=', 'draft')]}">
                                             <tree string="Opening Cashbox Lines" editable="bottom">
                                                 <field name="pieces"/>
                                                 <field name="number_opening" string="Opening Unit Numbers" on_change="on_change_sub_opening(pieces, number_opening, parent.balance_end)"/>
@@ -2346,16 +2346,17 @@
                             <field name="move_line_ids" string="Journal Entries"/>
                         </page>
                     </notebook>
-                    <group col="6" colspan="4">
-                        <group col="2" colspan="2">
-                            <separator string="Opening Balance" colspan="4"/>
-                            <field name="balance_start" readonly="1" string="Opening Cash Control" widget="monetary" options="{'currency_field': 'currency_id'}"/>
-                            <field name="last_closing_balance" readonly="1" string="Last Closing Balance" widget="monetary" options="{'currency_field': 'currency_id'}"/>
-                            <field name="total_entry_encoding" widget="monetary" options="{'currency_field': 'currency_id'}"/>
+                    <group>
+                        <group class="oe_subtotal_footer oe_right">
+                            <field name="balance_start" readonly="1" string="Opening Balance" class="oe_subtotal_footer_separator" widget="monetary" options="{'currency_field': 'currency_id'}"/>
+                            <field name="total_entry_encoding" readonly="1" string="+ Transactions" widget="monetary" options="{'currency_field': 'currency_id'}"/>
+                            <field name="balance_end" widget="monetary" string="= Theoretical Balance" options="{'currency_field': 'currency_id'}"/>
                         </group>
-                        <group string="Closing Balance" attrs="{'invisible' : [('state', '=', 'draft')]}">
-                            <field name="balance_end" widget="monetary" options="{'currency_field': 'currency_id'}"/>
-                            <field name="difference"/>
+                        <group>
+                            <group class="oe_subtotal_footer oe_right" attrs="{'invisible' : [('state', '=', 'draft')]}">
+                                <field name="balance_end_real" readonly="1" class="oe_subtotal_footer_separator" widget="monetary" options="{'currency_field': 'currency_id'}"/>
+                                <field name="difference" class="oe_subtotal_footer_separator"/>
+                            </group>    
                         </group>
                     </group>
                 </sheet>

From c216e9521c4493c431bcd1262d62119b959c40b9 Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Wed, 13 Mar 2013 17:22:18 +0530
Subject: [PATCH 07/57] [IMP] account: remove added string from the fields

bzr revid: cha@tinyerp.com-20130313115218-uf1eqfynqo55jf8t
---
 addons/account/account_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 384553701ee..09152646b63 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2315,7 +2315,7 @@
                                     <field name="opening_details_ids" colspan="2" nolabel="1">
                                         <tree string="Opening Cashbox Lines" editable="bottom">
                                             <field name="pieces"/>
-                                            <field name="number_opening" string="Opening Unit Numbers" on_change="on_change_sub_opening(pieces, number_opening, parent.balance_end)"/>
+                                            <field name="number_opening" on_change="on_change_sub_opening(pieces, number_opening, parent.balance_end)"/>
                                             <field name="subtotal_opening" string="Opening Subtotal" sum="Total"/>
                                         </tree>
                                     </field>    
@@ -2325,7 +2325,7 @@
                                         <field name="details_ids" colspan="2" nolabel="1" attrs="{'readonly' : [('state', '!=', 'draft')]}">
                                             <tree string="Opening Cashbox Lines" editable="bottom">
                                                 <field name="pieces"/>
-                                                <field name="number_opening" string="Opening Unit Numbers" on_change="on_change_sub_opening(pieces, number_opening, parent.balance_end)"/>
+                                                <field name="number_opening" on_change="on_change_sub_opening(pieces, number_opening, parent.balance_end)"/>
                                                 <field name="subtotal_opening" string="Opening Subtotal" sum="Total"/>
                                             </tree>
                                         </field>
@@ -2334,7 +2334,7 @@
                                         <field name="closing_details_ids" colspan="2" nolabel="1">
                                             <tree string="Closing Cashbox Lines" editable="bottom">
                                                 <field name="pieces" readonly="1" />
-                                                <field name="number_closing" string="Closing Unit Numbers" on_change="on_change_sub_closing(pieces, number_closing, parent.balance_end)"/>
+                                                <field name="number_closing" on_change="on_change_sub_closing(pieces, number_closing, parent.balance_end)"/>
                                                 <field name="subtotal_closing" string="Closing Subtotal" sum="Total"/>
                                             </tree>
                                         </field>

From 4b58ca9fb760762fe8a585ad243bbe1b8286a6f4 Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Wed, 13 Mar 2013 17:37:03 +0530
Subject: [PATCH 08/57] [IMP] account, pos: change help of fields

bzr revid: cha@tinyerp.com-20130313120703-cfcmasmjuwbqgzug
---
 addons/account/account_cash_statement.py | 2 +-
 addons/point_of_sale/point_of_sale.py    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py
index 86d3b0d24de..93deb96c7c4 100644
--- a/addons/account/account_cash_statement.py
+++ b/addons/account/account_cash_statement.py
@@ -179,7 +179,7 @@ class account_cash_statement(osv.osv):
         'opening_details_ids' : fields.one2many('account.cashbox.line', 'bank_statement_id', string='Opening Cashbox Lines'),
         'closing_details_ids' : fields.one2many('account.cashbox.line', 'bank_statement_id', string='Closing Cashbox Lines'),
         'user_id': fields.many2one('res.users', 'Responsible', required=False),
-        'difference' : fields.function(_compute_difference, method=True, string="Difference", type="float"),
+        'difference' : fields.function(_compute_difference, method=True, string="Difference", type="float", help="Difference between the counted cash control at the closing and the ending balance."),
         'last_closing_balance' : fields.function(_compute_last_closing_balance, method=True, string='Last Closing Balance', type='float'),
     }
     _defaults = {
diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index ea7460dae21..a7df9a60173 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -242,7 +242,7 @@ class pos_session(osv.osv):
         'cash_register_difference' : fields.related('cash_register_id', 'difference',
                 type='float',
                 string='Difference',
-                help="Difference between the counted cash control at the closing and the computed balance.",
+                help="Difference between the counted cash control at the closing and the ending balance.",
                 readonly=True),
 
         'journal_ids' : fields.related('config_id', 'journal_ids',

From c121461ea863c5ddb9c78a4c9780d29688d63b19 Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Thu, 14 Mar 2013 10:52:59 +0530
Subject: [PATCH 09/57] [IMP] account, pos: change string Theoretical Balance
 to 'Computed Balance'

bzr revid: cha@tinyerp.com-20130314052259-9zp8hwepvoey29mv
---
 addons/account/account_view.xml             | 2 +-
 addons/point_of_sale/point_of_sale_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 71f500f4371..b3d75bf42d4 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2350,7 +2350,7 @@
                         <group class="oe_subtotal_footer oe_right">
                             <field name="balance_start" readonly="1" string="Opening Balance" class="oe_subtotal_footer_separator" widget="monetary" options="{'currency_field': 'currency_id'}"/>
                             <field name="total_entry_encoding" readonly="1" string="+ Transactions" widget="monetary" options="{'currency_field': 'currency_id'}"/>
-                            <field name="balance_end" widget="monetary" string="= Theoretical Balance" options="{'currency_field': 'currency_id'}"/>
+                            <field name="balance_end" widget="monetary" string="= Computed Balance" options="{'currency_field': 'currency_id'}"/>
                         </group>
                         <group>
                             <group class="oe_subtotal_footer oe_right" attrs="{'invisible' : [('state', '=', 'draft')]}">
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 216d811be98..8b2232ed472 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -924,7 +924,7 @@
                                 <group class="oe_subtotal_footer oe_right">
                                     <field name="cash_register_balance_start" readonly="1" string="Opening Balance" class="oe_subtotal_footer_separator"/>
                                     <field name="cash_register_total_entry_encoding"  attrs="{'invisible' : [('state', '=', 'opening_control')]}" string="+ Transactions"/>
-                                    <field name="cash_register_balance_end" attrs="{'invisible' : [('state', '=', 'opening_control')]}" string="= Theoretical Balance"/>
+                                    <field name="cash_register_balance_end" attrs="{'invisible' : [('state', '=', 'opening_control')]}" string="= Computed Balance"/>
                                 </group>
                                 <div class="oe_clear"/>
                                 <div attrs="{'invisible' : ['|', ('cash_journal_id', '=', False), ('state', '!=', 'opening_control')]}" class="oe_view_nocontent" groups="point_of_sale.group_pos_manager">

From ade85dfa03c69d46aae441e3743e7525f78d2f0e Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Thu, 14 Mar 2013 11:07:27 +0530
Subject: [PATCH 10/57] [IMP] account: change help string of field 'balance
 end'

bzr revid: cha@tinyerp.com-20130314053727-jsjsznfmi9y1vp9a
---
 addons/account/account_bank_statement.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 8e1a5dd26c6..7a620c5065e 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -112,7 +112,7 @@ class account_bank_statement(osv.osv):
                 'account.bank.statement': (lambda self, cr, uid, ids, c={}: ids, ['line_ids','move_line_ids','balance_start'], 10),
                 'account.bank.statement.line': (_get_statement, ['amount'], 10),
             },
-            string="Computed Balance", help='Balance as calculated based on Starting Balance and transaction lines'),
+            string="Computed Balance", help='Balance as calculated based on Opening Balance and transaction lines'),
         'company_id': fields.related('journal_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True),
         'line_ids': fields.one2many('account.bank.statement.line',
             'statement_id', 'Statement lines',

From c8c72c150b4d721ce8bacf79c8cd9f5b38360dcb Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Thu, 14 Mar 2013 12:09:11 +0530
Subject: [PATCH 11/57] [IMP] account: solve vertical alignment problem at cash
 register total

bzr revid: cha@tinyerp.com-20130314063911-rg1bjy80h99r4yb3
---
 addons/account/account_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index b3d75bf42d4..931e4c017b1 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2352,12 +2352,12 @@
                             <field name="total_entry_encoding" readonly="1" string="+ Transactions" widget="monetary" options="{'currency_field': 'currency_id'}"/>
                             <field name="balance_end" widget="monetary" string="= Computed Balance" options="{'currency_field': 'currency_id'}"/>
                         </group>
-                        <group>
+                        <div>
                             <group class="oe_subtotal_footer oe_right" attrs="{'invisible' : [('state', '=', 'draft')]}">
                                 <field name="balance_end_real" readonly="1" class="oe_subtotal_footer_separator" widget="monetary" options="{'currency_field': 'currency_id'}"/>
                                 <field name="difference" class="oe_subtotal_footer_separator"/>
                             </group>    
-                        </group>
+                        </div>
                     </group>
                 </sheet>
                 </form>

From 1fc093586544a73602d76bc6fde06bc7f3abe29b Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Thu, 14 Mar 2013 12:51:56 +0530
Subject: [PATCH 12/57] [IMP] account: solve missing currency symbol issue at
 cash register total

bzr revid: cha@tinyerp.com-20130314072156-2fjxrvqex1jtbwoo
---
 addons/account/account_view.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 931e4c017b1..00edfcb0a0c 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2348,14 +2348,14 @@
                     </notebook>
                     <group>
                         <group class="oe_subtotal_footer oe_right">
-                            <field name="balance_start" readonly="1" string="Opening Balance" class="oe_subtotal_footer_separator" widget="monetary" options="{'currency_field': 'currency_id'}"/>
-                            <field name="total_entry_encoding" readonly="1" string="+ Transactions" widget="monetary" options="{'currency_field': 'currency_id'}"/>
-                            <field name="balance_end" widget="monetary" string="= Computed Balance" options="{'currency_field': 'currency_id'}"/>
+                            <field name="balance_start" readonly="1" string="Opening Balance" class="oe_subtotal_footer_separator" widget="monetary" options="{'currency_field': 'currency'}"/>
+                            <field name="total_entry_encoding" readonly="1" string="+ Transactions" widget="monetary" options="{'currency_field': 'currency'}"/>
+                            <field name="balance_end" widget="monetary" string="= Computed Balance" options="{'currency_field': 'currency'}"/>
                         </group>
                         <div>
                             <group class="oe_subtotal_footer oe_right" attrs="{'invisible' : [('state', '=', 'draft')]}">
-                                <field name="balance_end_real" readonly="1" class="oe_subtotal_footer_separator" widget="monetary" options="{'currency_field': 'currency_id'}"/>
-                                <field name="difference" class="oe_subtotal_footer_separator"/>
+                                <field name="balance_end_real" readonly="1" class="oe_subtotal_footer_separator" widget="monetary" options="{'currency_field': 'currency'}"/>
+                                <field name="difference" class="oe_subtotal_footer_separator" widget="monetary" options="{'currency_field': 'currency'}"/>
                             </group>    
                         </div>
                     </group>

From dbc91ddf993b3f2d3443b9d4982cac190db4475b Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Thu, 14 Mar 2013 17:35:04 +0530
Subject: [PATCH 13/57] [IMP] account: made 'difference' small & 'computed
 balance' bold

bzr revid: cha@tinyerp.com-20130314120504-30st2jl9mo5ylxqc
---
 addons/account/account_view.xml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 00edfcb0a0c..ee74915ac9a 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2349,13 +2349,16 @@
                     <group>
                         <group class="oe_subtotal_footer oe_right">
                             <field name="balance_start" readonly="1" string="Opening Balance" class="oe_subtotal_footer_separator" widget="monetary" options="{'currency_field': 'currency'}"/>
-                            <field name="total_entry_encoding" readonly="1" string="+ Transactions" widget="monetary" options="{'currency_field': 'currency'}"/>
-                            <field name="balance_end" widget="monetary" string="= Computed Balance" options="{'currency_field': 'currency'}"/>
+                            <label for="total_entry_encoding" string="+ Transactions" style="font-weight:bold;"/>
+                            <field name="total_entry_encoding" nolabel="1" class="oe_bold" widget="monetary" options="{'currency_field': 'currency'}"/>
+                            <label for="balance_end" string="= Computed Balance" style="font-weight:bold;"/>
+                            <field name="balance_end" nolabel="1" class="oe_bold" widget="monetary" options="{'currency_field': 'currency'}"/>
                         </group>
                         <div>
                             <group class="oe_subtotal_footer oe_right" attrs="{'invisible' : [('state', '=', 'draft')]}">
                                 <field name="balance_end_real" readonly="1" class="oe_subtotal_footer_separator" widget="monetary" options="{'currency_field': 'currency'}"/>
-                                <field name="difference" class="oe_subtotal_footer_separator" widget="monetary" options="{'currency_field': 'currency'}"/>
+                                <label for="difference" style="font-weight:bold;"/>
+                                <field name="difference" nolabel="1" class="oe_bold" widget="monetary" options="{'currency_field': 'currency'}"/>
                             </group>    
                         </div>
                     </group>

From d0933e93b55bc4be9ec19bc3272554d8fe2938da Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Fri, 15 Mar 2013 12:43:39 +0530
Subject: [PATCH 14/57] [IMP] account: added classes to set marginn & get label
 bold

bzr revid: cha@tinyerp.com-20130315071339-wu5yz4t8pax9ijlk
---
 addons/account/account_view.xml                          | 8 ++++----
 .../static/src/css/account_move_reconciliation.css       | 9 +++++++++
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index ee74915ac9a..9df17305287 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2349,16 +2349,16 @@
                     <group>
                         <group class="oe_subtotal_footer oe_right">
                             <field name="balance_start" readonly="1" string="Opening Balance" class="oe_subtotal_footer_separator" widget="monetary" options="{'currency_field': 'currency'}"/>
-                            <label for="total_entry_encoding" string="+ Transactions" style="font-weight:bold;"/>
+                            <label for="total_entry_encoding" string="+ Transactions" class="oe_bold oe_account_opening_total"/>
                             <field name="total_entry_encoding" nolabel="1" class="oe_bold" widget="monetary" options="{'currency_field': 'currency'}"/>
-                            <label for="balance_end" string="= Computed Balance" style="font-weight:bold;"/>
+                            <label for="balance_end" string="= Computed Balance" class="oe_force_bold oe_account_opening_total"/>
                             <field name="balance_end" nolabel="1" class="oe_bold" widget="monetary" options="{'currency_field': 'currency'}"/>
                         </group>
                         <div>
                             <group class="oe_subtotal_footer oe_right" attrs="{'invisible' : [('state', '=', 'draft')]}">
                                 <field name="balance_end_real" readonly="1" class="oe_subtotal_footer_separator" widget="monetary" options="{'currency_field': 'currency'}"/>
-                                <label for="difference" style="font-weight:bold;"/>
-                                <field name="difference" nolabel="1" class="oe_bold" widget="monetary" options="{'currency_field': 'currency'}"/>
+                                <label for="difference" class="oe_force_bold oe_account_ening_total"/>
+                                <field name="difference" nolabel="1" class="oe_bold"  widget="monetary" options="{'currency_field': 'currency'}"/>
                             </group>    
                         </div>
                     </group>
diff --git a/addons/account/static/src/css/account_move_reconciliation.css b/addons/account/static/src/css/account_move_reconciliation.css
index 2b407226905..43241461a16 100644
--- a/addons/account/static/src/css/account_move_reconciliation.css
+++ b/addons/account/static/src/css/account_move_reconciliation.css
@@ -16,4 +16,13 @@
 .openerp .oe_account_reconciliation>div>div {
     display: table-cell;
     width: 50%:
+}
+.openerp .oe_force_bold {
+  font-weight: bold !important;
+}
+.openerp .oe_account_opening_total {
+  margin-right: -14px;
+}
+.openerp .oe_account_ening_total {
+  margin-right: -2px;
 }
\ No newline at end of file

From bcd4ee5cd2f6050ed776d06b8b14372aedfa4ceb Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Fri, 15 Mar 2013 13:01:31 +0530
Subject: [PATCH 15/57] [IMP] account: added class 'oe_account_total' to get
 total in align

bzr revid: cha@tinyerp.com-20130315073131-eltl1141mtxspokd
---
 addons/account/account_view.xml                             | 6 +++---
 .../account/static/src/css/account_move_reconciliation.css  | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 9df17305287..017db65f79c 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2350,15 +2350,15 @@
                         <group class="oe_subtotal_footer oe_right">
                             <field name="balance_start" readonly="1" string="Opening Balance" class="oe_subtotal_footer_separator" widget="monetary" options="{'currency_field': 'currency'}"/>
                             <label for="total_entry_encoding" string="+ Transactions" class="oe_bold oe_account_opening_total"/>
-                            <field name="total_entry_encoding" nolabel="1" class="oe_bold" widget="monetary" options="{'currency_field': 'currency'}"/>
+                            <field name="total_entry_encoding" nolabel="1" class="oe_bold oe_account_total" widget="monetary" options="{'currency_field': 'currency'}"/>
                             <label for="balance_end" string="= Computed Balance" class="oe_force_bold oe_account_opening_total"/>
-                            <field name="balance_end" nolabel="1" class="oe_bold" widget="monetary" options="{'currency_field': 'currency'}"/>
+                            <field name="balance_end" nolabel="1" class="oe_bold oe_account_total" widget="monetary" options="{'currency_field': 'currency'}"/>
                         </group>
                         <div>
                             <group class="oe_subtotal_footer oe_right" attrs="{'invisible' : [('state', '=', 'draft')]}">
                                 <field name="balance_end_real" readonly="1" class="oe_subtotal_footer_separator" widget="monetary" options="{'currency_field': 'currency'}"/>
                                 <label for="difference" class="oe_force_bold oe_account_ening_total"/>
-                                <field name="difference" nolabel="1" class="oe_bold"  widget="monetary" options="{'currency_field': 'currency'}"/>
+                                <field name="difference" nolabel="1" class="oe_bold oe_account_total"  widget="monetary" options="{'currency_field': 'currency'}"/>
                             </group>    
                         </div>
                     </group>
diff --git a/addons/account/static/src/css/account_move_reconciliation.css b/addons/account/static/src/css/account_move_reconciliation.css
index 43241461a16..cff77c0a2ee 100644
--- a/addons/account/static/src/css/account_move_reconciliation.css
+++ b/addons/account/static/src/css/account_move_reconciliation.css
@@ -25,4 +25,7 @@
 }
 .openerp .oe_account_ening_total {
   margin-right: -2px;
+}
+.openerp .oe_account_total {
+  margin-left: -2px;
 }
\ No newline at end of file

From 0a7683d39f07bd3c7204b2b53417ca736adbc94e Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Fri, 15 Mar 2013 15:24:54 +0530
Subject: [PATCH 16/57] [IMP] account, pos: added string 'Closing Balance' to
 fields 'balance_end_real' & 'cash_register_balance_end_real'

bzr revid: cha@tinyerp.com-20130315095454-ljh2bjd1brds80m5
---
 addons/account/account_view.xml             | 2 +-
 addons/point_of_sale/point_of_sale_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 017db65f79c..eed0ad0865d 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2356,7 +2356,7 @@
                         </group>
                         <div>
                             <group class="oe_subtotal_footer oe_right" attrs="{'invisible' : [('state', '=', 'draft')]}">
-                                <field name="balance_end_real" readonly="1" class="oe_subtotal_footer_separator" widget="monetary" options="{'currency_field': 'currency'}"/>
+                                <field name="balance_end_real" readonly="1" string="Closing Balance" class="oe_subtotal_footer_separator" widget="monetary" options="{'currency_field': 'currency'}"/>
                                 <label for="difference" class="oe_force_bold oe_account_ening_total"/>
                                 <field name="difference" nolabel="1" class="oe_bold oe_account_total"  widget="monetary" options="{'currency_field': 'currency'}"/>
                             </group>    
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 8b2232ed472..e6e96f1aa14 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -938,7 +938,7 @@
 
 
                             <group class="oe_subtotal_footer oe_right" attrs="{'invisible': ['|', ('cash_control', '=', False), ('state', '=', 'opening_control')]}">
-                                <field name="cash_register_balance_end_real" class="oe_subtotal_footer_separator"/>
+                                <field name="cash_register_balance_end_real" string="Closing Balance" class="oe_subtotal_footer_separator"/>
                                 <field name="cash_register_difference"  class="oe_subtotal_footer_separator"/>
                             </group>
                         </group>

From 9bcf832d71b03c85fe08376e107969ab2a6dd4ea Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Fri, 15 Mar 2013 15:38:04 +0530
Subject: [PATCH 17/57] [IMP] account, pos: added tooltip to field
 'balance_end_real' & made other little change

bzr revid: cha@tinyerp.com-20130315100804-9jzt9fgz430gwof9
---
 addons/account/account_bank_statement.py | 2 +-
 addons/account/account_cash_statement.py | 2 +-
 addons/point_of_sale/point_of_sale.py    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 7a620c5065e..4968fa939c7 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -106,7 +106,7 @@ class account_bank_statement(osv.osv):
         'balance_start': fields.float('Starting Balance', digits_compute=dp.get_precision('Account'),
             states={'confirm':[('readonly',True)]}),
         'balance_end_real': fields.float('Ending Balance', digits_compute=dp.get_precision('Account'),
-            states={'confirm': [('readonly', True)]}),
+            states={'confirm': [('readonly', True)]}, help="Computed using the cash control lines"),
         'balance_end': fields.function(_end_balance,
             store = {
                 'account.bank.statement': (lambda self, cr, uid, ids, c={}: ids, ['line_ids','move_line_ids','balance_start'], 10),
diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py
index 93deb96c7c4..c3d2748f1a3 100644
--- a/addons/account/account_cash_statement.py
+++ b/addons/account/account_cash_statement.py
@@ -179,7 +179,7 @@ class account_cash_statement(osv.osv):
         'opening_details_ids' : fields.one2many('account.cashbox.line', 'bank_statement_id', string='Opening Cashbox Lines'),
         'closing_details_ids' : fields.one2many('account.cashbox.line', 'bank_statement_id', string='Closing Cashbox Lines'),
         'user_id': fields.many2one('res.users', 'Responsible', required=False),
-        'difference' : fields.function(_compute_difference, method=True, string="Difference", type="float", help="Difference between the counted cash control at the closing and the ending balance."),
+        'difference' : fields.function(_compute_difference, method=True, string="Difference", type="float", help="Difference between the counted cash control at the closing and the closing balance."),
         'last_closing_balance' : fields.function(_compute_last_closing_balance, method=True, string='Last Closing Balance', type='float'),
     }
     _defaults = {
diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index a7df9a60173..8627ff4bb99 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -242,7 +242,7 @@ class pos_session(osv.osv):
         'cash_register_difference' : fields.related('cash_register_id', 'difference',
                 type='float',
                 string='Difference',
-                help="Difference between the counted cash control at the closing and the ending balance.",
+                help="Difference between the counted cash control at the closing and the closing balance.",
                 readonly=True),
 
         'journal_ids' : fields.related('config_id', 'journal_ids',

From b9cd6db6bcb65efce4f1a40012c9f599a657df2b Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Fri, 15 Mar 2013 16:38:51 +0530
Subject: [PATCH 18/57] [IMP] account: once again change css to match alignment
 of difference

bzr revid: cha@tinyerp.com-20130315110851-1i8uufaj9avti7iq
---
 addons/account/static/src/css/account_move_reconciliation.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/static/src/css/account_move_reconciliation.css b/addons/account/static/src/css/account_move_reconciliation.css
index cff77c0a2ee..12edf8f3060 100644
--- a/addons/account/static/src/css/account_move_reconciliation.css
+++ b/addons/account/static/src/css/account_move_reconciliation.css
@@ -24,7 +24,7 @@
   margin-right: -14px;
 }
 .openerp .oe_account_ening_total {
-  margin-right: -2px;
+  margin-right: -7px;
 }
 .openerp .oe_account_total {
   margin-left: -2px;

From d3b14e953abd86593d201bf6d21f0fa95c11bb78 Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Mon, 18 Mar 2013 14:15:47 +0530
Subject: [PATCH 19/57] [IMP] POS: added field currency_id to have currency
 symbol at pos total

bzr revid: cha@tinyerp.com-20130318084547-42fwyv84jqqfi03h
---
 addons/point_of_sale/point_of_sale.py       | 16 +++++++++++++++-
 addons/point_of_sale/point_of_sale_view.xml | 12 +++++++-----
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index 8627ff4bb99..c0043eaf496 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -45,6 +45,18 @@ class pos_config(osv.osv):
         ('deprecated', 'Deprecated')
     ]
 
+    def _get_currency(self, cr, uid, ids, fieldnames, args, context=None):
+         result = {}
+         currency_id = False
+         user = self.pool.get('res.users')
+         for pos_config in self.browse(cr, uid, ids, context=context):
+             if pos_config.journal_id:
+                 currency_id = pos_config.journal_id.currency.id or pos_config.journal_id.company_id.currency_id.id
+             else:
+                 currency_id = user.browse(cr, uid, pos_config.id, context=context).company_id.currency_id.id
+             result[pos_config.id] = currency_id
+         return result
+
     _columns = {
         'name' : fields.char('Point of Sale Name', size=32, select=1,
              required=True, help="An internal identification of the point of sale"),
@@ -56,6 +68,7 @@ class pos_config(osv.osv):
         'journal_id' : fields.many2one('account.journal', 'Sale Journal',
              domain=[('type', '=', 'sale')],
              help="Accounting journal used to post sales entries."),
+        'currency_id' : fields.function(_get_currency, type="many2one", string="Currency", relation="res.currency"),
         'iface_self_checkout' : fields.boolean('Self Checkout Mode',
              help="Check this if this point of sale should open by default in a self checkout mode. If unchecked, OpenERP uses the normal cashier mode by default."),
         'iface_cashdrawer' : fields.boolean('Cashdrawer Interface'),
@@ -198,7 +211,8 @@ class pos_session(osv.osv):
         'state' : fields.selection(POS_SESSION_STATE, 'Status',
                 required=True, readonly=True,
                 select=1),
-
+        
+        'currency_id' : fields.related('config_id', 'currency_id', type="many2one", relation='res.currency', string="Currnecy"),
         'cash_control' : fields.function(_compute_cash_all,
                                          multi='cash',
                                          type='boolean', string='Has Cash Control'),
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index e6e96f1aa14..c970f8b5870 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -772,6 +772,7 @@
                         <group>
                         <field name="name"/>
                         <field name="shop_id" widget="selection" groups="stock.group_locations" />
+                        <field name="currency_id"/>
                         <field name="journal_id" widget="selection" />
                         <field name="sequence_id" readonly="1" groups="base.group_no_one" />
                         <field name="group_by" groups="account.group_account_user"  />
@@ -894,6 +895,7 @@
                             <field name="cash_control" invisible="1" />
                             <group>
                                 <field name="user_id"/>
+                                <field name="currency_id"/>
                                 <field name="config_id"/>
                             </group>
                             <group>
@@ -922,9 +924,9 @@
 
                             <div attrs="{'invisible' : [('cash_control', '=', False)]}">
                                 <group class="oe_subtotal_footer oe_right">
-                                    <field name="cash_register_balance_start" readonly="1" string="Opening Balance" class="oe_subtotal_footer_separator"/>
-                                    <field name="cash_register_total_entry_encoding"  attrs="{'invisible' : [('state', '=', 'opening_control')]}" string="+ Transactions"/>
-                                    <field name="cash_register_balance_end" attrs="{'invisible' : [('state', '=', 'opening_control')]}" string="= Computed Balance"/>
+                                    <field name="cash_register_balance_start" readonly="1" string="Opening Balance" class="oe_subtotal_footer_separator" widget="monetary" options="{'currency_field': 'currency_id'}"/>
+                                    <field name="cash_register_total_entry_encoding"  attrs="{'invisible' : [('state', '=', 'opening_control')]}" string="+ Transactions" widget="monetary" options="{'currency_field': 'currency_id'}"/>
+                                    <field name="cash_register_balance_end" attrs="{'invisible' : [('state', '=', 'opening_control')]}" string="= Computed Balance" widget="monetary" options="{'currency_field': 'currency_id'}"/>
                                 </group>
                                 <div class="oe_clear"/>
                                 <div attrs="{'invisible' : ['|', ('cash_journal_id', '=', False), ('state', '!=', 'opening_control')]}" class="oe_view_nocontent" groups="point_of_sale.group_pos_manager">
@@ -938,8 +940,8 @@
 
 
                             <group class="oe_subtotal_footer oe_right" attrs="{'invisible': ['|', ('cash_control', '=', False), ('state', '=', 'opening_control')]}">
-                                <field name="cash_register_balance_end_real" string="Closing Balance" class="oe_subtotal_footer_separator"/>
-                                <field name="cash_register_difference"  class="oe_subtotal_footer_separator"/>
+                                <field name="cash_register_balance_end_real" string="Closing Balance" class="oe_subtotal_footer_separator" widget="monetary" options="{'currency_field': 'currency_id'}"/>
+                                <field name="cash_register_difference"  class="oe_subtotal_footer_separator" widget="monetary" options="{'currency_field': 'currency_id'}"/>
                             </group>
                         </group>
 

From 3c9a40ff84ef5b80bd8dd7fc4d1111ef0246d2b5 Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Mon, 18 Mar 2013 14:37:47 +0530
Subject: [PATCH 20/57] [IMP] POS: made currency_id field invisible

bzr revid: cha@tinyerp.com-20130318090747-4413l0il1pk7slww
---
 addons/point_of_sale/point_of_sale.py       | 2 +-
 addons/point_of_sale/point_of_sale_view.xml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index c0043eaf496..19cace48d4d 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -205,6 +205,7 @@ class pos_session(osv.osv):
                                     readonly=True,
                                     states={'opening_control' : [('readonly', False)]}
                                    ),
+        'currency_id' : fields.related('config_id', 'currency_id', type="many2one", relation='res.currency', string="Currnecy"),
         'start_at' : fields.datetime('Opening Date', readonly=True), 
         'stop_at' : fields.datetime('Closing Date', readonly=True),
 
@@ -212,7 +213,6 @@ class pos_session(osv.osv):
                 required=True, readonly=True,
                 select=1),
         
-        'currency_id' : fields.related('config_id', 'currency_id', type="many2one", relation='res.currency', string="Currnecy"),
         'cash_control' : fields.function(_compute_cash_all,
                                          multi='cash',
                                          type='boolean', string='Has Cash Control'),
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index c970f8b5870..22ee6abf5a3 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -772,7 +772,7 @@
                         <group>
                         <field name="name"/>
                         <field name="shop_id" widget="selection" groups="stock.group_locations" />
-                        <field name="currency_id"/>
+                        <field name="currency_id" invisible="1"/>
                         <field name="journal_id" widget="selection" />
                         <field name="sequence_id" readonly="1" groups="base.group_no_one" />
                         <field name="group_by" groups="account.group_account_user"  />
@@ -895,7 +895,7 @@
                             <field name="cash_control" invisible="1" />
                             <group>
                                 <field name="user_id"/>
-                                <field name="currency_id"/>
+                                <field name="currency_id" invisible="1"/>
                                 <field name="config_id"/>
                             </group>
                             <group>

From cbc2fc05c8ce64eb5e14cbf8f3058af478034073 Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Mon, 18 Mar 2013 15:29:52 +0530
Subject: [PATCH 21/57] [IMP] POS: made changes to have POS total well aligned

bzr revid: cha@tinyerp.com-20130318095952-wynm8qf0nmuq7uc5
---
 addons/point_of_sale/point_of_sale_view.xml |  9 ++++++---
 addons/point_of_sale/static/src/css/pos.css | 12 ++++++++++++
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 22ee6abf5a3..db113738620 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -925,8 +925,10 @@
                             <div attrs="{'invisible' : [('cash_control', '=', False)]}">
                                 <group class="oe_subtotal_footer oe_right">
                                     <field name="cash_register_balance_start" readonly="1" string="Opening Balance" class="oe_subtotal_footer_separator" widget="monetary" options="{'currency_field': 'currency_id'}"/>
-                                    <field name="cash_register_total_entry_encoding"  attrs="{'invisible' : [('state', '=', 'opening_control')]}" string="+ Transactions" widget="monetary" options="{'currency_field': 'currency_id'}"/>
-                                    <field name="cash_register_balance_end" attrs="{'invisible' : [('state', '=', 'opening_control')]}" string="= Computed Balance" widget="monetary" options="{'currency_field': 'currency_id'}"/>
+                                    <label for="cash_register_total_entry_encoding" attrs="{'invisible' : [('state', '=', 'opening_control')]}" string="+ Transactions" class="oe_bold oe_pos_opening_total"/>
+                                    <field name="cash_register_total_entry_encoding" nolabel="1" attrs="{'invisible' : [('state', '=', 'opening_control')]}" class="oe_bold oe_pos_total" widget="monetary" options="{'currency_field': 'currency_id'}"/>
+                                    <label for="cash_register_balance_end" attrs="{'invisible' : [('state', '=', 'opening_control')]}" string="= Computed Balance" class="oe_force_bold oe_pos_opening_total"/>
+                                    <field name="cash_register_balance_end" nolabel="1" attrs="{'invisible' : [('state', '=', 'opening_control')]}" class="oe_bold oe_pos_total" widget="monetary" options="{'currency_field': 'currency_id'}"/>
                                 </group>
                                 <div class="oe_clear"/>
                                 <div attrs="{'invisible' : ['|', ('cash_journal_id', '=', False), ('state', '!=', 'opening_control')]}" class="oe_view_nocontent" groups="point_of_sale.group_pos_manager">
@@ -941,7 +943,8 @@
 
                             <group class="oe_subtotal_footer oe_right" attrs="{'invisible': ['|', ('cash_control', '=', False), ('state', '=', 'opening_control')]}">
                                 <field name="cash_register_balance_end_real" string="Closing Balance" class="oe_subtotal_footer_separator" widget="monetary" options="{'currency_field': 'currency_id'}"/>
-                                <field name="cash_register_difference"  class="oe_subtotal_footer_separator" widget="monetary" options="{'currency_field': 'currency_id'}"/>
+                                <label for="cash_register_difference" class="oe_force_bold oe_pos_ening_total"/>
+                                <field name="cash_register_difference"  nolabel="1" class="oe_bold oe_pos_total" widget="monetary" options="{'currency_field': 'currency_id'}"/>
                             </group>
                         </group>
 
diff --git a/addons/point_of_sale/static/src/css/pos.css b/addons/point_of_sale/static/src/css/pos.css
index d9a4d6d00a9..847e4799e97 100644
--- a/addons/point_of_sale/static/src/css/pos.css
+++ b/addons/point_of_sale/static/src/css/pos.css
@@ -1431,3 +1431,15 @@
     box-shadow: 0px 3px 38px rgba(0,0,0,0.3);
     border-radius: 3px;
 }
+.openerp .oe_force_bold {
+  font-weight: bold !important;
+}
+.openerp .oe_pos_opening_total {
+  margin-right: -14px;
+}
+.openerp .oe_pos_ening_total {
+  margin-right: -7px;
+}
+.openerp .oe_pos_total {
+  margin-left: -2px;
+}
\ No newline at end of file

From c5f6bba3e8c8c6737ae26d639657504ee895142c Mon Sep 17 00:00:00 2001
From: Tejas Tank <tta@openerp.com>
Date: Thu, 21 Mar 2013 15:48:28 +0530
Subject: [PATCH 22/57] [IMP] Update tooltips for point of sale.

bzr revid: tta@openerp.com-20130321101828-w4ja2itf4eiqty4l
---
 addons/point_of_sale/point_of_sale.py       | 6 +++---
 addons/point_of_sale/point_of_sale_view.xml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index 326a92806f6..db0aeaaf8a8 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -222,7 +222,7 @@ class pos_session(osv.osv):
                 type='float',
                 digits_compute=dp.get_precision('Account'),
                 string="Ending Balance",
-                help="Computed using the cash control lines",
+                help="Total of ending cash control line",
                 readonly=True),
         'cash_register_balance_start' : fields.related('cash_register_id', 'balance_start',
                 type='float',
@@ -237,12 +237,12 @@ class pos_session(osv.osv):
                 type='float',
                 digits_compute=dp.get_precision('Account'),
                 string="Computed Balance",
-                help="Computed with the initial cash control and the sum of all payments.",
+                help="Sum of opening cash control total and the total of transactions.",
                 readonly=True),
         'cash_register_difference' : fields.related('cash_register_id', 'difference',
                 type='float',
                 string='Difference',
-                help="Difference between the counted cash control at the closing and the closing balance.",
+                help="Difference between the closing cash control and the theorical balance.",
                 readonly=True),
 
         'journal_ids' : fields.related('config_id', 'journal_ids',
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index e6e96f1aa14..19bf3cf2b0c 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -924,7 +924,7 @@
                                 <group class="oe_subtotal_footer oe_right">
                                     <field name="cash_register_balance_start" readonly="1" string="Opening Balance" class="oe_subtotal_footer_separator"/>
                                     <field name="cash_register_total_entry_encoding"  attrs="{'invisible' : [('state', '=', 'opening_control')]}" string="+ Transactions"/>
-                                    <field name="cash_register_balance_end" attrs="{'invisible' : [('state', '=', 'opening_control')]}" string="= Computed Balance"/>
+                                    <field name="cash_register_balance_end" attrs="{'invisible' : [('state', '=', 'opening_control')]}" string="= Theoretical Balance"/>
                                 </group>
                                 <div class="oe_clear"/>
                                 <div attrs="{'invisible' : ['|', ('cash_journal_id', '=', False), ('state', '!=', 'opening_control')]}" class="oe_view_nocontent" groups="point_of_sale.group_pos_manager">

From 3cc6916ec1cfa0e473620a7929f31cd49632e970 Mon Sep 17 00:00:00 2001
From: Tejas Tank <tta@openerp.com>
Date: Fri, 22 Mar 2013 16:22:09 +0530
Subject: [PATCH 23/57] [FIX] Cash Journal: When user change the journal,
 updated the relavent cash box currency units.

bzr revid: tta@openerp.com-20130322105209-uemdljwl42rql89h
---
 addons/account/account_cash_statement.py | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py
index c3d2748f1a3..6520ad0ec8a 100644
--- a/addons/account/account_cash_statement.py
+++ b/addons/account/account_cash_statement.py
@@ -149,23 +149,20 @@ class account_cash_statement(osv.osv):
 
     def onchange_journal_id(self, cr, uid, ids, journal_id, context=None):
         result = super(account_cash_statement, self).onchange_journal_id(cr, uid, ids, journal_id)
-
         if not journal_id:
             return result
-
+        result['value']['opening_details_ids'] = self._get_cash_open_box_lines(cr, uid, journal_id, context)
         statement_ids = self.search(cr, uid,
                 [('journal_id', '=', journal_id),('state', '=', 'confirm')],
                 order='create_date desc',
                 limit=1,
                 context=context
         )
-
         if not statement_ids:
             return result
 
         st = self.browse(cr, uid, statement_ids[0], context=context)
         result.setdefault('value', {}).update({'last_closing_balance' : st.balance_end_real})
-
         return result
 
     _columns = {
@@ -188,15 +185,11 @@ class account_cash_statement(osv.osv):
         'user_id': lambda self, cr, uid, context=None: uid,
     }
 
-    def create(self, cr, uid, vals, context=None):
-        journal = False
-        if vals.get('journal_id'):
-            journal = self.pool.get('account.journal').browse(cr, uid, vals['journal_id'], context=context)
-        if journal and (journal.type == 'cash') and not vals.get('details_ids'):
-            vals['details_ids'] = []
-
+    def _get_cash_open_box_lines(self, cr, uid, journa_id, context):
+        details_ids = []
+        journal = self.pool.get('account.journal').browse(cr, uid, journa_id, context=context)
+        if journal and (journal.type == 'cash'):
             last_pieces = None
-
             if journal.with_last_closing_balance == True:
                 domain = [('journal_id', '=', journal.id),
                           ('state', '=', 'confirm')]
@@ -207,16 +200,17 @@ class account_cash_statement(osv.osv):
                     last_pieces = dict(
                         (line.pieces, line.number_closing) for line in last_bank_statement.details_ids
                     )
-
             for value in journal.cashbox_line_ids:
                 nested_values = {
                     'number_closing' : 0,
                     'number_opening' : last_pieces.get(value.pieces, 0) if isinstance(last_pieces, dict) else 0,
                     'pieces' : value.pieces
                 }
+                details_ids.append([0, False, nested_values])
+                
+        return details_ids
 
-                vals['details_ids'].append([0, False, nested_values])
-
+    def create(self, cr, uid, vals, context=None):
         res_id = super(account_cash_statement, self).create(cr, uid, vals, context=context)
         self._update_balances(cr, uid, [res_id], context)
         return res_id

From c9d79bc1efd0b2505bc94571ff4fbbd75f2ec8fb Mon Sep 17 00:00:00 2001
From: Tejas Tank <tta@openerp.com>
Date: Mon, 25 Mar 2013 12:03:22 +0530
Subject: [PATCH 24/57] [IMP] account.cash.statement: onchange of journal_id,
 cashbox will be reflected as per journal.

bzr revid: tta@openerp.com-20130325063322-57r9edxi0l4mx74j
---
 addons/account/account_cash_statement.py | 35 ++++++++++++------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py
index 6520ad0ec8a..95e7e0581cb 100644
--- a/addons/account/account_cash_statement.py
+++ b/addons/account/account_cash_statement.py
@@ -148,21 +148,19 @@ class account_cash_statement(osv.osv):
         return result
 
     def onchange_journal_id(self, cr, uid, ids, journal_id, context=None):
-        result = super(account_cash_statement, self).onchange_journal_id(cr, uid, ids, journal_id)
-        if not journal_id:
-            return result
-        result['value']['opening_details_ids'] = self._get_cash_open_box_lines(cr, uid, journal_id, context)
-        statement_ids = self.search(cr, uid,
-                [('journal_id', '=', journal_id),('state', '=', 'confirm')],
-                order='create_date desc',
-                limit=1,
-                context=context
-        )
-        if not statement_ids:
-            return result
-
-        st = self.browse(cr, uid, statement_ids[0], context=context)
-        result.setdefault('value', {}).update({'last_closing_balance' : st.balance_end_real})
+        result = {}
+        if journal_id:
+            result = super(account_cash_statement, self).onchange_journal_id(cr, uid, ids, journal_id)
+            statement_ids = self.search(cr, uid,
+                    [('journal_id', '=', journal_id),('state', '=', 'confirm')],
+                    order='create_date desc',
+                    limit=1,
+                    context=context
+            )
+            if statement_ids:
+                st = self.browse(cr, uid, statement_ids[0], context=context)
+                result.setdefault('value', {}).update({'last_closing_balance' : st.balance_end_real})
+            result['value']['opening_details_ids'] = self._get_cash_open_box_lines(cr, uid, ids, journal_id, context)
         return result
 
     _columns = {
@@ -185,7 +183,7 @@ class account_cash_statement(osv.osv):
         'user_id': lambda self, cr, uid, context=None: uid,
     }
 
-    def _get_cash_open_box_lines(self, cr, uid, journa_id, context):
+    def _get_cash_open_box_lines(self, cr, uid, ids, journa_id, context):
         details_ids = []
         journal = self.pool.get('account.journal').browse(cr, uid, journa_id, context=context)
         if journal and (journal.type == 'cash'):
@@ -228,7 +226,10 @@ class account_cash_statement(osv.osv):
 
         @return: True on success, False otherwise
         """
-
+        cashbox_pool = self.pool.get('account.cashbox.line')
+        if vals.get('journal_id', False):
+            cashbox_ids = cashbox_pool.search(cr, uid, [('bank_statement_id', 'in', ids)], context=context)
+            cashbox_pool.unlink(cr, uid, cashbox_ids, context)            
         res = super(account_cash_statement, self).write(cr, uid, ids, vals, context=context)
         self._update_balances(cr, uid, ids, context)
         return res

From 52cb6ad46f2c643e854d38ae4bcb3e071d854d63 Mon Sep 17 00:00:00 2001
From: Tejas Tank <tta@openerp.com>
Date: Mon, 25 Mar 2013 16:38:36 +0530
Subject: [PATCH 25/57] [FIX] account.cash.statement: code correct, it
 successful pass the yml test cases.

bzr revid: tta@openerp.com-20130325110836-zfqi4nm0q90zivge
---
 addons/account/account_cash_statement.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py
index 95e7e0581cb..702dd94c04d 100644
--- a/addons/account/account_cash_statement.py
+++ b/addons/account/account_cash_statement.py
@@ -160,7 +160,9 @@ class account_cash_statement(osv.osv):
             if statement_ids:
                 st = self.browse(cr, uid, statement_ids[0], context=context)
                 result.setdefault('value', {}).update({'last_closing_balance' : st.balance_end_real})
-            result['value']['opening_details_ids'] = self._get_cash_open_box_lines(cr, uid, ids, journal_id, context)
+        opening_details_ids = self._get_cash_open_box_lines(cr, uid, ids, journal_id, context)
+        if opening_details_ids:
+            result['value']['opening_details_ids'] = opening_details_ids
         return result
 
     _columns = {

From 69b38773d40af96542db56f851b110496221fd75 Mon Sep 17 00:00:00 2001
From: Tejas Tank <tta@openerp.com>
Date: Mon, 1 Apr 2013 12:38:55 +0530
Subject: [PATCH 26/57] [FIX] code corrected, if journal_id not set then return
 empty details_ids.

bzr revid: tta@openerp.com-20130401070855-i4jbe8qsu9z9b5md
---
 addons/account/account_cash_statement.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py
index 702dd94c04d..85f32e02198 100644
--- a/addons/account/account_cash_statement.py
+++ b/addons/account/account_cash_statement.py
@@ -187,6 +187,8 @@ class account_cash_statement(osv.osv):
 
     def _get_cash_open_box_lines(self, cr, uid, ids, journa_id, context):
         details_ids = []
+        if not journa_id:
+            return details_ids
         journal = self.pool.get('account.journal').browse(cr, uid, journa_id, context=context)
         if journal and (journal.type == 'cash'):
             last_pieces = None

From 3f6526d1f0891845cc3986438fa9cb2f2c6e53a8 Mon Sep 17 00:00:00 2001
From: Tejas Tank <tta@openerp.com>
Date: Mon, 1 Apr 2013 15:55:12 +0530
Subject: [PATCH 27/57] [IMP] Code corrected and pos.session, Opening Cashbox
 filled up for currencies.

bzr revid: tta@openerp.com-20130401102512-52tdz9n8zlit4291
---
 addons/account/account_cash_statement.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py
index 85f32e02198..82423598057 100644
--- a/addons/account/account_cash_statement.py
+++ b/addons/account/account_cash_statement.py
@@ -160,7 +160,7 @@ class account_cash_statement(osv.osv):
             if statement_ids:
                 st = self.browse(cr, uid, statement_ids[0], context=context)
                 result.setdefault('value', {}).update({'last_closing_balance' : st.balance_end_real})
-        opening_details_ids = self._get_cash_open_box_lines(cr, uid, ids, journal_id, context)
+        opening_details_ids = self._get_cash_open_box_lines(cr, uid, journal_id, context)
         if opening_details_ids:
             result['value']['opening_details_ids'] = opening_details_ids
         return result
@@ -185,11 +185,11 @@ class account_cash_statement(osv.osv):
         'user_id': lambda self, cr, uid, context=None: uid,
     }
 
-    def _get_cash_open_box_lines(self, cr, uid, ids, journa_id, context):
+    def _get_cash_open_box_lines(self, cr, uid, journal_id, context):
         details_ids = []
-        if not journa_id:
+        if not journal_id:
             return details_ids
-        journal = self.pool.get('account.journal').browse(cr, uid, journa_id, context=context)
+        journal = self.pool.get('account.journal').browse(cr, uid, journal_id, context=context)
         if journal and (journal.type == 'cash'):
             last_pieces = None
             if journal.with_last_closing_balance == True:
@@ -213,6 +213,9 @@ class account_cash_statement(osv.osv):
         return details_ids
 
     def create(self, cr, uid, vals, context=None):
+        journal_id = vals.get('journal_id',False)
+        if journal_id:
+            vals['opening_details_ids'] = vals.get('opening_details_ids',False) or self._get_cash_open_box_lines(cr, uid, journal_id, context)
         res_id = super(account_cash_statement, self).create(cr, uid, vals, context=context)
         self._update_balances(cr, uid, [res_id], context)
         return res_id

From 14e4841c83fd786a3f4b27abbf41274e0322320c Mon Sep 17 00:00:00 2001
From: Tejas Tank <tta@openerp.com>
Date: Mon, 1 Apr 2013 16:09:29 +0530
Subject: [PATCH 28/57] [IMP] pos.session:Corrected tooltip for
 cash_register_difference field.

bzr revid: tta@openerp.com-20130401103929-tdpsfl7w8akhh4d8
---
 addons/point_of_sale/point_of_sale.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index aab81fe1b55..2688c19cf33 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -242,7 +242,7 @@ class pos_session(osv.osv):
         'cash_register_difference' : fields.related('cash_register_id', 'difference',
                 type='float',
                 string='Difference',
-                help="Difference between the closing cash control and the theorical balance.",
+                help="Difference between the closing cash control and the theoretical balance.",
                 readonly=True),
 
         'journal_ids' : fields.related('config_id', 'journal_ids',

From 76b7a082750cd5ec68fb024c85ca8d63919f8644 Mon Sep 17 00:00:00 2001
From: Tejas Tank <tta@openerp.com>
Date: Fri, 5 Apr 2013 14:54:19 +0530
Subject: [PATCH 29/57] [IMP] pos session and cash register, Improved tooltip
 and layout.

bzr revid: tta@openerp.com-20130405092419-jpa89isevfq6jw49
---
 addons/account/account_cash_statement.py    |  5 +++--
 addons/account/account_view.xml             | 11 +++++------
 addons/point_of_sale/point_of_sale.py       | 11 ++++++-----
 addons/point_of_sale/point_of_sale_view.xml |  5 ++---
 addons/point_of_sale/static/src/css/pos.css | 13 ++++++++-----
 5 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py
index 82423598057..68d170fe290 100644
--- a/addons/account/account_cash_statement.py
+++ b/addons/account/account_cash_statement.py
@@ -170,13 +170,14 @@ class account_cash_statement(osv.osv):
             store = {
                 'account.bank.statement': (lambda self, cr, uid, ids, context=None: ids, ['line_ids','move_line_ids'], 10),
                 'account.bank.statement.line': (_get_statement_from_line, ['amount'], 10),
-            }),
+            },
+            help="Total of cash transaction lines."),
         'closing_date': fields.datetime("Closed On"),
         'details_ids' : fields.one2many('account.cashbox.line', 'bank_statement_id', string='CashBox Lines'),
         'opening_details_ids' : fields.one2many('account.cashbox.line', 'bank_statement_id', string='Opening Cashbox Lines'),
         'closing_details_ids' : fields.one2many('account.cashbox.line', 'bank_statement_id', string='Closing Cashbox Lines'),
         'user_id': fields.many2one('res.users', 'Responsible', required=False),
-        'difference' : fields.function(_compute_difference, method=True, string="Difference", type="float", help="Difference between the counted cash control at the closing and the closing balance."),
+        'difference' : fields.function(_compute_difference, method=True, string="Difference", type="float", help="Difference between the closing balance and computed balance."),
         'last_closing_balance' : fields.function(_compute_last_closing_balance, method=True, string='Last Closing Balance', type='float'),
     }
     _defaults = {
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 1af6460d858..be60e82bb6b 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2350,17 +2350,16 @@
                     </notebook>
                     <group>
                         <group class="oe_subtotal_footer oe_right">
-                            <field name="balance_start" readonly="1" string="Opening Balance" class="oe_subtotal_footer_separator" widget="monetary" options="{'currency_field': 'currency'}"/>
-                            <label for="total_entry_encoding" string="+ Transactions" class="oe_bold oe_account_opening_total"/>
+                            <field name="balance_start" readonly="1" string="Opening Balance" class="oe_subtotal_footer_separator" widget="monetary" options="{'currency_field': 'currency'}" help="Total of opening cash control lines"/>
+                            <label for="total_entry_encoding" string="+ Transactions" class="oe_force_bold oe_account_opening_total"/>
                             <field name="total_entry_encoding" nolabel="1" class="oe_bold oe_account_total" widget="monetary" options="{'currency_field': 'currency'}"/>
                             <label for="balance_end" string="= Computed Balance" class="oe_force_bold oe_account_opening_total"/>
-                            <field name="balance_end" nolabel="1" class="oe_bold oe_account_total" widget="monetary" options="{'currency_field': 'currency'}"/>
+                            <field name="balance_end" nolabel="1" class="oe_bold oe_account_total" widget="monetary" options="{'currency_field': 'currency'}" help="Sum of opening balance and transactions."/>
                         </group>
                         <div>
                             <group class="oe_subtotal_footer oe_right" attrs="{'invisible' : [('state', '=', 'draft')]}">
-                                <field name="balance_end_real" readonly="1" string="Closing Balance" class="oe_subtotal_footer_separator" widget="monetary" options="{'currency_field': 'currency'}"/>
-                                <label for="difference" class="oe_force_bold oe_account_ening_total"/>
-                                <field name="difference" nolabel="1" class="oe_bold oe_account_total"  widget="monetary" options="{'currency_field': 'currency'}"/>
+                                <field name="balance_end_real" readonly="1" string="Closing Balance" class="oe_subtotal_footer_separator" widget="monetary" options="{'currency_field': 'currency'}" help="Total of closing cash control lines."/>
+                                <field name="difference" class="oe_subtotal_footer_separator oe_account_ening_total oe_account_total oe_right"  widget="monetary" options="{'currency_field': 'currency'}"/>
                             </group>    
                         </div>
                     </group>
diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index 4e7e1d0ea84..bf51fdfee1a 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -236,27 +236,28 @@ class pos_session(osv.osv):
                 type='float',
                 digits_compute=dp.get_precision('Account'),
                 string="Ending Balance",
-                help="Total of ending cash control line",
+                help="Total of closing cash control lines.",
                 readonly=True),
         'cash_register_balance_start' : fields.related('cash_register_id', 'balance_start',
                 type='float',
                 digits_compute=dp.get_precision('Account'),
                 string="Starting Balance",
-                help="Computed using the cash control at the opening.",
+                help="Total of opening cash control lines.",
                 readonly=True),
         'cash_register_total_entry_encoding' : fields.related('cash_register_id', 'total_entry_encoding',
                 string='Total Cash Transaction',
-                readonly=True),
+                readonly=True,
+                help="Total of all paid sale orders"),
         'cash_register_balance_end' : fields.related('cash_register_id', 'balance_end',
                 type='float',
                 digits_compute=dp.get_precision('Account'),
                 string="Computed Balance",
-                help="Sum of opening cash control total and the total of transactions.",
+                help="Sum of opening balance and transactions.",
                 readonly=True),
         'cash_register_difference' : fields.related('cash_register_id', 'difference',
                 type='float',
                 string='Difference',
-                help="Difference between the closing cash control and the theoretical balance.",
+                help="Difference between the closing balance and computed balance.",
                 readonly=True),
 
         'journal_ids' : fields.related('config_id', 'journal_ids',
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index db113738620..ae909a1e743 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -925,7 +925,7 @@
                             <div attrs="{'invisible' : [('cash_control', '=', False)]}">
                                 <group class="oe_subtotal_footer oe_right">
                                     <field name="cash_register_balance_start" readonly="1" string="Opening Balance" class="oe_subtotal_footer_separator" widget="monetary" options="{'currency_field': 'currency_id'}"/>
-                                    <label for="cash_register_total_entry_encoding" attrs="{'invisible' : [('state', '=', 'opening_control')]}" string="+ Transactions" class="oe_bold oe_pos_opening_total"/>
+                                    <label for="cash_register_total_entry_encoding" attrs="{'invisible' : [('state', '=', 'opening_control')]}" string="+ Transactions" class="oe_force_bold oe_pos_opening_total"/>
                                     <field name="cash_register_total_entry_encoding" nolabel="1" attrs="{'invisible' : [('state', '=', 'opening_control')]}" class="oe_bold oe_pos_total" widget="monetary" options="{'currency_field': 'currency_id'}"/>
                                     <label for="cash_register_balance_end" attrs="{'invisible' : [('state', '=', 'opening_control')]}" string="= Computed Balance" class="oe_force_bold oe_pos_opening_total"/>
                                     <field name="cash_register_balance_end" nolabel="1" attrs="{'invisible' : [('state', '=', 'opening_control')]}" class="oe_bold oe_pos_total" widget="monetary" options="{'currency_field': 'currency_id'}"/>
@@ -943,8 +943,7 @@
 
                             <group class="oe_subtotal_footer oe_right" attrs="{'invisible': ['|', ('cash_control', '=', False), ('state', '=', 'opening_control')]}">
                                 <field name="cash_register_balance_end_real" string="Closing Balance" class="oe_subtotal_footer_separator" widget="monetary" options="{'currency_field': 'currency_id'}"/>
-                                <label for="cash_register_difference" class="oe_force_bold oe_pos_ening_total"/>
-                                <field name="cash_register_difference"  nolabel="1" class="oe_bold oe_pos_total" widget="monetary" options="{'currency_field': 'currency_id'}"/>
+                                <field name="cash_register_difference" class="oe_subtotal_footer_separator oe_right oe_pos_total oe_pos_difference" widget="monetary" options="{'currency_field': 'currency_id'}"/>
                             </group>
                         </group>
 
diff --git a/addons/point_of_sale/static/src/css/pos.css b/addons/point_of_sale/static/src/css/pos.css
index 847e4799e97..c4a22600a0a 100644
--- a/addons/point_of_sale/static/src/css/pos.css
+++ b/addons/point_of_sale/static/src/css/pos.css
@@ -1431,15 +1431,18 @@
     box-shadow: 0px 3px 38px rgba(0,0,0,0.3);
     border-radius: 3px;
 }
-.openerp .oe_force_bold {
+.openerp .oe_force_bold{
   font-weight: bold !important;
 }
-.openerp .oe_pos_opening_total {
+.openerp .oe_pos_opening_total{
   margin-right: -14px;
 }
-.openerp .oe_pos_ening_total {
+.openerp .oe_pos_ening_total{
   margin-right: -7px;
 }
-.openerp .oe_pos_total {
+.openerp .oe_pos_total{
   margin-left: -2px;
-}
\ No newline at end of file
+}
+.openerp label.oe_pos_difference{
+    margin-right: -11px;
+}

From 8ed830928fc092ff4c68535680c444b70737f225 Mon Sep 17 00:00:00 2001
From: Tejas Tank <tta@openerp.com>
Date: Fri, 5 Apr 2013 16:51:03 +0530
Subject: [PATCH 30/57] [IMP] Corrected css for cash register form layout.

bzr revid: tta@openerp.com-20130405112103-yt66bugf4oyq246e
---
 .../account/static/src/css/account_move_reconciliation.css  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/account/static/src/css/account_move_reconciliation.css b/addons/account/static/src/css/account_move_reconciliation.css
index 12edf8f3060..ff6ec340787 100644
--- a/addons/account/static/src/css/account_move_reconciliation.css
+++ b/addons/account/static/src/css/account_move_reconciliation.css
@@ -23,9 +23,9 @@
 .openerp .oe_account_opening_total {
   margin-right: -14px;
 }
-.openerp .oe_account_ening_total {
-  margin-right: -7px;
+.openerp label.oe_account_ening_total {
+  margin-right: -11px;
 }
 .openerp .oe_account_total {
   margin-left: -2px;
-}
\ No newline at end of file
+}

From b062573df4a1bdda014aaecaed23f0372c08611a Mon Sep 17 00:00:00 2001
From: Tejas Tank <tta@openerp.com>
Date: Tue, 9 Apr 2013 10:17:24 +0530
Subject: [PATCH 31/57] [IMP] pos,cash-register: Corrected tooltips and layout.

bzr revid: tta@openerp.com-20130409044724-1jhnyjhp0ka1ckf6
---
 addons/account/account_cash_statement.py      |  2 +-
 addons/account/account_view.xml               | 12 +++++-----
 .../src/css/account_move_reconciliation.css   | 22 ++++++++++++++-----
 addons/point_of_sale/point_of_sale.py         |  4 ++--
 addons/point_of_sale/point_of_sale_view.xml   |  4 ++--
 addons/point_of_sale/static/src/css/pos.css   | 12 ++++++----
 6 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py
index 68d170fe290..94c9c010d7c 100644
--- a/addons/account/account_cash_statement.py
+++ b/addons/account/account_cash_statement.py
@@ -177,7 +177,7 @@ class account_cash_statement(osv.osv):
         'opening_details_ids' : fields.one2many('account.cashbox.line', 'bank_statement_id', string='Opening Cashbox Lines'),
         'closing_details_ids' : fields.one2many('account.cashbox.line', 'bank_statement_id', string='Closing Cashbox Lines'),
         'user_id': fields.many2one('res.users', 'Responsible', required=False),
-        'difference' : fields.function(_compute_difference, method=True, string="Difference", type="float", help="Difference between the closing balance and computed balance."),
+        'difference' : fields.function(_compute_difference, method=True, string="Difference", type="float", help="Difference between the theoritical closing balance and the real closing balance."),
         'last_closing_balance' : fields.function(_compute_last_closing_balance, method=True, string='Last Closing Balance', type='float'),
     }
     _defaults = {
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index be60e82bb6b..4ed129f6fa5 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2350,16 +2350,16 @@
                     </notebook>
                     <group>
                         <group class="oe_subtotal_footer oe_right">
-                            <field name="balance_start" readonly="1" string="Opening Balance" class="oe_subtotal_footer_separator" widget="monetary" options="{'currency_field': 'currency'}" help="Total of opening cash control lines"/>
-                            <label for="total_entry_encoding" string="+ Transactions" class="oe_force_bold oe_account_opening_total"/>
+                            <field name="balance_start" readonly="1" string="Opening Balance" class="oe_subtotal_footer_separator oe_open_balance" widget="monetary" options="{'currency_field': 'currency'}" help="Total of opening cash control lines"/>
+                            <label for="total_entry_encoding" string="+ Transactions" class="oe_force_bold oe_mini_subtotal_footer_separator"/>
                             <field name="total_entry_encoding" nolabel="1" class="oe_bold oe_account_total" widget="monetary" options="{'currency_field': 'currency'}"/>
-                            <label for="balance_end" string="= Computed Balance" class="oe_force_bold oe_account_opening_total"/>
-                            <field name="balance_end" nolabel="1" class="oe_bold oe_account_total" widget="monetary" options="{'currency_field': 'currency'}" help="Sum of opening balance and transactions."/>
+                            <label for="balance_end" string="= Theoritical Closing Balance" class="oe_force_bold oe_mini_subtotal_footer_separator" help="Sum of opening balance and transactions."/>
+                            <field name="balance_end" nolabel="1" class="oe_bold oe_account_total" widget="monetary" options="{'currency_field': 'currency'}"/>
                         </group>
                         <div>
                             <group class="oe_subtotal_footer oe_right" attrs="{'invisible' : [('state', '=', 'draft')]}">
-                                <field name="balance_end_real" readonly="1" string="Closing Balance" class="oe_subtotal_footer_separator" widget="monetary" options="{'currency_field': 'currency'}" help="Total of closing cash control lines."/>
-                                <field name="difference" class="oe_subtotal_footer_separator oe_account_ening_total oe_account_total oe_right"  widget="monetary" options="{'currency_field': 'currency'}"/>
+                                <field name="balance_end_real" readonly="1" string="Real Closing Balance" class="oe_subtotal_footer_separator oe_real_closing_balance" widget="monetary" options="{'currency_field': 'currency'}" help="Total of closing cash control lines."/>
+                                <field name="difference" class="oe_subtotal_footer_separator oe_difference"  widget="monetary" options="{'currency_field': 'currency'}"/>
                             </group>    
                         </div>
                     </group>
diff --git a/addons/account/static/src/css/account_move_reconciliation.css b/addons/account/static/src/css/account_move_reconciliation.css
index ff6ec340787..b6baa122fe6 100644
--- a/addons/account/static/src/css/account_move_reconciliation.css
+++ b/addons/account/static/src/css/account_move_reconciliation.css
@@ -20,12 +20,24 @@
 .openerp .oe_force_bold {
   font-weight: bold !important;
 }
-.openerp .oe_account_opening_total {
-  margin-right: -14px;
+.openerp label.oe_open_balance{
+    margin-right: -18px;
 }
-.openerp label.oe_account_ening_total {
-  margin-right: -11px;
+.openerp label.oe_subtotal_footer_separator{
+    float:right;
+}
+.openerp label.oe_mini_subtotal_footer_separator{
+    margin-right: -14px;
 }
 .openerp .oe_account_total {
-  margin-left: -2px;
+    margin-left: -2px;
 }
+.openerp label.oe_real_closing_balance{
+    min-width: 184px !important;
+}
+.openerp label.oe_difference {
+    margin-right: -10px;
+    padding-left: 10px !important;
+    min-width: 195px !important;
+}
+
diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index bf51fdfee1a..c735384c6ec 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -251,13 +251,13 @@ class pos_session(osv.osv):
         'cash_register_balance_end' : fields.related('cash_register_id', 'balance_end',
                 type='float',
                 digits_compute=dp.get_precision('Account'),
-                string="Computed Balance",
+                string="Theoritical Closing Balance",
                 help="Sum of opening balance and transactions.",
                 readonly=True),
         'cash_register_difference' : fields.related('cash_register_id', 'difference',
                 type='float',
                 string='Difference',
-                help="Difference between the closing balance and computed balance.",
+                help="Difference between the theoritical closing balance and the real closing balance.",
                 readonly=True),
 
         'journal_ids' : fields.related('config_id', 'journal_ids',
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index ae909a1e743..38bd0068864 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -927,7 +927,7 @@
                                     <field name="cash_register_balance_start" readonly="1" string="Opening Balance" class="oe_subtotal_footer_separator" widget="monetary" options="{'currency_field': 'currency_id'}"/>
                                     <label for="cash_register_total_entry_encoding" attrs="{'invisible' : [('state', '=', 'opening_control')]}" string="+ Transactions" class="oe_force_bold oe_pos_opening_total"/>
                                     <field name="cash_register_total_entry_encoding" nolabel="1" attrs="{'invisible' : [('state', '=', 'opening_control')]}" class="oe_bold oe_pos_total" widget="monetary" options="{'currency_field': 'currency_id'}"/>
-                                    <label for="cash_register_balance_end" attrs="{'invisible' : [('state', '=', 'opening_control')]}" string="= Computed Balance" class="oe_force_bold oe_pos_opening_total"/>
+                                    <label for="cash_register_balance_end" attrs="{'invisible' : [('state', '=', 'opening_control')]}" string="= Theoritical Closing Balance" class="oe_force_bold oe_pos_opening_total"/>
                                     <field name="cash_register_balance_end" nolabel="1" attrs="{'invisible' : [('state', '=', 'opening_control')]}" class="oe_bold oe_pos_total" widget="monetary" options="{'currency_field': 'currency_id'}"/>
                                 </group>
                                 <div class="oe_clear"/>
@@ -942,7 +942,7 @@
 
 
                             <group class="oe_subtotal_footer oe_right" attrs="{'invisible': ['|', ('cash_control', '=', False), ('state', '=', 'opening_control')]}">
-                                <field name="cash_register_balance_end_real" string="Closing Balance" class="oe_subtotal_footer_separator" widget="monetary" options="{'currency_field': 'currency_id'}"/>
+                                <field name="cash_register_balance_end_real" string="Real Closing Balance" class="oe_subtotal_footer_separator" widget="monetary" options="{'currency_field': 'currency_id'}"/>
                                 <field name="cash_register_difference" class="oe_subtotal_footer_separator oe_right oe_pos_total oe_pos_difference" widget="monetary" options="{'currency_field': 'currency_id'}"/>
                             </group>
                         </group>
diff --git a/addons/point_of_sale/static/src/css/pos.css b/addons/point_of_sale/static/src/css/pos.css
index c4a22600a0a..9d193af4ebd 100644
--- a/addons/point_of_sale/static/src/css/pos.css
+++ b/addons/point_of_sale/static/src/css/pos.css
@@ -1435,14 +1435,18 @@
   font-weight: bold !important;
 }
 .openerp .oe_pos_opening_total{
-  margin-right: -14px;
-}
-.openerp .oe_pos_ening_total{
-  margin-right: -7px;
+  margin-right: 4px;
 }
 .openerp .oe_pos_total{
   margin-left: -2px;
 }
+.openerp label.oe_mini_subtotal_footer_separator{
+  margin-right: -14px;
+}
+.openerp label.oe_subtotal_footer_separator{
+    width: 184px !important;
+}
 .openerp label.oe_pos_difference{
     margin-right: -11px;
+    width: 195px !important;
 }

From 6e63c47c64e222b1a11177f0aa0191509d310936 Mon Sep 17 00:00:00 2001
From: Tejas Tank <tta@openerp.com>
Date: Fri, 12 Apr 2013 15:08:07 +0530
Subject: [PATCH 32/57] [FIX] pos,cash-register: corrected word theoritical to
 theoretical changes.

bzr revid: tta@openerp.com-20130412093807-9bazw36l9khrjm0l
---
 addons/account/account_cash_statement.py    | 2 +-
 addons/account/account_view.xml             | 2 +-
 addons/point_of_sale/point_of_sale.py       | 4 ++--
 addons/point_of_sale/point_of_sale_view.xml | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py
index 94c9c010d7c..7232727ca83 100644
--- a/addons/account/account_cash_statement.py
+++ b/addons/account/account_cash_statement.py
@@ -177,7 +177,7 @@ class account_cash_statement(osv.osv):
         'opening_details_ids' : fields.one2many('account.cashbox.line', 'bank_statement_id', string='Opening Cashbox Lines'),
         'closing_details_ids' : fields.one2many('account.cashbox.line', 'bank_statement_id', string='Closing Cashbox Lines'),
         'user_id': fields.many2one('res.users', 'Responsible', required=False),
-        'difference' : fields.function(_compute_difference, method=True, string="Difference", type="float", help="Difference between the theoritical closing balance and the real closing balance."),
+        'difference' : fields.function(_compute_difference, method=True, string="Difference", type="float", help="Difference between the theoretical closing balance and the real closing balance."),
         'last_closing_balance' : fields.function(_compute_last_closing_balance, method=True, string='Last Closing Balance', type='float'),
     }
     _defaults = {
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 4ed129f6fa5..4e52bba512b 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2353,7 +2353,7 @@
                             <field name="balance_start" readonly="1" string="Opening Balance" class="oe_subtotal_footer_separator oe_open_balance" widget="monetary" options="{'currency_field': 'currency'}" help="Total of opening cash control lines"/>
                             <label for="total_entry_encoding" string="+ Transactions" class="oe_force_bold oe_mini_subtotal_footer_separator"/>
                             <field name="total_entry_encoding" nolabel="1" class="oe_bold oe_account_total" widget="monetary" options="{'currency_field': 'currency'}"/>
-                            <label for="balance_end" string="= Theoritical Closing Balance" class="oe_force_bold oe_mini_subtotal_footer_separator" help="Sum of opening balance and transactions."/>
+                            <label for="balance_end" string="= Theoretical Closing Balance" class="oe_force_bold oe_mini_subtotal_footer_separator" help="Sum of opening balance and transactions."/>
                             <field name="balance_end" nolabel="1" class="oe_bold oe_account_total" widget="monetary" options="{'currency_field': 'currency'}"/>
                         </group>
                         <div>
diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index c735384c6ec..8350098f6b3 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -251,13 +251,13 @@ class pos_session(osv.osv):
         'cash_register_balance_end' : fields.related('cash_register_id', 'balance_end',
                 type='float',
                 digits_compute=dp.get_precision('Account'),
-                string="Theoritical Closing Balance",
+                string="Theoretical Closing Balance",
                 help="Sum of opening balance and transactions.",
                 readonly=True),
         'cash_register_difference' : fields.related('cash_register_id', 'difference',
                 type='float',
                 string='Difference',
-                help="Difference between the theoritical closing balance and the real closing balance.",
+                help="Difference between the theoretical closing balance and the real closing balance.",
                 readonly=True),
 
         'journal_ids' : fields.related('config_id', 'journal_ids',
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 38bd0068864..2321bbae7f5 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -927,7 +927,7 @@
                                     <field name="cash_register_balance_start" readonly="1" string="Opening Balance" class="oe_subtotal_footer_separator" widget="monetary" options="{'currency_field': 'currency_id'}"/>
                                     <label for="cash_register_total_entry_encoding" attrs="{'invisible' : [('state', '=', 'opening_control')]}" string="+ Transactions" class="oe_force_bold oe_pos_opening_total"/>
                                     <field name="cash_register_total_entry_encoding" nolabel="1" attrs="{'invisible' : [('state', '=', 'opening_control')]}" class="oe_bold oe_pos_total" widget="monetary" options="{'currency_field': 'currency_id'}"/>
-                                    <label for="cash_register_balance_end" attrs="{'invisible' : [('state', '=', 'opening_control')]}" string="= Theoritical Closing Balance" class="oe_force_bold oe_pos_opening_total"/>
+                                    <label for="cash_register_balance_end" attrs="{'invisible' : [('state', '=', 'opening_control')]}" string="= Theoretical Closing Balance" class="oe_force_bold oe_pos_opening_total"/>
                                     <field name="cash_register_balance_end" nolabel="1" attrs="{'invisible' : [('state', '=', 'opening_control')]}" class="oe_bold oe_pos_total" widget="monetary" options="{'currency_field': 'currency_id'}"/>
                                 </group>
                                 <div class="oe_clear"/>

From ae664b1a8654ef7eaa25420983545c55ff0ea7f5 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Mon, 17 Jun 2013 12:44:13 +0530
Subject: [PATCH 33/57] [IMP] add currency_id because i had removed currency_id
 in merge conflict

bzr revid: fka@tinyerp.com-20130617071413-mie2x70lz4tzs48i
---
 addons/point_of_sale/point_of_sale_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index c03e582f34b..2efa008b7ce 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -776,6 +776,7 @@
                         <group col="4">
                             <field name="warehouse_id" widget="selection" groups="stock.group_locations" />
                             <field name="pricelist_id" groups="product.group_sale_pricelist"/>
+                            <field name="currency_id" invisible="1"/>
                             <field name="journal_id" widget="selection"/>
                             <field name="group_by" groups="account.group_account_user"/>
                             <field name="sequence_id" readonly="1" groups="base.group_no_one"/>

From 51974205b02bcff383d8e46e65b63c98b04cc683 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Tue, 18 Jun 2013 13:06:49 +0530
Subject: [PATCH 34/57] [IMP] improve code

bzr revid: fka@tinyerp.com-20130618073649-roiu4qko1ye380r4
---
 addons/account/account_cash_statement.py | 30 ++++++++++++++----------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py
index f340c9379aa..69060345c86 100644
--- a/addons/account/account_cash_statement.py
+++ b/addons/account/account_cash_statement.py
@@ -147,21 +147,27 @@ class account_cash_statement(osv.osv):
         return result
 
     def onchange_journal_id(self, cr, uid, ids, journal_id, context=None):
-        result = {}
-        if journal_id:
-            result = super(account_cash_statement, self).onchange_journal_id(cr, uid, ids, journal_id)
-            statement_ids = self.search(cr, uid,
-                    [('journal_id', '=', journal_id),('state', '=', 'confirm')],
-                    order='create_date desc',
-                    limit=1,
-                    context=context
-            )
-            if statement_ids:
-                st = self.browse(cr, uid, statement_ids[0], context=context)
-                result.setdefault('value', {}).update({'last_closing_balance' : st.balance_end_real})
+        result = super(account_cash_statement, self).onchange_journal_id(cr, uid, ids, journal_id)
+
+        if not journal_id:
+            return result
+
+        statement_ids = self.search(cr, uid,
+                [('journal_id', '=', journal_id),('state', '=', 'confirm')],
+                order='create_date desc',
+                limit=1,
+                context=context
+        )
+        
         opening_details_ids = self._get_cash_open_box_lines(cr, uid, journal_id, context)
         if opening_details_ids:
             result['value']['opening_details_ids'] = opening_details_ids
+
+        if statement_ids:
+            return result
+
+        st = self.browse(cr, uid, statement_ids[0], context=context)
+        result.setdefault('value', {}).update({'last_closing_balance' : st.balance_end_real})
         return result
 
     _columns = {

From dc0c545cd7feefa869d31730ec1ab1b5eca24721 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Tue, 18 Jun 2013 14:17:55 +0530
Subject: [PATCH 35/57] [IMP] improve code

bzr revid: fka@tinyerp.com-20130618084755-977k4ulv5c1bbcrk
---
 addons/account/account_cash_statement.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py
index 69060345c86..071c010add1 100644
--- a/addons/account/account_cash_statement.py
+++ b/addons/account/account_cash_statement.py
@@ -158,16 +158,17 @@ class account_cash_statement(osv.osv):
                 limit=1,
                 context=context
         )
-        
+
         opening_details_ids = self._get_cash_open_box_lines(cr, uid, journal_id, context)
         if opening_details_ids:
             result['value']['opening_details_ids'] = opening_details_ids
 
-        if statement_ids:
+        if not statement_ids:
             return result
 
         st = self.browse(cr, uid, statement_ids[0], context=context)
         result.setdefault('value', {}).update({'last_closing_balance' : st.balance_end_real})
+
         return result
 
     _columns = {

From 98d388bcf1112ad81be43d8ef5f8387b42af883a Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Wed, 10 Jul 2013 15:42:16 +0530
Subject: [PATCH 36/57] [FIX] pos: remove outer div tag of statusbar

bzr revid: hmo@tinyerp.com-20130710101216-23633pfhokwl9bag
---
 addons/point_of_sale/point_of_sale_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 2efa008b7ce..637bc0eb9bc 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -882,9 +882,9 @@
                             class="oe_highlight" />
                         <button name="close" type="workflow" string="Validate Closing &amp; Post Entries" states="closing_control"
                             class="oe_highlight" />
-                        <div class="oe_right">
-                            <field name="state" widget="statusbar" statusbar_visible="opening_control,opened,closing_control,closed" nolabel="1" />
-                        </div>
+                        
+                        <field name="state" widget="statusbar" statusbar_visible="opening_control,opened,closing_control,closed" nolabel="1" />
+                        
                     </header>
                     <sheet>
                         <div class="oe_right oe_button_box">

From edf9d5ef8e6c0c505021eca3ef92a91f8b1084c6 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Thu, 11 Jul 2013 16:29:00 +0530
Subject: [PATCH 37/57] [IMP] Improved code for following 1/.  Onchange on Cash
 Control was not working in POS 2/.  Added new css for cash control 3/.  Fixed
 the issue for the space between the Real Closing Balance and Differences.

bzr revid: psa@tinyerp.com-20130711105900-zzxnzky2nr6ms4c9
---
 addons/account/__openerp__.py                 |  3 ++-
 addons/account/account_view.xml               |  8 ++++--
 .../static/src/css/account_bank_and_cash.css  | 27 +++++++++++++++++++
 .../src/css/account_move_reconciliation.css   | 24 -----------------
 addons/point_of_sale/point_of_sale_view.xml   | 23 +++++++++-------
 addons/point_of_sale/static/src/css/pos.css   | 19 -------------
 6 files changed, 48 insertions(+), 56 deletions(-)
 create mode 100644 addons/account/static/src/css/account_bank_and_cash.css

diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py
index a380a69dc03..167d89ab2cb 100644
--- a/addons/account/__openerp__.py
+++ b/addons/account/__openerp__.py
@@ -135,7 +135,8 @@ for a particular financial year and for preparation of vouchers there is a modul
     ],
     'css':[
         'static/src/css/account_move_reconciliation.css',
-        'static/src/css/account_move_line_quickadd.css'
+        'static/src/css/account_move_line_quickadd.css',
+        'static/src/css/account_bank_and_cash.css',
     ],
     'demo': [
         'demo/account_demo.xml',
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 99a89270c85..26aedd28947 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2346,8 +2346,12 @@
                         <div>
                             <group class="oe_subtotal_footer oe_right" attrs="{'invisible' : [('state', '=', 'draft')]}">
                                 <field name="balance_end_real" readonly="1" string="Real Closing Balance" class="oe_subtotal_footer_separator oe_real_closing_balance" widget="monetary" options="{'currency_field': 'currency'}" help="Total of closing cash control lines."/>
-                                <field name="difference" class="oe_subtotal_footer_separator oe_difference"  widget="monetary" options="{'currency_field': 'currency'}"/>
-                            </group>    
+                            </group>
+                            <group/>
+                            <group/>
+                            <group class="oe_subtotal_footer oe_right" attrs="{'invisible' : [('state', '=', 'draft')]}">
+                                <field name="difference" class="oe_subtotal_footer_separator oe_difference" widget="monetary" options="{'currency_field': 'currency'}"/>
+                            </group>
                         </div>
                     </group>
                 </sheet>
diff --git a/addons/account/static/src/css/account_bank_and_cash.css b/addons/account/static/src/css/account_bank_and_cash.css
new file mode 100644
index 00000000000..5b5643d0d8e
--- /dev/null
+++ b/addons/account/static/src/css/account_bank_and_cash.css
@@ -0,0 +1,27 @@
+.openerp .oe_force_bold {
+  font-weight: bold !important;
+}
+.openerp label.oe_open_balance{
+    margin-right: -18px;
+}
+.openerp label.oe_subtotal_footer_separator{
+    float:right;
+    width: 184px !important;
+}
+.openerp label.oe_mini_subtotal_footer_separator{
+    margin-right: -14px;
+}
+.openerp .oe_account_total, .openerp .oe_pos_total {
+    margin-left: -2px;
+}
+.openerp label.oe_real_closing_balance{
+    min-width: 184px !important;
+}
+.openerp label.oe_difference, .openerp label.oe_pos_difference {
+    margin-right: -10px;
+    padding-left: 10px !important;
+    min-width: 195px !important;
+}
+.openerp .oe_opening_total{
+  margin-right: 4px;
+}
diff --git a/addons/account/static/src/css/account_move_reconciliation.css b/addons/account/static/src/css/account_move_reconciliation.css
index b6baa122fe6..a69c7a77c9c 100644
--- a/addons/account/static/src/css/account_move_reconciliation.css
+++ b/addons/account/static/src/css/account_move_reconciliation.css
@@ -17,27 +17,3 @@
     display: table-cell;
     width: 50%:
 }
-.openerp .oe_force_bold {
-  font-weight: bold !important;
-}
-.openerp label.oe_open_balance{
-    margin-right: -18px;
-}
-.openerp label.oe_subtotal_footer_separator{
-    float:right;
-}
-.openerp label.oe_mini_subtotal_footer_separator{
-    margin-right: -14px;
-}
-.openerp .oe_account_total {
-    margin-left: -2px;
-}
-.openerp label.oe_real_closing_balance{
-    min-width: 184px !important;
-}
-.openerp label.oe_difference {
-    margin-right: -10px;
-    padding-left: 10px !important;
-    min-width: 195px !important;
-}
-
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 637bc0eb9bc..47927424c8c 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -920,7 +920,7 @@
                                 <field name="details_ids" nolabel="1" colspan="2">
                                     <tree string="Cashbox Lines" editable="bottom">
                                         <field name="pieces" readonly="1" />
-                                        <field name="number_closing" />
+                                        <field name="number_closing" on_change="on_change_sub_closing(pieces, number_closing)"/>
                                         <field name="subtotal_closing" string="Closing Subtotal" sum="Total"/>
                                     </tree>
                                 </field>
@@ -929,9 +929,9 @@
                             <div attrs="{'invisible' : [('cash_control', '=', False)]}">
                                 <group class="oe_subtotal_footer oe_right">
                                     <field name="cash_register_balance_start" readonly="1" string="Opening Balance" class="oe_subtotal_footer_separator" widget="monetary" options="{'currency_field': 'currency_id'}"/>
-                                    <label for="cash_register_total_entry_encoding" attrs="{'invisible' : [('state', '=', 'opening_control')]}" string="+ Transactions" class="oe_force_bold oe_pos_opening_total"/>
+                                    <label for="cash_register_total_entry_encoding" attrs="{'invisible' : [('state', '=', 'opening_control')]}" string="+ Transactions" class="oe_force_bold oe_opening_total"/>
                                     <field name="cash_register_total_entry_encoding" nolabel="1" attrs="{'invisible' : [('state', '=', 'opening_control')]}" class="oe_bold oe_pos_total" widget="monetary" options="{'currency_field': 'currency_id'}"/>
-                                    <label for="cash_register_balance_end" attrs="{'invisible' : [('state', '=', 'opening_control')]}" string="= Theoretical Closing Balance" class="oe_force_bold oe_pos_opening_total"/>
+                                    <label for="cash_register_balance_end" attrs="{'invisible' : [('state', '=', 'opening_control')]}" string="= Theoretical Closing Balance" class="oe_force_bold oe_opening_total"/>
                                     <field name="cash_register_balance_end" nolabel="1" attrs="{'invisible' : [('state', '=', 'opening_control')]}" class="oe_bold oe_pos_total" widget="monetary" options="{'currency_field': 'currency_id'}"/>
                                 </group>
                                 <div class="oe_clear"/>
@@ -943,14 +943,17 @@
                                     </p>
                                 </div>
                             </div>
-
-
-                            <group class="oe_subtotal_footer oe_right" attrs="{'invisible': ['|', ('cash_control', '=', False), ('state', '=', 'opening_control')]}">
-                                <field name="cash_register_balance_end_real" string="Real Closing Balance" class="oe_subtotal_footer_separator" widget="monetary" options="{'currency_field': 'currency_id'}"/>
-                                <field name="cash_register_difference" class="oe_subtotal_footer_separator oe_right oe_pos_total oe_pos_difference" widget="monetary" options="{'currency_field': 'currency_id'}"/>
-                            </group>
+                            <div>
+                                <group class="oe_subtotal_footer oe_right" attrs="{'invisible': ['|', ('cash_control', '=', False), ('state', '=', 'opening_control')]}">
+                                    <field name="cash_register_balance_end_real" string="Real Closing Balance" class="oe_subtotal_footer_separator" widget="monetary" options="{'currency_field': 'currency_id'}"/>
+                                </group>
+                                <group/>
+                                <group/>
+                                <group class="oe_subtotal_footer oe_right" attrs="{'invisible': ['|', ('cash_control', '=', False), ('state', '=', 'opening_control')]}">
+                                    <field name="cash_register_difference" class="oe_subtotal_footer_separator oe_right oe_pos_total oe_pos_difference" widget="monetary" options="{'currency_field': 'currency_id'}"/>
+                                </group>
+                            </div>
                         </group>
-
                         <separator string="Summary by Payment Methods" attrs="{'invisible' : [('state', '=', 'opening_control')]}"/>
                         <field name="statement_ids" attrs="{'invisible' : [('state', '=', 'opening_control')]}">
                             <tree string="Statements">
diff --git a/addons/point_of_sale/static/src/css/pos.css b/addons/point_of_sale/static/src/css/pos.css
index 9d193af4ebd..d9a4d6d00a9 100644
--- a/addons/point_of_sale/static/src/css/pos.css
+++ b/addons/point_of_sale/static/src/css/pos.css
@@ -1431,22 +1431,3 @@
     box-shadow: 0px 3px 38px rgba(0,0,0,0.3);
     border-radius: 3px;
 }
-.openerp .oe_force_bold{
-  font-weight: bold !important;
-}
-.openerp .oe_pos_opening_total{
-  margin-right: 4px;
-}
-.openerp .oe_pos_total{
-  margin-left: -2px;
-}
-.openerp label.oe_mini_subtotal_footer_separator{
-  margin-right: -14px;
-}
-.openerp label.oe_subtotal_footer_separator{
-    width: 184px !important;
-}
-.openerp label.oe_pos_difference{
-    margin-right: -11px;
-    width: 195px !important;
-}

From 2c2fdc09f12fbbcb51b2d874c331ad5227fc3c4b Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Mon, 16 Sep 2013 12:59:09 +0530
Subject: [PATCH 38/57] [IMP] Make OBI label to Description and make the cash
 control tab as default in cash registers.

bzr revid: psa@tinyerp.com-20130916072909-4c1s5y4ah3riusik
---
 addons/account/account_bank_statement.py |  2 +-
 addons/account/account_view.xml          | 66 ++++++++++++------------
 2 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 508cbb42808..a573077891e 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -546,7 +546,7 @@ class account_bank_statement_line(osv.osv):
     _name = "account.bank.statement.line"
     _description = "Bank Statement Line"
     _columns = {
-        'name': fields.char('OBI', required=True, help="Originator to Beneficiary Information"),
+        'name': fields.char('Description', required=True, help="Originator to Beneficiary Information"),
         'date': fields.date('Date', required=True),
         'amount': fields.float('Amount', digits_compute=dp.get_precision('Account')),
         'type': fields.selection([
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 635ec6e2ea2..bdad02c252d 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2275,6 +2275,39 @@
                         </group>
                     </group>
                     <notebook>
+                        <page string="Cash Control">
+                            <group col="2" expand="1">
+                                <group string="Opening Cash Control" attrs="{'invisible' : [('state', '!=', 'draft')]}">
+                                    <field name="opening_details_ids" colspan="2" nolabel="1">
+                                        <tree string="Opening Cashbox Lines" editable="bottom">
+                                            <field name="pieces"/>
+                                            <field name="number_opening" on_change="on_change_sub_opening(pieces, number_opening, parent.balance_end)"/>
+                                            <field name="subtotal_opening" string="Opening Subtotal" sum="Total"/>
+                                        </tree>
+                                    </field>
+                                </group>
+                                <group>
+                                    <group string="Opening Cash Control" attrs="{'invisible' : [('state', '=', 'draft')]}">
+                                        <field name="details_ids" colspan="2" nolabel="1" attrs="{'readonly' : [('state', '!=', 'draft')]}">
+                                            <tree string="Opening Cashbox Lines" editable="bottom">
+                                                <field name="pieces"/>
+                                                <field name="number_opening" on_change="on_change_sub_opening(pieces, number_opening, parent.balance_end)"/>
+                                                <field name="subtotal_opening" string="Opening Subtotal" sum="Total"/>
+                                            </tree>
+                                        </field>
+                                    </group>
+                                    <group string="Closing Cash Control" attrs="{'invisible' : [('state', '=', 'draft')]}">
+                                        <field name="closing_details_ids" colspan="2" nolabel="1">
+                                            <tree string="Closing Cashbox Lines" editable="bottom">
+                                                <field name="pieces" readonly="1" />
+                                                <field name="number_closing" on_change="on_change_sub_closing(pieces, number_closing, parent.balance_end)"/>
+                                                <field name="subtotal_closing" string="Closing Subtotal" sum="Total"/>
+                                            </tree>
+                                        </field>
+                                    </group>
+                                </group>
+                            </group>
+                        </page>
                         <page string="Cash Transactions" attrs="{'invisible': [('state','=','draft')]}">
                             <field name="line_ids" context="{'date':date}">
                                 <tree editable="bottom" string="Statement lines">
@@ -2305,39 +2338,6 @@
                                 </form>
                             </field>
                         </page>
-                        <page string="Cash Control">
-                            <group col="2" expand="1">
-                                <group string="Opening Cash Control" attrs="{'invisible' : [('state', '!=', 'draft')]}">
-                                    <field name="opening_details_ids" colspan="2" nolabel="1">
-                                        <tree string="Opening Cashbox Lines" editable="bottom">
-                                            <field name="pieces"/>
-                                            <field name="number_opening" on_change="on_change_sub_opening(pieces, number_opening, parent.balance_end)"/>
-                                            <field name="subtotal_opening" string="Opening Subtotal" sum="Total"/>
-                                        </tree>
-                                    </field>    
-                                </group>
-                                <group>
-                                    <group string="Opening Cash Control" attrs="{'invisible' : [('state', '=', 'draft')]}">
-                                        <field name="details_ids" colspan="2" nolabel="1" attrs="{'readonly' : [('state', '!=', 'draft')]}">
-                                            <tree string="Opening Cashbox Lines" editable="bottom">
-                                                <field name="pieces"/>
-                                                <field name="number_opening" on_change="on_change_sub_opening(pieces, number_opening, parent.balance_end)"/>
-                                                <field name="subtotal_opening" string="Opening Subtotal" sum="Total"/>
-                                            </tree>
-                                        </field>
-                                    </group>
-                                    <group string="Closing Cash Control" attrs="{'invisible' : [('state', '=', 'draft')]}">
-                                        <field name="closing_details_ids" colspan="2" nolabel="1">
-                                            <tree string="Closing Cashbox Lines" editable="bottom">
-                                                <field name="pieces" readonly="1" />
-                                                <field name="number_closing" on_change="on_change_sub_closing(pieces, number_closing, parent.balance_end)"/>
-                                                <field name="subtotal_closing" string="Closing Subtotal" sum="Total"/>
-                                            </tree>
-                                        </field>
-                                    </group>
-                                </group>
-                            </group>
-                        </page>
                         <page string="Journal Entries" attrs="{'invisible': [('state','!=','confirm')]}">
                             <field name="move_line_ids" string="Journal Entries"/>
                         </page>

From 5f06129179d1f2d45706cd7828c4d2dc8e4e6268 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Tue, 17 Sep 2013 18:39:01 +0530
Subject: [PATCH 39/57] [IMP] Improved code for In cash registers, it does not
 work at all >>real closing balance is not updated >>opening balance is not
 updated >>and so amount is never good

bzr revid: psa@tinyerp.com-20130917130901-hem0iwy608vkwe02
---
 addons/account/account_cash_statement.py | 50 ++++++++++++++++++++++++
 addons/account/account_view.xml          |  7 ++--
 2 files changed, 53 insertions(+), 4 deletions(-)

diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py
index 071c010add1..8fe860099bd 100644
--- a/addons/account/account_cash_statement.py
+++ b/addons/account/account_cash_statement.py
@@ -171,7 +171,35 @@ class account_cash_statement(osv.osv):
 
         return result
 
+    def _compute_cash_all(self, cr, uid, ids, fieldnames, args, context=None):
+        result = dict()
+
+        for record in self.browse(cr, uid, ids, context=context):
+            result[record.id] = {
+                'cash_journal_id' : False,
+                'cash_register_id' : False,
+                'cash_control' : False,
+            }
+            for st in self.browse(cr, uid, ids, context=context):
+                if st.journal_id.cash_control == True:
+                    result[record.id]['cash_control'] = True
+                    result[record.id]['cash_journal_id'] = st.journal_id.id
+                    result[record.id]['cash_register_id'] = st.id
+        return result
+
+
     _columns = {
+        'cash_control' : fields.function(_compute_cash_all,
+                                         multi='cash',
+                                         type='boolean', string='Has Cash Control'),
+        'cash_journal_id' : fields.function(_compute_cash_all,
+                                            multi='cash',
+                                            type='many2one', relation='account.journal',
+                                            string='Cash Journal', store=True),
+        'cash_register_id' : fields.function(_compute_cash_all,
+                                             multi='cash',
+                                             type='many2one', relation='account.bank.statement',
+                                             string='Cash Register', store=True),
         'total_entry_encoding': fields.function(_get_sum_entry_encoding, string="Total Transactions",
             store = {
                 'account.bank.statement': (lambda self, cr, uid, ids, context=None: ids, ['line_ids','move_line_ids'], 10),
@@ -185,6 +213,28 @@ class account_cash_statement(osv.osv):
         'user_id': fields.many2one('res.users', 'Responsible', required=False),
         'difference' : fields.function(_compute_difference, method=True, string="Difference", type="float", help="Difference between the theoretical closing balance and the real closing balance."),
         'last_closing_balance' : fields.function(_compute_last_closing_balance, method=True, string='Last Closing Balance', type='float'),
+        'cash_register_balance_end_real' : fields.related('cash_register_id', 'balance_end_real',
+                type='float',
+                digits_compute=dp.get_precision('Account'),
+                string="Ending Balance",
+                help="Total of closing cash control lines.",
+                readonly=True),
+        'cash_register_balance_start' : fields.related('cash_register_id', 'balance_start',
+                type='float',
+                digits_compute=dp.get_precision('Account'),
+                string="Starting Balance",
+                help="Total of opening cash control lines.",
+                readonly=True),
+        'cash_register_total_entry_encoding' : fields.related('cash_register_id', 'total_entry_encoding',
+                string='Total Cash Transaction',
+                readonly=True,
+                help="Total of all paid sale orders"),
+        'cash_register_balance_end' : fields.related('cash_register_id', 'balance_end',
+                type='float',
+                digits_compute=dp.get_precision('Account'),
+                string="Theoretical Closing Balance",
+                help="Sum of opening balance and transactions.",
+                readonly=True),
     }
     _defaults = {
         'state': 'draft',
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index bdad02c252d..4a57559aa5d 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2264,7 +2264,6 @@
                         <group>
                             <field name="journal_id" on_change="onchange_journal_id(journal_id)" widget="selection" domain="[('type', '=', 'cash')]" />
                             <field name="user_id" readonly="1" string="Responsible"/>
-                            <field name="total_entry_encoding"/>
                             <field name='company_id' widget="selection" groups="base.group_multi_company" />
                         </group>
                         <group>
@@ -2281,7 +2280,7 @@
                                     <field name="opening_details_ids" colspan="2" nolabel="1">
                                         <tree string="Opening Cashbox Lines" editable="bottom">
                                             <field name="pieces"/>
-                                            <field name="number_opening" on_change="on_change_sub_opening(pieces, number_opening, parent.balance_end)"/>
+                                            <field name="number_opening" on_change="on_change_sub_opening(pieces, number_opening)" />
                                             <field name="subtotal_opening" string="Opening Subtotal" sum="Total"/>
                                         </tree>
                                     </field>
@@ -2291,7 +2290,7 @@
                                         <field name="details_ids" colspan="2" nolabel="1" attrs="{'readonly' : [('state', '!=', 'draft')]}">
                                             <tree string="Opening Cashbox Lines" editable="bottom">
                                                 <field name="pieces"/>
-                                                <field name="number_opening" on_change="on_change_sub_opening(pieces, number_opening, parent.balance_end)"/>
+                                                <field name="number_opening" on_change="on_change_sub_opening(pieces, number_opening)"/>
                                                 <field name="subtotal_opening" string="Opening Subtotal" sum="Total"/>
                                             </tree>
                                         </field>
@@ -2300,7 +2299,7 @@
                                         <field name="closing_details_ids" colspan="2" nolabel="1">
                                             <tree string="Closing Cashbox Lines" editable="bottom">
                                                 <field name="pieces" readonly="1" />
-                                                <field name="number_closing" on_change="on_change_sub_closing(pieces, number_closing, parent.balance_end)"/>
+                                                <field name="number_closing" on_change="on_change_sub_closing(pieces, number_closing)"/>
                                                 <field name="subtotal_closing" string="Closing Subtotal" sum="Total"/>
                                             </tree>
                                         </field>

From bfff65d4ac022e94cac4e793f2ee28257e71ddb0 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Wed, 18 Sep 2013 14:40:41 +0530
Subject: [PATCH 40/57] [IMP] if 'cash control' if false in the journal, no
 need to have the opening and closing cash control tab in cash registers

bzr revid: psa@tinyerp.com-20130918091041-c5zponkbu5uwgb94
---
 addons/account/account_bank_statement.py | 11 ++++++-----
 addons/account/account_cash_statement.py |  4 ----
 addons/account/account_view.xml          |  9 +++++----
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index a573077891e..d927dcfd0cf 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -128,6 +128,7 @@ class account_bank_statement(osv.osv):
         'currency': fields.function(_currency, string='Currency',
             type='many2one', relation='res.currency'),
         'account_id': fields.related('journal_id', 'default_debit_account_id', type='many2one', relation='account.account', string='Account used in this journal', readonly=True, help='used in statement reconciliation domain, but shouldn\'t be used elswhere.'),
+        'cash_control': fields.related('journal_id', 'cash_control' , type='boolean', relation='account.journal',string='Cash control'),
     }
 
     _defaults = {
@@ -460,12 +461,12 @@ class account_bank_statement(osv.osv):
     def onchange_journal_id(self, cr, uid, statement_id, journal_id, context=None):
         if not journal_id:
             return {}
+        if context is None:
+           context = {}
         balance_start = self._compute_balance_end_real(cr, uid, journal_id, context=context)
-
-        journal_data = self.pool.get('account.journal').read(cr, uid, journal_id, ['company_id', 'currency'], context=context)
-        company_id = journal_data['company_id']
-        currency_id = journal_data['currency'] or self.pool.get('res.company').browse(cr, uid, company_id[0], context=context).currency_id.id
-        return {'value': {'balance_start': balance_start, 'company_id': company_id, 'currency': currency_id}}
+        journal = self.pool.get('account.journal').browse(cr, uid, journal_id, context=context)
+        currency = journal.currency or journal.company_id.currency_id
+        return {'value': {'balance_start': balance_start, 'company_id': journal.company_id.id, 'currency': currency.id, 'cash_control': journal.cash_control}}
 
     def unlink(self, cr, uid, ids, context=None):
         stat = self.read(cr, uid, ids, ['state'], context=context)
diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py
index 8fe860099bd..731c5212493 100644
--- a/addons/account/account_cash_statement.py
+++ b/addons/account/account_cash_statement.py
@@ -225,10 +225,6 @@ class account_cash_statement(osv.osv):
                 string="Starting Balance",
                 help="Total of opening cash control lines.",
                 readonly=True),
-        'cash_register_total_entry_encoding' : fields.related('cash_register_id', 'total_entry_encoding',
-                string='Total Cash Transaction',
-                readonly=True,
-                help="Total of all paid sale orders"),
         'cash_register_balance_end' : fields.related('cash_register_id', 'balance_end',
                 type='float',
                 digits_compute=dp.get_precision('Account'),
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 4a57559aa5d..96eb2d2d68a 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2271,10 +2271,11 @@
                             <field name="closing_date" readonly="1"/>
                             <field name="period_id" class="oe_inline"/>
                             <field name="currency" invisible="1"/>
+                            <field name="cash_control" invisible="1"/>
                         </group>
                     </group>
                     <notebook>
-                        <page string="Cash Control">
+                        <page string="Cash Control" attrs="{'invisible' : [('cash_control', '=', False)]}">
                             <group col="2" expand="1">
                                 <group string="Opening Cash Control" attrs="{'invisible' : [('state', '!=', 'draft')]}">
                                     <field name="opening_details_ids" colspan="2" nolabel="1">
@@ -2342,7 +2343,7 @@
                         </page>
                     </notebook>
                     <group>
-                        <group class="oe_subtotal_footer oe_right">
+                        <group class="oe_subtotal_footer oe_right" attrs="{'invisible' : [('cash_control', '=', False)]}">
                             <field name="balance_start" readonly="1" string="Opening Balance" class="oe_subtotal_footer_separator oe_open_balance" widget="monetary" options="{'currency_field': 'currency'}" help="Total of opening cash control lines"/>
                             <label for="total_entry_encoding" string="+ Transactions" class="oe_force_bold oe_mini_subtotal_footer_separator"/>
                             <field name="total_entry_encoding" nolabel="1" class="oe_bold oe_account_total" widget="monetary" options="{'currency_field': 'currency'}"/>
@@ -2350,12 +2351,12 @@
                             <field name="balance_end" nolabel="1" class="oe_bold oe_account_total" widget="monetary" options="{'currency_field': 'currency'}"/>
                         </group>
                         <div>
-                            <group class="oe_subtotal_footer oe_right" attrs="{'invisible' : [('state', '=', 'draft')]}">
+                            <group class="oe_subtotal_footer oe_right" attrs="{'invisible': ['|', ('cash_control', '=', False), ('state', '=', 'draft')]}">
                                 <field name="balance_end_real" readonly="1" string="Real Closing Balance" class="oe_subtotal_footer_separator oe_real_closing_balance" widget="monetary" options="{'currency_field': 'currency'}" help="Total of closing cash control lines."/>
                             </group>
                             <group/>
                             <group/>
-                            <group class="oe_subtotal_footer oe_right" attrs="{'invisible' : [('state', '=', 'draft')]}">
+                            <group class="oe_subtotal_footer oe_right" attrs="{'invisible': ['|', ('cash_control', '=', False), ('state', '=', 'draft')]}">
                                 <field name="difference" class="oe_subtotal_footer_separator oe_difference" widget="monetary" options="{'currency_field': 'currency'}"/>
                             </group>
                         </div>

From 5327be2208ab22c6566764aa8e36880fc1aa816d Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Wed, 18 Sep 2013 15:17:19 +0530
Subject: [PATCH 41/57] Removed unwanted code.

bzr revid: psa@tinyerp.com-20130918094719-hj15za1y2nt1x1c8
---
 addons/account/account_cash_statement.py | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)

diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py
index 731c5212493..e19fd9bddc8 100644
--- a/addons/account/account_cash_statement.py
+++ b/addons/account/account_cash_statement.py
@@ -190,8 +190,8 @@ class account_cash_statement(osv.osv):
 
     _columns = {
         'cash_control' : fields.function(_compute_cash_all,
-                                         multi='cash',
-                                         type='boolean', string='Has Cash Control'),
+                                            multi='cash',
+                                            type='boolean', string='Has Cash Control'),
         'cash_journal_id' : fields.function(_compute_cash_all,
                                             multi='cash',
                                             type='many2one', relation='account.journal',
@@ -213,24 +213,6 @@ class account_cash_statement(osv.osv):
         'user_id': fields.many2one('res.users', 'Responsible', required=False),
         'difference' : fields.function(_compute_difference, method=True, string="Difference", type="float", help="Difference between the theoretical closing balance and the real closing balance."),
         'last_closing_balance' : fields.function(_compute_last_closing_balance, method=True, string='Last Closing Balance', type='float'),
-        'cash_register_balance_end_real' : fields.related('cash_register_id', 'balance_end_real',
-                type='float',
-                digits_compute=dp.get_precision('Account'),
-                string="Ending Balance",
-                help="Total of closing cash control lines.",
-                readonly=True),
-        'cash_register_balance_start' : fields.related('cash_register_id', 'balance_start',
-                type='float',
-                digits_compute=dp.get_precision('Account'),
-                string="Starting Balance",
-                help="Total of opening cash control lines.",
-                readonly=True),
-        'cash_register_balance_end' : fields.related('cash_register_id', 'balance_end',
-                type='float',
-                digits_compute=dp.get_precision('Account'),
-                string="Theoretical Closing Balance",
-                help="Sum of opening balance and transactions.",
-                readonly=True),
     }
     _defaults = {
         'state': 'draft',

From b855aada49edacbb776cd60c8299f9d7b80c75d6 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Wed, 18 Sep 2013 15:44:37 +0530
Subject: [PATCH 42/57] Improved

bzr revid: psa@tinyerp.com-20130918101437-p7jljc3mco70ay8g
---
 addons/account/account_bank_statement.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index d927dcfd0cf..e2ae46ad70b 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -128,7 +128,7 @@ class account_bank_statement(osv.osv):
         'currency': fields.function(_currency, string='Currency',
             type='many2one', relation='res.currency'),
         'account_id': fields.related('journal_id', 'default_debit_account_id', type='many2one', relation='account.account', string='Account used in this journal', readonly=True, help='used in statement reconciliation domain, but shouldn\'t be used elswhere.'),
-        'cash_control': fields.related('journal_id', 'cash_control' , type='boolean', relation='account.journal',string='Cash control'),
+        'cash_control': fields.related('journal_id', 'cash_control' , type='boolean', relation='account.journal',string='Cash control', store=True),
     }
 
     _defaults = {

From c5814d3e6f8e905211f15c67c2f4f4761d5ae08b Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Wed, 18 Sep 2013 16:17:20 +0530
Subject: [PATCH 43/57] onchange_journal_id testing

bzr revid: psa@tinyerp.com-20130918104720-5btsto01o6w9uumo
---
 addons/account/account_bank_statement.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index e2ae46ad70b..f0f93db19c1 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -128,7 +128,7 @@ class account_bank_statement(osv.osv):
         'currency': fields.function(_currency, string='Currency',
             type='many2one', relation='res.currency'),
         'account_id': fields.related('journal_id', 'default_debit_account_id', type='many2one', relation='account.account', string='Account used in this journal', readonly=True, help='used in statement reconciliation domain, but shouldn\'t be used elswhere.'),
-        'cash_control': fields.related('journal_id', 'cash_control' , type='boolean', relation='account.journal',string='Cash control', store=True),
+        'cash_control': fields.related('journal_id', 'cash_control' , type='boolean', relation='account.journal',string='Cash control'),
     }
 
     _defaults = {
@@ -461,12 +461,16 @@ class account_bank_statement(osv.osv):
     def onchange_journal_id(self, cr, uid, statement_id, journal_id, context=None):
         if not journal_id:
             return {}
-        if context is None:
-           context = {}
+        res = {}
         balance_start = self._compute_balance_end_real(cr, uid, journal_id, context=context)
+        res['balance_start'] = balance_start 
         journal = self.pool.get('account.journal').browse(cr, uid, journal_id, context=context)
+        res['company_id'] =  journal.company_id.id
         currency = journal.currency or journal.company_id.currency_id
-        return {'value': {'balance_start': balance_start, 'company_id': journal.company_id.id, 'currency': currency.id, 'cash_control': journal.cash_control}}
+        res['currency']  = currency.id
+        if journal.type == 'cash':
+            res['cash_control'] = journal.cash_control
+        return {'value': res}
 
     def unlink(self, cr, uid, ids, context=None):
         stat = self.read(cr, uid, ids, ['state'], context=context)

From e00111a061b805d1464f34b84a7b9f6449903784 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Wed, 18 Sep 2013 16:49:59 +0530
Subject: [PATCH 44/57] [IMP] Improved code.

bzr revid: psa@tinyerp.com-20130918111959-1dzkuxv4acjys8kl
---
 addons/account/account_bank_statement.py                      | 4 +---
 addons/account/account_cash_statement.py                      | 3 ++-
 addons/account/static/src/css/account_move_reconciliation.css | 2 +-
 addons/point_of_sale/point_of_sale.py                         | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index f0f93db19c1..f60cd2fe448 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -463,11 +463,9 @@ class account_bank_statement(osv.osv):
             return {}
         res = {}
         balance_start = self._compute_balance_end_real(cr, uid, journal_id, context=context)
-        res['balance_start'] = balance_start 
         journal = self.pool.get('account.journal').browse(cr, uid, journal_id, context=context)
-        res['company_id'] =  journal.company_id.id
         currency = journal.currency or journal.company_id.currency_id
-        res['currency']  = currency.id
+        res = {'balance_start' : balance_start, 'company_id' : journal.company_id.id, 'currency' : currency.id}
         if journal.type == 'cash':
             res['cash_control'] = journal.cash_control
         return {'value': res}
diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py
index e19fd9bddc8..aa7ee11cf3e 100644
--- a/addons/account/account_cash_statement.py
+++ b/addons/account/account_cash_statement.py
@@ -227,6 +227,7 @@ class account_cash_statement(osv.osv):
         journal = self.pool.get('account.journal').browse(cr, uid, journal_id, context=context)
         if journal and (journal.type == 'cash'):
             last_pieces = None
+
             if journal.with_last_closing_balance == True:
                 domain = [('journal_id', '=', journal.id),
                           ('state', '=', 'confirm')]
@@ -244,7 +245,6 @@ class account_cash_statement(osv.osv):
                     'pieces' : value.pieces
                 }
                 details_ids.append([0, False, nested_values])
-                
         return details_ids
 
     def create(self, cr, uid, vals, context=None):
@@ -268,6 +268,7 @@ class account_cash_statement(osv.osv):
 
         @return: True on success, False otherwise
         """
+
         cashbox_pool = self.pool.get('account.cashbox.line')
         if vals.get('journal_id', False):
             cashbox_ids = cashbox_pool.search(cr, uid, [('bank_statement_id', 'in', ids)], context=context)
diff --git a/addons/account/static/src/css/account_move_reconciliation.css b/addons/account/static/src/css/account_move_reconciliation.css
index a69c7a77c9c..2b407226905 100644
--- a/addons/account/static/src/css/account_move_reconciliation.css
+++ b/addons/account/static/src/css/account_move_reconciliation.css
@@ -16,4 +16,4 @@
 .openerp .oe_account_reconciliation>div>div {
     display: table-cell;
     width: 50%:
-}
+}
\ No newline at end of file
diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index f0e4d1a2d5b..b176ee55c88 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -222,7 +222,7 @@ class pos_session(osv.osv):
         'state' : fields.selection(POS_SESSION_STATE, 'Status',
                 required=True, readonly=True,
                 select=1),
-        
+
         'cash_control' : fields.function(_compute_cash_all,
                                          multi='cash',
                                          type='boolean', string='Has Cash Control'),

From 9814a86c9514ca8d63cce26599b25838dd439345 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Wed, 18 Sep 2013 18:59:17 +0530
Subject: [PATCH 45/57] [IMP] Hide only the cash control page in cash register.

bzr revid: psa@tinyerp.com-20130918132917-gllo1kjvozy9s1qe
---
 addons/account/account_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 96eb2d2d68a..b82b3c12fbf 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2343,7 +2343,7 @@
                         </page>
                     </notebook>
                     <group>
-                        <group class="oe_subtotal_footer oe_right" attrs="{'invisible' : [('cash_control', '=', False)]}">
+                        <group class="oe_subtotal_footer oe_right">
                             <field name="balance_start" readonly="1" string="Opening Balance" class="oe_subtotal_footer_separator oe_open_balance" widget="monetary" options="{'currency_field': 'currency'}" help="Total of opening cash control lines"/>
                             <label for="total_entry_encoding" string="+ Transactions" class="oe_force_bold oe_mini_subtotal_footer_separator"/>
                             <field name="total_entry_encoding" nolabel="1" class="oe_bold oe_account_total" widget="monetary" options="{'currency_field': 'currency'}"/>
@@ -2351,12 +2351,12 @@
                             <field name="balance_end" nolabel="1" class="oe_bold oe_account_total" widget="monetary" options="{'currency_field': 'currency'}"/>
                         </group>
                         <div>
-                            <group class="oe_subtotal_footer oe_right" attrs="{'invisible': ['|', ('cash_control', '=', False), ('state', '=', 'draft')]}">
+                            <group class="oe_subtotal_footer oe_right" attrs="{'invisible': [('state', '=', 'draft')]}">
                                 <field name="balance_end_real" readonly="1" string="Real Closing Balance" class="oe_subtotal_footer_separator oe_real_closing_balance" widget="monetary" options="{'currency_field': 'currency'}" help="Total of closing cash control lines."/>
                             </group>
                             <group/>
                             <group/>
-                            <group class="oe_subtotal_footer oe_right" attrs="{'invisible': ['|', ('cash_control', '=', False), ('state', '=', 'draft')]}">
+                            <group class="oe_subtotal_footer oe_right" attrs="{'invisible': [('state', '=', 'draft')]}">
                                 <field name="difference" class="oe_subtotal_footer_separator oe_difference" widget="monetary" options="{'currency_field': 'currency'}"/>
                             </group>
                         </div>

From 4082e1aa8c2198f05b27ef7ef50f0bc3b8bf5a2a Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Wed, 25 Sep 2013 13:55:07 +0530
Subject: [PATCH 46/57] [IMP]Removed the unwanted functional fields.

bzr revid: psa@tinyerp.com-20130925082507-oma2ttiy1kas9fsn
---
 addons/account/account_cash_statement.py | 28 ------------------------
 1 file changed, 28 deletions(-)

diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py
index aa7ee11cf3e..f23c87424ed 100644
--- a/addons/account/account_cash_statement.py
+++ b/addons/account/account_cash_statement.py
@@ -171,35 +171,7 @@ class account_cash_statement(osv.osv):
 
         return result
 
-    def _compute_cash_all(self, cr, uid, ids, fieldnames, args, context=None):
-        result = dict()
-
-        for record in self.browse(cr, uid, ids, context=context):
-            result[record.id] = {
-                'cash_journal_id' : False,
-                'cash_register_id' : False,
-                'cash_control' : False,
-            }
-            for st in self.browse(cr, uid, ids, context=context):
-                if st.journal_id.cash_control == True:
-                    result[record.id]['cash_control'] = True
-                    result[record.id]['cash_journal_id'] = st.journal_id.id
-                    result[record.id]['cash_register_id'] = st.id
-        return result
-
-
     _columns = {
-        'cash_control' : fields.function(_compute_cash_all,
-                                            multi='cash',
-                                            type='boolean', string='Has Cash Control'),
-        'cash_journal_id' : fields.function(_compute_cash_all,
-                                            multi='cash',
-                                            type='many2one', relation='account.journal',
-                                            string='Cash Journal', store=True),
-        'cash_register_id' : fields.function(_compute_cash_all,
-                                             multi='cash',
-                                             type='many2one', relation='account.bank.statement',
-                                             string='Cash Register', store=True),
         'total_entry_encoding': fields.function(_get_sum_entry_encoding, string="Total Transactions",
             store = {
                 'account.bank.statement': (lambda self, cr, uid, ids, context=None: ids, ['line_ids','move_line_ids'], 10),

From 96577c7e83aa948e1b1040f373364d4704cb8f43 Mon Sep 17 00:00:00 2001
From: "Chirag Dodiya (OpenERP Trainee)" <chiragdd7@gmail.com>
Date: Thu, 26 Sep 2013 11:47:17 +0530
Subject: [PATCH 47/57] [IMP] Improved view of account bank statment

bzr revid: chiragdd7@gmail.com-20130926061717-q9bscxm54xzh5yc2
---
 addons/account/account_bank_statement.py           |  2 +-
 .../account_analytic_plans_view.xml                | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index f60cd2fe448..700ec0dec0a 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -549,7 +549,7 @@ class account_bank_statement_line(osv.osv):
     _name = "account.bank.statement.line"
     _description = "Bank Statement Line"
     _columns = {
-        'name': fields.char('Description', required=True, help="Originator to Beneficiary Information"),
+        'name': fields.char('Description', required=True),
         'date': fields.date('Date', required=True),
         'amount': fields.float('Amount', digits_compute=dp.get_precision('Account')),
         'type': fields.selection([
diff --git a/addons/account_analytic_plans/account_analytic_plans_view.xml b/addons/account_analytic_plans/account_analytic_plans_view.xml
index 42b17ae06c3..05955d6f5cd 100644
--- a/addons/account_analytic_plans/account_analytic_plans_view.xml
+++ b/addons/account_analytic_plans/account_analytic_plans_view.xml
@@ -270,6 +270,20 @@
                 </xpath>
             </field>
         </record>
+        
+        <record id="view_bank_statement_inherit_form2" model="ir.ui.view">
+            <field name="name">account.bank.statement.form.inherit</field>
+            <field name="model">account.bank.statement</field>
+            <field name="inherit_id" ref="account.view_bank_statement_form2"/>
+            <field name="arch" type="xml">
+                <xpath expr="/form/sheet/notebook/page/field[@name='line_ids']/tree/field[@name='analytic_account_id']" position="replace">
+                    <field name="analytics_id" groups="analytic.group_analytic_accounting"/>
+                </xpath>
+                <xpath expr="/form/sheet/notebook/page/field[@name='line_ids']/form/group/field[@name='analytic_account_id']" position="replace">
+                    <field name="analytics_id" groups="analytic.group_analytic_accounting"/>
+                </xpath>
+            </field>
+        </record>
 
 </data>
 </openerp>

From ee18fc5e161c72e362c5da15c23dc22ec48852c7 Mon Sep 17 00:00:00 2001
From: "Sunil Sharma (OpenERP)" <sunilsharma.sharma07@gmail.com>
Date: Mon, 7 Oct 2013 15:20:51 +0530
Subject: [PATCH 48/57] [IMP]:account:improve accountview

bzr revid: sunilsharma.sharma07@gmail.com-20131007095051-a7ug7f745udw62ga
---
 addons/account/account_view.xml | 64 ++++++++++++++++-----------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index b82b3c12fbf..eaa4223b7e0 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2275,6 +2275,36 @@
                         </group>
                     </group>
                     <notebook>
+                    	<page string="Cash Transactions" attrs="{'invisible': [('state','=','draft')]}">
+                            <field name="line_ids" context="{'date':date}">
+                                <tree editable="bottom" string="Statement lines">
+                                    <field name="sequence" invisible="1"/>
+                                    <field name="date"/>
+                                    <field name="name"/>
+                                    <field name="ref"/>
+                                    <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
+                                    <field name="type" on_change="onchange_type(partner_id, type)"/>
+                                    <field domain="[('journal_id','=',parent.journal_id), ('company_id', '=', parent.company_id)]" name="account_id"/>
+                                    <field name="analytic_account_id" domain="[('company_id', '=', parent.company_id), ('type', '&lt;&gt;', 'view')]" groups="analytic.group_analytic_accounting" />
+                                    <field name="amount"/>
+                                </tree>
+                                <form string="Statement lines" version="7.0">
+                                    <group col="4">
+                                        <field name="date"/>
+                                        <field name="name"/>
+                                        <field name="ref"/>
+                                        <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
+                                        <field name="type" on_change="onchange_type(partner_id, type)"/>
+                                        <field domain="[('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view'), ('company_id', '=', parent.company_id)]" name="account_id"/>
+                                        <field name="analytic_account_id" domain="[('company_id', '=', parent.company_id), ('type', '&lt;&gt;', 'view')]" groups="analytic.group_analytic_accounting" />
+                                        <field name="amount"/>
+                                        <field name="sequence"/>
+                                    </group>
+                                    <separator string="Notes"/>
+                                    <field name="note"/>
+                                </form>
+                            </field>
+                        </page>
                         <page string="Cash Control" attrs="{'invisible' : [('cash_control', '=', False)]}">
                             <group col="2" expand="1">
                                 <group string="Opening Cash Control" attrs="{'invisible' : [('state', '!=', 'draft')]}">
@@ -2308,43 +2338,13 @@
                                 </group>
                             </group>
                         </page>
-                        <page string="Cash Transactions" attrs="{'invisible': [('state','=','draft')]}">
-                            <field name="line_ids" context="{'date':date}">
-                                <tree editable="bottom" string="Statement lines">
-                                    <field name="sequence" invisible="1"/>
-                                    <field name="date"/>
-                                    <field name="name"/>
-                                    <field name="ref"/>
-                                    <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
-                                    <field name="type" on_change="onchange_type(partner_id, type)"/>
-                                    <field domain="[('journal_id','=',parent.journal_id), ('company_id', '=', parent.company_id)]" name="account_id"/>
-                                    <field name="analytic_account_id" domain="[('company_id', '=', parent.company_id), ('type', '&lt;&gt;', 'view')]" groups="analytic.group_analytic_accounting" />
-                                    <field name="amount"/>
-                                </tree>
-                                <form string="Statement lines" version="7.0">
-                                    <group col="4">
-                                        <field name="date"/>
-                                        <field name="name"/>
-                                        <field name="ref"/>
-                                        <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
-                                        <field name="type" on_change="onchange_type(partner_id, type)"/>
-                                        <field domain="[('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view'), ('company_id', '=', parent.company_id)]" name="account_id"/>
-                                        <field name="analytic_account_id" domain="[('company_id', '=', parent.company_id), ('type', '&lt;&gt;', 'view')]" groups="analytic.group_analytic_accounting" />
-                                        <field name="amount"/>
-                                        <field name="sequence"/>
-                                    </group>
-                                    <separator string="Notes"/>
-                                    <field name="note"/>
-                                </form>
-                            </field>
-                        </page>
                         <page string="Journal Entries" attrs="{'invisible': [('state','!=','confirm')]}">
                             <field name="move_line_ids" string="Journal Entries"/>
                         </page>
                     </notebook>
                     <group>
                         <group class="oe_subtotal_footer oe_right">
-                            <field name="balance_start" readonly="1" string="Opening Balance" class="oe_subtotal_footer_separator oe_open_balance" widget="monetary" options="{'currency_field': 'currency'}" help="Total of opening cash control lines"/>
+                            <field name="balance_start" attrs="{'readonly' : [('cash_control', '=', True)]}" string="Opening Balance" class="oe_subtotal_footer_separator oe_open_balance" widget="monetary" options="{'currency_field': 'currency'}" help="Total of opening cash control lines"/>
                             <label for="total_entry_encoding" string="+ Transactions" class="oe_force_bold oe_mini_subtotal_footer_separator"/>
                             <field name="total_entry_encoding" nolabel="1" class="oe_bold oe_account_total" widget="monetary" options="{'currency_field': 'currency'}"/>
                             <label for="balance_end" string="= Theoretical Closing Balance" class="oe_force_bold oe_mini_subtotal_footer_separator" help="Sum of opening balance and transactions."/>
@@ -2352,7 +2352,7 @@
                         </group>
                         <div>
                             <group class="oe_subtotal_footer oe_right" attrs="{'invisible': [('state', '=', 'draft')]}">
-                                <field name="balance_end_real" readonly="1" string="Real Closing Balance" class="oe_subtotal_footer_separator oe_real_closing_balance" widget="monetary" options="{'currency_field': 'currency'}" help="Total of closing cash control lines."/>
+                                <field name="balance_end_real" attrs="{'readonly' : [('cash_control', '=', True)]}" string="Real Closing Balance" class="oe_subtotal_footer_separator oe_real_closing_balance" widget="monetary" options="{'currency_field': 'currency'}" help="Total of closing cash control lines."/>
                             </group>
                             <group/>
                             <group/>

From 5bd847b751d02ce4cab36f5340a668ce29a28fc3 Mon Sep 17 00:00:00 2001
From: "Sunil Sharma (OpenERP)" <sunilsharma.sharma07@gmail.com>
Date: Mon, 7 Oct 2013 16:30:30 +0530
Subject: [PATCH 49/57] [IMP]:account:improve accountview inline css

bzr revid: sunilsharma.sharma07@gmail.com-20131007110030-9anpjxohswigh95f
---
 addons/account/account_view.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index eaa4223b7e0..a2283c2389a 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2344,10 +2344,11 @@
                     </notebook>
                     <group>
                         <group class="oe_subtotal_footer oe_right">
-                            <field name="balance_start" attrs="{'readonly' : [('cash_control', '=', True)]}" string="Opening Balance" class="oe_subtotal_footer_separator oe_open_balance" widget="monetary" options="{'currency_field': 'currency'}" help="Total of opening cash control lines"/>
-                            <label for="total_entry_encoding" string="+ Transactions" class="oe_force_bold oe_mini_subtotal_footer_separator"/>
+                        	<label for="balance_start"  class="oe_subtotal_footer_separator oe_open_balance"  string="Opening Balance" style="padding-right: 23px !important;"/>
+                            <field name="balance_start" attrs="{'readonly' : [('cash_control', '=', True)]}" string="Opening Balance" class="oe_subtotal_footer_separator oe_open_balance" widget="monetary" options="{'currency_field': 'currency'}" help="Total of opening cash control lines" nolabel="1"/>
+                            <label for="total_entry_encoding" string="+ Transactions" class="oe_force_bold oe_mini_subtotal_footer_separator" style="padding-right: 20px !important;"/>
                             <field name="total_entry_encoding" nolabel="1" class="oe_bold oe_account_total" widget="monetary" options="{'currency_field': 'currency'}"/>
-                            <label for="balance_end" string="= Theoretical Closing Balance" class="oe_force_bold oe_mini_subtotal_footer_separator" help="Sum of opening balance and transactions."/>
+                            <label for="balance_end" string="= Theoretical Closing Balance" class="oe_force_bold oe_mini_subtotal_footer_separator" help="Sum of opening balance and transactions." style="padding-right: 20px !important;"/>
                             <field name="balance_end" nolabel="1" class="oe_bold oe_account_total" widget="monetary" options="{'currency_field': 'currency'}"/>
                         </group>
                         <div>

From cf1236e79febea880e63344dfdeb3df668e1d83d Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Mon, 7 Oct 2013 17:22:30 +0530
Subject: [PATCH 50/57] [IMP] Improved code and indents.

bzr revid: psa@tinyerp.com-20131007115230-f8yvrevrswemvdb8
---
 addons/account/account_view.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index a2283c2389a..23ed0ccfb89 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2275,7 +2275,7 @@
                         </group>
                     </group>
                     <notebook>
-                    	<page string="Cash Transactions" attrs="{'invisible': [('state','=','draft')]}">
+                        <page string="Cash Transactions" attrs="{'invisible': [('state','=','draft')]}">
                             <field name="line_ids" context="{'date':date}">
                                 <tree editable="bottom" string="Statement lines">
                                     <field name="sequence" invisible="1"/>
@@ -2344,11 +2344,11 @@
                     </notebook>
                     <group>
                         <group class="oe_subtotal_footer oe_right">
-                        	<label for="balance_start"  class="oe_subtotal_footer_separator oe_open_balance"  string="Opening Balance" style="padding-right: 23px !important;"/>
-                            <field name="balance_start" attrs="{'readonly' : [('cash_control', '=', True)]}" string="Opening Balance" class="oe_subtotal_footer_separator oe_open_balance" widget="monetary" options="{'currency_field': 'currency'}" help="Total of opening cash control lines" nolabel="1"/>
+                            <label for="balance_start" class="oe_subtotal_footer_separator oe_open_balance" string="Opening Balance" style="padding-right: 23px !important;"/>
+                            <field name="balance_start" attrs="{'readonly' : [('cash_control', '=', True)]}" nolabel="1" string="Opening Balance" class="oe_subtotal_footer_separator oe_open_balance" widget="monetary" options="{'currency_field': 'currency'}" help="Total of opening cash control lines"/>
                             <label for="total_entry_encoding" string="+ Transactions" class="oe_force_bold oe_mini_subtotal_footer_separator" style="padding-right: 20px !important;"/>
                             <field name="total_entry_encoding" nolabel="1" class="oe_bold oe_account_total" widget="monetary" options="{'currency_field': 'currency'}"/>
-                            <label for="balance_end" string="= Theoretical Closing Balance" class="oe_force_bold oe_mini_subtotal_footer_separator" help="Sum of opening balance and transactions." style="padding-right: 20px !important;"/>
+                            <label for="balance_end" string="= Theoretical Closing Balance" class="oe_force_bold oe_mini_subtotal_footer_separator" style="padding-right: 20px !important;" help="Sum of opening balance and transactions."/>
                             <field name="balance_end" nolabel="1" class="oe_bold oe_account_total" widget="monetary" options="{'currency_field': 'currency'}"/>
                         </group>
                         <div>

From 878815b5cfde2c56571bdf3c344207d8ad9d65bb Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Mon, 7 Oct 2013 18:56:16 +0530
Subject: [PATCH 51/57] [IMP] Improved the positioning of the label and the
 field.

bzr revid: psa@tinyerp.com-20131007132616-81o4wyu0xud2bqbm
---
 addons/account/account_view.xml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 23ed0ccfb89..88e3ae7843c 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2344,8 +2344,8 @@
                     </notebook>
                     <group>
                         <group class="oe_subtotal_footer oe_right">
-                            <label for="balance_start" class="oe_subtotal_footer_separator oe_open_balance" string="Opening Balance" style="padding-right: 23px !important;"/>
-                            <field name="balance_start" attrs="{'readonly' : [('cash_control', '=', True)]}" nolabel="1" string="Opening Balance" class="oe_subtotal_footer_separator oe_open_balance" widget="monetary" options="{'currency_field': 'currency'}" help="Total of opening cash control lines"/>
+                            <label for="balance_start" class="oe_subtotal_footer_separator oe_open_balance" string="Opening Balance" style="padding-right: 23px !important; padding-top: 6px !important;"/>
+                            <field name="balance_start" attrs="{'readonly' : [('cash_control', '=', True)]}" nolabel="1" widget="monetary" class="oe_subtotal_footer_separator oe_open_balance" options="{'currency_field': 'currency'}" help="Total of opening cash control lines"/>
                             <label for="total_entry_encoding" string="+ Transactions" class="oe_force_bold oe_mini_subtotal_footer_separator" style="padding-right: 20px !important;"/>
                             <field name="total_entry_encoding" nolabel="1" class="oe_bold oe_account_total" widget="monetary" options="{'currency_field': 'currency'}"/>
                             <label for="balance_end" string="= Theoretical Closing Balance" class="oe_force_bold oe_mini_subtotal_footer_separator" style="padding-right: 20px !important;" help="Sum of opening balance and transactions."/>
@@ -2353,12 +2353,15 @@
                         </group>
                         <div>
                             <group class="oe_subtotal_footer oe_right" attrs="{'invisible': [('state', '=', 'draft')]}">
-                                <field name="balance_end_real" attrs="{'readonly' : [('cash_control', '=', True)]}" string="Real Closing Balance" class="oe_subtotal_footer_separator oe_real_closing_balance" widget="monetary" options="{'currency_field': 'currency'}" help="Total of closing cash control lines."/>
+                                <label for="balance_end_real" class="oe_subtotal_footer_separator oe_real_closing_balance" string="Real Closing Balance" style="padding-right: 23px !important; padding-top: 6px !important;"/>
+                                <field name="balance_end_real" attrs="{'readonly' : [('cash_control', '=', True)]}" nolabel="1" class="oe_subtotal_footer_separator oe_real_closing_balance" widget="monetary" options="{'currency_field': 'currency'}" help="Total of closing cash control lines."/>
+
                             </group>
                             <group/>
                             <group/>
                             <group class="oe_subtotal_footer oe_right" attrs="{'invisible': [('state', '=', 'draft')]}">
-                                <field name="difference" class="oe_subtotal_footer_separator oe_difference" widget="monetary" options="{'currency_field': 'currency'}"/>
+                                <label for="difference" string="Difference" class="oe_subtotal_footer_separator oe_difference" style="padding-right: 20px !important;"/>
+                                <field name="difference" nolabel="1" class="oe_subtotal_footer_separator oe_difference" widget="monetary" options="{'currency_field': 'currency'}"/>
                             </group>
                         </div>
                     </group>

From 7d0e4e5fed98b014145b5387436ca8a132122c04 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Fri, 11 Oct 2013 18:18:16 +0530
Subject: [PATCH 52/57] [IMP] Improved attrs.

bzr revid: psa@tinyerp.com-20131011124816-xk990kd0vpg5tvtn
---
 addons/account/account_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 88e3ae7843c..1f5193d80e3 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2345,7 +2345,7 @@
                     <group>
                         <group class="oe_subtotal_footer oe_right">
                             <label for="balance_start" class="oe_subtotal_footer_separator oe_open_balance" string="Opening Balance" style="padding-right: 23px !important; padding-top: 6px !important;"/>
-                            <field name="balance_start" attrs="{'readonly' : [('cash_control', '=', True)]}" nolabel="1" widget="monetary" class="oe_subtotal_footer_separator oe_open_balance" options="{'currency_field': 'currency'}" help="Total of opening cash control lines"/>
+                            <field name="balance_start" attrs="{'readonly' : ['|', ('cash_control', '=', True), ('state', '=', 'confirm')]}" nolabel="1" widget="monetary" class="oe_subtotal_footer_separator oe_open_balance" options="{'currency_field': 'currency'}" help="Total of opening cash control lines"/>
                             <label for="total_entry_encoding" string="+ Transactions" class="oe_force_bold oe_mini_subtotal_footer_separator" style="padding-right: 20px !important;"/>
                             <field name="total_entry_encoding" nolabel="1" class="oe_bold oe_account_total" widget="monetary" options="{'currency_field': 'currency'}"/>
                             <label for="balance_end" string="= Theoretical Closing Balance" class="oe_force_bold oe_mini_subtotal_footer_separator" style="padding-right: 20px !important;" help="Sum of opening balance and transactions."/>
@@ -2354,7 +2354,7 @@
                         <div>
                             <group class="oe_subtotal_footer oe_right" attrs="{'invisible': [('state', '=', 'draft')]}">
                                 <label for="balance_end_real" class="oe_subtotal_footer_separator oe_real_closing_balance" string="Real Closing Balance" style="padding-right: 23px !important; padding-top: 6px !important;"/>
-                                <field name="balance_end_real" attrs="{'readonly' : [('cash_control', '=', True)]}" nolabel="1" class="oe_subtotal_footer_separator oe_real_closing_balance" widget="monetary" options="{'currency_field': 'currency'}" help="Total of closing cash control lines."/>
+                                <field name="balance_end_real" attrs="{'readonly' : ['|', ('cash_control', '=', True), ('state', '=', 'confirm')]}" nolabel="1" class="oe_subtotal_footer_separator oe_real_closing_balance" widget="monetary" options="{'currency_field': 'currency'}" help="Total of closing cash control lines."/>
 
                             </group>
                             <group/>

From bd7a61b8ff6003e7b4f1a2887b517d8c131ce747 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Tue, 15 Oct 2013 12:12:47 +0530
Subject: [PATCH 53/57] [IMP] Added attrs for closing balance.

bzr revid: psa@tinyerp.com-20131015064247-ibvmy8b8wzqjtklm
---
 addons/account/account_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 1f5193d80e3..f6ed05e554a 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2327,7 +2327,7 @@
                                         </field>
                                     </group>
                                     <group string="Closing Cash Control" attrs="{'invisible' : [('state', '=', 'draft')]}">
-                                        <field name="closing_details_ids" colspan="2" nolabel="1">
+                                        <field name="closing_details_ids" colspan="2" nolabel="1" attrs="{'readonly' : [('state', '=', 'confirm')]}">
                                             <tree string="Closing Cashbox Lines" editable="bottom">
                                                 <field name="pieces" readonly="1" />
                                                 <field name="number_closing" on_change="on_change_sub_closing(pieces, number_closing)"/>

From dd18cff8787c2d8c40dc040c74428df5e24a5391 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Tue, 15 Oct 2013 13:08:57 +0530
Subject: [PATCH 54/57] [IMP] Added attrs for closing balance in pos.

bzr revid: psa@tinyerp.com-20131015073857-b3izcxgn51q25jd0
---
 addons/point_of_sale/point_of_sale_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 568c1b5fb42..3ab930d47d4 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -905,7 +905,7 @@
                             </group>
                             <newline/>
                             <group string="Opening Cash Control" attrs="{'invisible' : [('cash_control', '=', False)]}">
-                                <field name="opening_details_ids" nolabel="1" colspan="2" attrs="{'readonly' : [('state', 'not in', ('opening_control',))]}">
+                                <field name="opening_details_ids" nolabel="1" colspan="2" attrs="{'readonly' : [('state', '!=', 'opening_control')]}">
                                     <tree string="Opening Cashbox Lines" editable="bottom">
                                         <field name="pieces" readonly="1" />
                                         <field name="number_opening" on_change="on_change_sub_opening(pieces, number_opening)" />
@@ -914,7 +914,7 @@
                                 </field>
                             </group>
                             <group string="Closing Cash Control" attrs="{'invisible': ['|', ('cash_control', '=', False), ('state', '=', 'opening_control')]}">
-                                <field name="details_ids" nolabel="1" colspan="2">
+                                <field name="details_ids" nolabel="1" colspan="2" attrs="{'readonly' : [('state', '=', 'closed')]}">
                                     <tree string="Cashbox Lines" editable="bottom">
                                         <field name="pieces" readonly="1" />
                                         <field name="number_closing" on_change="on_change_sub_closing(pieces, number_closing)"/>

From 4a290baa5e4d1b9706849eee2ab46fc3c06a9eea Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Thu, 14 Nov 2013 14:52:11 +0530
Subject: [PATCH 55/57] [IMP]: opening balance should be 0 if Opening with last
 Closing balance is false

bzr revid: aja@tinyerp.com-20131114092211-qn3rqj8b1kyyfah6
---
 addons/account/account_bank_statement.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 700ec0dec0a..fda9390d0c1 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -450,7 +450,8 @@ class account_bank_statement(osv.osv):
 
     def _compute_balance_end_real(self, cr, uid, journal_id, context=None):
         res = False
-        if journal_id:
+        journal = self.pool.get('account.journal').browse(cr, uid, journal_id,context=context)
+        if journal_id and journal.with_last_closing_balance:
             cr.execute('SELECT balance_end_real \
                     FROM account_bank_statement \
                     WHERE journal_id = %s AND NOT state = %s \

From e8beafdce3dbabb9e066d6c2422509c3b7a9162d Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Fri, 15 Nov 2013 16:37:46 +0530
Subject: [PATCH 56/57] [IMP] Improved code for the condition when the Opening
 With Last closing Balance is marked true.

bzr revid: psa@tinyerp.com-20131115110746-omzn51lsqhnctsqn
---
 addons/account/account_bank_statement.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index fda9390d0c1..536b7a0ac04 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -450,8 +450,8 @@ class account_bank_statement(osv.osv):
 
     def _compute_balance_end_real(self, cr, uid, journal_id, context=None):
         res = False
-        journal = self.pool.get('account.journal').browse(cr, uid, journal_id,context=context)
-        if journal_id and journal.with_last_closing_balance:
+        journal = self.pool.get('account.journal').browse(cr, uid, journal_id, context=context)
+        if journal.with_last_closing_balance:
             cr.execute('SELECT balance_end_real \
                     FROM account_bank_statement \
                     WHERE journal_id = %s AND NOT state = %s \

From 7980ac78ae83d74b59285bd99f97b43b1f3ccce4 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Mon, 30 Dec 2013 12:54:52 +0530
Subject: [PATCH 57/57] [IMP] Improved code as per the suggestions on the Merge
 proposal.

bzr revid: psa@tinyerp.com-20131230072452-zew8ys6lqomzxcsm
---
 addons/account/account_bank_statement.py | 14 +++++++-------
 addons/account/account_cash_statement.py | 12 ++++++------
 addons/account/account_view.xml          |  1 -
 addons/point_of_sale/point_of_sale.py    | 19 +++++++++----------
 4 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 536b7a0ac04..a52c9907f9e 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -451,18 +451,18 @@ class account_bank_statement(osv.osv):
     def _compute_balance_end_real(self, cr, uid, journal_id, context=None):
         res = False
         journal = self.pool.get('account.journal').browse(cr, uid, journal_id, context=context)
-        if journal.with_last_closing_balance:
-            cr.execute('SELECT balance_end_real \
-                    FROM account_bank_statement \
-                    WHERE journal_id = %s AND NOT state = %s \
-                    ORDER BY date DESC,id DESC LIMIT 1', (journal_id, 'draft'))
-            res = cr.fetchone()
+        if journal_id:
+            if journal.with_last_closing_balance:
+                cr.execute('SELECT balance_end_real \
+                      FROM account_bank_statement \
+                      WHERE journal_id = %s AND NOT state = %s \
+                      ORDER BY date DESC,id DESC LIMIT 1', (journal_id, 'draft'))
+                res = cr.fetchone()
         return res and res[0] or 0.0
 
     def onchange_journal_id(self, cr, uid, statement_id, journal_id, context=None):
         if not journal_id:
             return {}
-        res = {}
         balance_start = self._compute_balance_end_real(cr, uid, journal_id, context=context)
         journal = self.pool.get('account.journal').browse(cr, uid, journal_id, context=context)
         currency = journal.currency or journal.company_id.currency_id
diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py
index f23c87424ed..aa75227cfd1 100644
--- a/addons/account/account_cash_statement.py
+++ b/addons/account/account_cash_statement.py
@@ -220,9 +220,9 @@ class account_cash_statement(osv.osv):
         return details_ids
 
     def create(self, cr, uid, vals, context=None):
-        journal_id = vals.get('journal_id',False)
-        if journal_id:
-            vals['opening_details_ids'] = vals.get('opening_details_ids',False) or self._get_cash_open_box_lines(cr, uid, journal_id, context)
+        journal_id = vals.get('journal_id')
+        if journal_id and not vals.get('opening_details_ids'):
+            vals['opening_details_ids'] = vals.get('opening_details_ids') or self._get_cash_open_box_lines(cr, uid, journal_id, context)
         res_id = super(account_cash_statement, self).create(cr, uid, vals, context=context)
         self._update_balances(cr, uid, [res_id], context)
         return res_id
@@ -241,10 +241,10 @@ class account_cash_statement(osv.osv):
         @return: True on success, False otherwise
         """
 
-        cashbox_pool = self.pool.get('account.cashbox.line')
+        cashbox_line_obj = self.pool.get('account.cashbox.line')
         if vals.get('journal_id', False):
-            cashbox_ids = cashbox_pool.search(cr, uid, [('bank_statement_id', 'in', ids)], context=context)
-            cashbox_pool.unlink(cr, uid, cashbox_ids, context)            
+            cashbox_ids = cashbox_line_obj.search(cr, uid, [('bank_statement_id', 'in', ids)], context=context)
+            cashbox_line_obj.unlink(cr, uid, cashbox_ids, context)
         res = super(account_cash_statement, self).write(cr, uid, ids, vals, context=context)
         self._update_balances(cr, uid, ids, context)
         return res
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index f6ed05e554a..60821c2b454 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2355,7 +2355,6 @@
                             <group class="oe_subtotal_footer oe_right" attrs="{'invisible': [('state', '=', 'draft')]}">
                                 <label for="balance_end_real" class="oe_subtotal_footer_separator oe_real_closing_balance" string="Real Closing Balance" style="padding-right: 23px !important; padding-top: 6px !important;"/>
                                 <field name="balance_end_real" attrs="{'readonly' : ['|', ('cash_control', '=', True), ('state', '=', 'confirm')]}" nolabel="1" class="oe_subtotal_footer_separator oe_real_closing_balance" widget="monetary" options="{'currency_field': 'currency'}" help="Total of closing cash control lines."/>
-
                             </group>
                             <group/>
                             <group/>
diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index ef3c153de40..5dc39197a2a 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -46,16 +46,15 @@ class pos_config(osv.osv):
     ]
 
     def _get_currency(self, cr, uid, ids, fieldnames, args, context=None):
-         result = {}
-         currency_id = False
-         user = self.pool.get('res.users')
-         for pos_config in self.browse(cr, uid, ids, context=context):
-             if pos_config.journal_id:
-                 currency_id = pos_config.journal_id.currency.id or pos_config.journal_id.company_id.currency_id.id
-             else:
-                 currency_id = user.browse(cr, uid, pos_config.id, context=context).company_id.currency_id.id
-             result[pos_config.id] = currency_id
-         return result
+        result = dict.fromkeys(ids, False)
+        user = self.pool.get('res.users')
+        for pos_config in self.browse(cr, uid, ids, context=context):
+            if pos_config.journal_id:
+                currency_id = pos_config.journal_id.currency.id or pos_config.journal_id.company_id.currency_id.id
+            else:
+                currency_id = user.browse(cr, uid, uid, context=context).company_id.currency_id.id
+            result[pos_config.id] = currency_id
+        return result
 
     _columns = {
         'name' : fields.char('Point of Sale Name', size=32, select=1,