diff options
| author | nel@tinyerp.com <> | 2010-06-16 13:15:00 +0200 |
|---|---|---|
| committer | nel@tinyerp.com <> | 2010-06-16 13:15:00 +0200 |
| commit | 39adfe070f8f41cc7cf2aa8fbd4f8d7221b9986a (patch) | |
| tree | 1595eb2bf266f82bf043ca7748d4a4652a0bd34d | |
| parent | 80fcbdb4d66f88c7f0f663c5aa7edda847f22ec5 (diff) | |
[FIX] sale orders dates
bzr revid: nel@tinyerp.com-20100616111500-hm9u1np13tt8nlnn
| -rw-r--r-- | addons/sale_order_dates/sale.py | 3 | ||||
| -rw-r--r-- | addons/stock/stock_view.xml | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/addons/sale_order_dates/sale.py b/addons/sale_order_dates/sale.py index 1b4bad360e6..877199b32ad 100644 --- a/addons/sale_order_dates/sale.py +++ b/addons/sale_order_dates/sale.py @@ -48,7 +48,8 @@ class sale_order_dates(osv.osv): dt=DateTime.strptime(order.date_order, '%Y-%m-%d') + DateTime.RelativeDateTime(days=line.delay or 0.0) dt_s = dt.strftime('%Y-%m-%d') dates_list.append(dt_s) - res[order.id] = min(dates_list) + if dates_list: + res[order.id] = min(dates_list) return res _columns = { diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index ab33b07aacb..3fdfda9e057 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -322,6 +322,7 @@ <field name="date_planned" string="Date"/> <field name="date_expected" string="Date Expected"/> <field name="state"/> + <button name="action_done" states="confirmed,assigned" string="Done" type="object" icon="gtk-jump-to"/> </tree> </field> </record> |