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 1/4] [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 2/4] 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 3/4] [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 4/4] [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>