diff options
Diffstat (limited to 'addons/procurement')
| -rw-r--r-- | addons/procurement/procurement.py | 2 | ||||
| -rw-r--r-- | addons/procurement/procurement_data.xml | 2 | ||||
| -rw-r--r-- | addons/procurement/procurement_view.xml | 2 | ||||
| -rw-r--r-- | addons/procurement/schedulers.py | 2 | ||||
| -rw-r--r-- | addons/procurement/wizard/make_procurement_view.xml | 2 |
5 files changed, 6 insertions, 4 deletions
diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py index 672859db909..93b9417bded 100644 --- a/addons/procurement/procurement.py +++ b/addons/procurement/procurement.py @@ -307,7 +307,7 @@ class procurement_order(osv.osv): move_obj = self.pool.get('stock.move') for procurement in self.browse(cr, uid, ids, context=context): if procurement.product_qty <= 0.00: - raise osv.except_osv(_('Data Insufficient !'), + raise osv.except_osv(_('Data Insufficient!'), _('Please check the quantity in procurement order(s) for the product "%s", it should not be 0 or less!' % procurement.product_id.name)) if procurement.product_id.type in ('product', 'consu'): if not procurement.move_id: diff --git a/addons/procurement/procurement_data.xml b/addons/procurement/procurement_data.xml index 6a83d525c68..52503e76c44 100644 --- a/addons/procurement/procurement_data.xml +++ b/addons/procurement/procurement_data.xml @@ -12,7 +12,7 @@ <field eval="False" name="doall"/> <field eval="'procurement.order'" name="model"/> <field eval="'run_scheduler'" name="function"/> - <field eval="'(False,)'" name="args"/> + <field eval="'(False,True)'" name="args"/> </record> <record id="sequence_mrp_op_type" model="ir.sequence.type"> diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml index 76432157555..a196937619f 100644 --- a/addons/procurement/procurement_view.xml +++ b/addons/procurement/procurement_view.xml @@ -256,7 +256,7 @@ <field name="search_view_id" ref="warehouse_orderpoint_search" /> <field name="help" type="html"> <p class="oe_view_nocontent_create"> - Click to add a reordering rules. + Click to add a reordering rule. </p><p>You can define your minimum stock rules, so that OpenERP will automatically create draft manufacturing orders or request for quotations according to the stock level. Once the virtual stock of a product (= stock on hand minus all confirmed orders and reservations) is below the minimum quantity, OpenERP will generate a procurement request to increase the stock up to the maximum quantity.</p> </field> </record> diff --git a/addons/procurement/schedulers.py b/addons/procurement/schedulers.py index 7c9d5ec3290..6f326ccf1c5 100644 --- a/addons/procurement/schedulers.py +++ b/addons/procurement/schedulers.py @@ -36,6 +36,8 @@ class procurement_order(osv.osv): ''' Runs through scheduler. @param use_new_cursor: False or the dbname ''' + if use_new_cursor: + use_new_cursor = cr.dbname self._procure_confirm(cr, uid, use_new_cursor=use_new_cursor, context=context) self._procure_orderpoint_confirm(cr, uid, automatic=automatic,\ use_new_cursor=use_new_cursor, context=context) diff --git a/addons/procurement/wizard/make_procurement_view.xml b/addons/procurement/wizard/make_procurement_view.xml index 9228fcc323b..e611e0e2a30 100644 --- a/addons/procurement/wizard/make_procurement_view.xml +++ b/addons/procurement/wizard/make_procurement_view.xml @@ -10,7 +10,7 @@ <field name="arch" type="xml"> <form string="Procurement Request" version="7.0"> <p class="oe_gray"> - Fill is this for to launch a procurement request for this + Use this assistant to generate a procurement request for this product. According to the product configuration, this may trigger a draft purchase order, a manufacturing order or a new task. |