diff options
| author | Fabien Pinckaers <fp@tinyerp.com> | 2013-07-30 10:20:08 +0200 |
|---|---|---|
| committer | Fabien Pinckaers <fp@tinyerp.com> | 2013-07-30 10:20:08 +0200 |
| commit | 30e30a3bf62fae355c3fca7e3595c96cd60c91ef (patch) | |
| tree | 984b88b6ab2e184a8de4ce48976f90d245fff8e5 | |
| parent | 6a30d52a6f0076a43b0680b1ef9a03e600a05e8a (diff) | |
[FIX] picking view
bzr revid: fp@tinyerp.com-20130730082008-4lpw4wmqoo0heik7
| -rw-r--r-- | addons/stock/stock.py | 5 | ||||
| -rw-r--r-- | addons/stock/stock_view.xml | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/addons/stock/stock.py b/addons/stock/stock.py index 8606ee4f76c..3621f19d7ae 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -2066,7 +2066,7 @@ class stock_picking_type(osv.osv): ('date', '>=', groupby_begin), ('date', '<', groupby_end), ] - res[id] = self.__get_bar_values(cr, uid, obj, created_domain, ['date'], '__count', 'date', context=context) + res[id] = self.__get_bar_values(cr, uid, obj, created_domain, ['date'], 'picking_type_id_count', 'date', context=context) return res def _get_picking_count(self, cr, uid, ids, field_names, arg, context=None): @@ -2082,7 +2082,8 @@ class stock_picking_type(osv.osv): data = obj.read_group(cr, uid, domains[field] + [('state', 'not in',('done','cancel','draft')), ('picking_type_id', 'in', ids)], ['picking_type_id'], ['picking_type_id'], context=context) - count = dict(map(lambda x: (x['picking_type_id'], x['__count']), data)) + print data + count = dict(map(lambda x: (x['picking_type_id'], x['picking_type_id_count']), data)) for tid in ids: result.setdefault(tid, {})[field] = count.get(tid, 0) for tid in ids: diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index 9771ce0826f..3ae6147f668 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -580,13 +580,15 @@ <field name="model">stock.picking</field> <field eval="12" name="priority"/> <field name="arch" type="xml"> - <form string="Internal Picking List" version="7.0"> + <form string="Transfer" version="7.0"> <header> - <button name="force_assign" states="draft" string="Confirm" type="object" class="oe_highlight" groups="base.group_user"/> + <button name="action_confirm" states="draft" string="Mark as Todo" type="object" class="oe_highlight" groups="base.group_user"/> <!-- <button name="check_assign" states="confirmed" string="Check Availability" type="object"/> --> + <button name="action_assign" states="confirmed" string="Check Availability" type="object" class="oe_highlight" groups="base.group_user"/> <button name="force_assign" states="confirmed" string="Force Availability" type="object" class="oe_highlight" groups="base.group_user"/> + <button name="action_done" states="assigned" string="Total Transfer" groups="stock.group_stock_user" type="object" class="oe_highlight"/> - <button name="do_prepare_partial" states="assigned" string="(prepare) Partial Transfer" groups="stock.group_stock_user" type="object" class="oe_highlight" attrs="{'invisible': [('pack_operation_ids','<>',False)]}"/> + <button name="do_prepare_partial" states="assigned" string="(prepare) Partial Transfer" groups="stock.group_stock_user" type="object" class="oe_highlight"/> <button name="do_partial" states="assigned" string="Partial Transfer" groups="stock.group_stock_user" type="object" class="oe_highlight" attrs="{'invisible': [('pack_operation_ids','=',False)]}"/> <button name="%(act_stock_return_picking)d" string="Reverse Transfer" states="done" type="action" groups="base.group_user"/> <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel Transfer" groups="base.group_user"/> |