[MERGE] various changes
account: use context in pos box actions, avoid traceback when cashout account_followup: allow grouping by country document_page: allow grouping by author bzr revid: mat@openerp.com-20130528141917-0hdp1qkf6pn914x5
This commit is contained in:
commit
1c59463ddc
|
@ -22,7 +22,7 @@ class CashBox(osv.osv_memory):
|
|||
|
||||
records = self.pool.get(active_model).browse(cr, uid, active_ids, context=context)
|
||||
|
||||
return self._run(cr, uid, ids, records, context=None)
|
||||
return self._run(cr, uid, ids, records, context=context)
|
||||
|
||||
def _run(self, cr, uid, ids, records, context=None):
|
||||
for box in self.browse(cr, uid, ids, context=context):
|
||||
|
|
|
@ -14,6 +14,7 @@
|
|||
<field name="payment_next_action_date"/>
|
||||
<field name="payment_next_action"/>
|
||||
<field name="user_id" invisible="1"/>
|
||||
<field name="country_id" invisible="1"/>
|
||||
<field name="parent_id" invisible="1"/>
|
||||
<field name="payment_responsible_id"/>
|
||||
<field name="payment_earliest_due_date"/>
|
||||
|
|
|
@ -26,6 +26,7 @@
|
|||
<tree string="Document Page">
|
||||
<field name="name"/>
|
||||
<field name="parent_id"/>
|
||||
<field name="create_uid" invisible="1"/>
|
||||
<field name="write_uid"/>
|
||||
<field name="write_date"/>
|
||||
</tree>
|
||||
|
|
Loading…
Reference in New Issue