diff options
| author | Fabien Pinckaers <fp@tinyerp.com> | 2011-09-24 17:02:34 +0200 |
|---|---|---|
| committer | Fabien Pinckaers <fp@tinyerp.com> | 2011-09-24 17:02:34 +0200 |
| commit | 7cbfe6118e26ff7ae3cdbb7552f54d046a214bb1 (patch) | |
| tree | 8f508566bfb9655e20131f1c2443cbc6ab5b7a4d | |
| parent | 4eb55630084d96d417a5e7fbe038516b40ab6cbd (diff) | |
| parent | 42f37bcdf586e1b925e620cf4c1025ec4ba306cc (diff) | |
merge
bzr revid: fp@tinyerp.com-20110924150234-ffaq5wjyfkldo37t
| -rw-r--r-- | addons/account/account_bank_statement.py | 2 | ||||
| -rw-r--r-- | addons/account/account_cash_statement.py | 2 | ||||
| -rw-r--r-- | addons/account/account_view.xml | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py index d3386d9ac6d..f1570caab91 100644 --- a/addons/account/account_bank_statement.py +++ b/addons/account/account_bank_statement.py @@ -465,7 +465,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_cash_statement.py b/addons/account/account_cash_statement.py index 3957e75c860..e856454703f 100644 --- a/addons/account/account_cash_statement.py +++ b/addons/account/account_cash_statement.py @@ -194,7 +194,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 cead56bfca8..45345554605 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -564,7 +564,7 @@ </group> <notebook colspan="4"> <page string="Transaction" name="statement_line_ids"> - <field colspan="4" name="line_ids" nolabel="1"> + <field colspan="4" name="line_ids" nolabel="1" context="{'date':date}"> <tree editable="bottom" string="Statement lines"> <field name="sequence" readonly="1" invisible="1"/> <field name="date" groups="base.group_extended"/> @@ -2564,7 +2564,7 @@ action = pool.get('res.config').next(cr, uid, [], context) <notebook colspan="4"> <page string="Cash Transactions" attrs="{'invisible': [('state','=','draft')]}"> - <field colspan="4" name="line_ids" nolabel="1"> + <field colspan="4" name="line_ids" nolabel="1" context="{'date':date}"> <tree editable="bottom" string="Statement lines"> <field name="sequence" invisible="1"/> <field name="date" groups="base.group_extended"/> |