[MERGE] merge

bzr revid: nel@tinyerp.com-20100329090309-vholpuokg2y5uh0g
2010-03-29 11:03:09 +02:00
parent 284d02eafa 2b6955d426
commit 86c193ad0e
2 changed files with 67 additions and 57 deletions
@@ -0,0 +1,60 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import netsvc
+from osv import osv,fields
+from tools.translate import _
+from mx import DateTime
+import time
+
+class all_closed_cashbox_of_the_day(osv.osv_memory):
+    _name = 'all.closed.cashbox.of.the.day'
+    _description = 'All closed cashbox of the day'
+
+    _columns = {
+                
+    }
+    
+    def print_report(self, cr, uid, ids, context=None):
+
+        """ 
+             To get the date and print the report 
+                       
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param context: A standard dictionary 
+             @return : retrun report
+        """        
+        datas = {'ids' : context.get('active_ids',[])}
+        res =  {}        
+        datas['form'] = res
+        
+        return { 
+                'type' : 'ir.actions.report.xml',
+                'report_name':'all.closed.cashbox.of.the.day',
+                'datas' : datas,               
+       }
+
+all_closed_cashbox_of_the_day()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
@@ -20,69 +20,19 @@
 #
 ##############################################################################

-#import wizard
-#import pooler
-#from tools.misc import UpdateableStr
-#
-#import netsvc
-#import time
-#
-#from tools.translate import _
-#from decimal import Decimal
-
-#arch=UpdateableStr()
-#fields={}
+import wizard
+import pooler
+from tools.misc import UpdateableStr

 import netsvc
-from osv import osv,fields
-from tools.translate import _
-from mx import DateTime
 import time

+from tools.translate import _
+from decimal import Decimal

-class pos_return(osv.osv_memory):
-    _name = 'pos.return'
-    _description = 'Point of sale return'

-    _columns = {
-                
-    }
-pos_return()
-
-class pos_add_payment(osv.osv_memory):
-    _name = 'pos.add.payment'
-    _description = 'Add Payment'
-
-    _columns = {
-        'amount': fields.float('Amount', digits=(16,2),required=True),
-        'journal': fields.function(_get_journal, 'Journal', method=True, required=True),
-        'payment_date': fields.date('Payment date',required=True),
-        'payment_name': fields.char('Payment name', size=32,required=True),
-        'invoice_wanted': fields.boolean('Invoice'),
-        'num_sale': fields.char('Num.Cof', size=32)        
-    }
-    _defaults = {
-          'payment_name': lambda *a: 'Payment'
-        }
-
-pos_add_payment()
-
-class pos_add_product(osv.osv_memory):
-    _name = 'pos.add.product'
-    _description = 'Add Product'
-
-    _columns = {
-        'product': fields.many2one('product.product','Product', required=True),
-        'quantity': fields.integer( 'Quantity',required=True),
-             
-    }
-
-    _defaults = {
-          'product': lambda *a: 'False',
-          'quantity': lambda *a: 1
-        }
-
-pos_add_product()
+arch=UpdateableStr()
+fields={}


 def _get_journal(self, cr, uid, context):