From 17358373e35c3493a48cf566e2675f52d0ae88c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= <> Date: Fri, 26 Aug 2011 15:27:26 +0530 Subject: [PATCH 1/2] [FIX] account : default date on statement lines should be the statement date lp bug: https://launchpad.net/bugs/833049 fixed bzr revid: bde@tinyerp.com-20110826095726-0duq2iuhjzpnzh90 --- addons/account/account_bank_statement.py | 2 +- addons/account/account_view.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py index f712cc9ab0c..53610a7106a 100644 --- a/addons/account/account_bank_statement.py +++ b/addons/account/account_bank_statement.py @@ -470,7 +470,7 @@ class account_bank_statement_line(osv.osv): } _defaults = { 'name': lambda self,cr,uid,context={}: self.pool.get('ir.sequence').get(cr, uid, 'account.bank.statement.line'), - 'date': lambda *a: time.strftime('%Y-%m-%d'), + 'date': lambda self,cr,uid,context={}: context.get('date', time.strftime('%Y-%m-%d')), 'type': 'general', } diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 5de205e1690..a77d7eb0bb1 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -564,7 +564,7 @@ - + From d7a3a1d7abb6a881bfee3712bc3abecbe28102b9 Mon Sep 17 00:00:00 2001 From: "Bharat (OpenERP)" Date: Mon, 29 Aug 2011 17:53:28 +0530 Subject: [PATCH 2/2] [FIX] Applied changes for cash register too bzr revid: bde@tinyerp.com-20110829122328-kgue1z0rob1zbwtp --- addons/account/account_cash_statement.py | 2 +- addons/account/account_view.xml | 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 982383ea2a7..f2c28dd541b 100644 --- a/addons/account/account_cash_statement.py +++ b/addons/account/account_cash_statement.py @@ -234,7 +234,7 @@ class account_cash_statement(osv.osv): } _defaults = { 'state': 'draft', - 'date': lambda *a: time.strftime("%Y-%m-%d %H:%M:%S"), + 'date': lambda self,cr,uid,context={}: context.get('date', time.strftime("%Y-%m-%d %H:%M:%S")), 'user_id': lambda self, cr, uid, context=None: uid, 'starting_details_ids': _get_cash_open_box_lines, 'ending_details_ids': _get_default_cash_close_box_lines diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index a77d7eb0bb1..b4696346b60 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -2563,7 +2563,7 @@ action = self.pool.get('res.config').next(cr, uid, [], context) - +