[MERGE]Merged with trunk-dev-addons2

bzr revid: ron@tinyerp.com-20110106044448-z0xp063iucfqdbt2

addons/procurement/procurement.py

@@ -361,17 +361,22 @@ class procurement_order(osv.osv):
         """
         ok = True
         if procurement.move_id:
+            message = False
             id = procurement.move_id.id
             if not (procurement.move_id.state in ('done','assigned','cancel')):
                 ok = ok and self.pool.get('stock.move').action_assign(cr, uid, [id])
                 cr.execute('select count(id) from stock_warehouse_orderpoint where product_id=%s', (procurement.product_id.id,))
-                if not cr.fetchone()[0]:
-                    cr.execute('update procurement_order set message=%s where id=%s',
-                            (_('Not enough stock and no minimum orderpoint rule defined.'),
-                            procurement.id))
-                    message = _("Procurement '%s' is in exception: not enough stock.") % \
-                            (procurement.name,)
-                    self.log(cr, uid, procurement.id, message)
+                res = cr.fetchone()[0]
+                if not res and not ok:
+                     message = _("Not enough stock and no minimum orderpoint rule defined.")
+                elif not res:
+                    message = _("No minimum orderpoint rule defined.")
+                elif not ok:
+                    message = _("Not enough stock.")
+
+                if message:
+                    self.log(cr, uid, procurement.id, _("Procurement '%s' is in exception: ") % (procurement.name) + message)
+                    cr.execute('update procurement_order set message=%s where id=%s', (message, procurement.id))
         return ok
 
     def action_produce_assign_service(self, cr, uid, ids, context=None):

addons/product/pricelist.py

@@ -166,7 +166,7 @@ class product_pricelist(osv.osv):
             pricelist_version_ids = pricelist_ids
         else:
             # all pricelists:
-            pricelist_version_ids = self.pool.get('product.pricelist').search(cr, uid, [])
+            pricelist_version_ids = self.pool.get('product.pricelist').search(cr, uid, [], context=context)
 
         pricelist_version_ids = list(set(pricelist_version_ids))
         plversions_search_args = [

addons/purchase_requisition/purchase_requisition_view.xml

@@ -21,8 +21,8 @@
         <field name="model">purchase.order</field>
         <field name="inherit_id" ref="purchase.view_purchase_order_filter"/>
         <field name="arch" type="xml">
-            <xpath expr="/search/group/filter[@string='State']" position="after">
-             <filter icon="terp-gtk-jump-to-rtl" string="Requisition" domain="[('requisition_id','!=',False)]" separator="1"/>
+            <xpath expr="/search/group/filter[@string='Not Invoiced']" position="after">
+             <filter icon="terp-gtk-jump-to-rtl" string="Requisition" domain="[('requisition_id','!=',False)]" separator="1" help="Purchase Orders with requisition"/>
             </xpath>
         </field>
     </record>