From 938ae552fa4fc5f46837363a20ee8e9527e5fd76 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Mon, 16 Apr 2012 13:36:33 +0200
Subject: [PATCH] [IMP] account: load the pieces of the currency in the cash
 register

bzr revid: stw@openerp.com-20120416113633-418a4s4h55hchwkr
---
 addons/account/account_cash_statement.py | 17 +++++++++++++++--
 addons/account/account_view.xml          |  5 ++---
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py
index eaa11515355..6db6a65bc4d 100644
--- a/addons/account/account_cash_statement.py
+++ b/addons/account/account_cash_statement.py
@@ -327,10 +327,21 @@ class account_cash_statement(osv.osv):
                 cash_box_line_pool.write(cr, uid, [end.id], {'number': 0})
         return True
 
-    def button_load_cashbox_line(self, cr, uid, ids, context=None):
+    def button_load_cashbox_lines(self, cr, uid, ids, context=None):
         if not ids:
             return False
 
+        proxy_line = self.pool.get('account.cashbox.line')
+
+        for record in self.browse(cr, uid, ids, context=context):
+
+            proxy_line.unlink(cr, uid, [line.id for line in record.starting_details_ids], context=context)
+            proxy_line.unlink(cr, uid, [line.id for line in record.ending_details_ids], context=context)
+
+            for cash in record.journal_id.cashbox_line_ids:
+                proxy_line.create(cr, uid, {'pieces' : cash.pieces, 'starting_id' : record.id }, context=context)
+                proxy_line.create(cr, uid, {'pieces' : cash.pieces, 'ending_id' : record.id}, context=context)
+
         return True
 
 account_cash_statement()
@@ -348,10 +359,12 @@ class account_journal_cashbox_line(osv.osv):
     _name = 'account.journal.cashbox.line'
     _rec_name = 'value'
     _columns = {
-        'value' : fields.float('Value'),
+        'pieces': fields.float('Values', digits_compute=dp.get_precision('Account')),
         'journal_id' : fields.many2one('account.journal', 'Journal', required=True, select=1),
     }
 
+    _order = 'pieces asc'
+
 account_journal_cashbox_line()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index e160890008f..c6eb67fc21f 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -507,7 +507,7 @@
                         <page string="Cash Box">
                             <field name="cashbox_line_ids" nolabel="1">
                                 <tree string="CashBox Lines" editable="bottom">
-                                    <field name="value" />
+                                    <field name="pieces" />
                                 </tree>
                             </field>
                         </page>
@@ -2660,8 +2660,7 @@ action = pool.get('res.config').next(cr, uid, [], context)
                             </field>
                         </page>
                         <page string="CashBox">
-                            <button name="load_cashbox_lines" type="object" string="Load CashBox Lines" />
-                            <field name="cashbox_line_ids" />
+                            <button name="button_load_cashbox_lines" type="object" string="Load CashBox Lines" />
                             <newline />
                             <group col="2" colspan="2" expand="1">
                                 <field name="starting_details_ids" nolabel="1" colspan="2" attrs="{'readonly':[('state','!=','draft')]}">