From 4ac423a87addad8c7a4b1f1edd3eca7c09e287c7 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Thu, 15 Sep 2011 14:03:33 +0530
Subject: [PATCH] [IMP]procurment, purchase, stock: Improved stock demo data,
 added limit and offset in search query, improved query if company_id not
 avail, also improved code of make_po() function

bzr revid: ron@tinyerp.com-20110915083333-ab8p3kp8lu1fvq53
---
 addons/procurement/schedulers.py | 2 +-
 addons/purchase/purchase.py      | 9 ++++++---
 addons/stock/stock_data.xml      | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/addons/procurement/schedulers.py b/addons/procurement/schedulers.py
index 33abeab34af..293d9f06ff9 100644
--- a/addons/procurement/schedulers.py
+++ b/addons/procurement/schedulers.py
@@ -67,7 +67,7 @@ class procurement_order(osv.osv):
             report_except = 0
             report_later = 0
             while True:
-                ids = procurement_obj.search(cr, uid, [('state', '=', 'confirmed'), ('procure_method', '=', 'make_to_order')], order='priority,date_planned')
+                ids = procurement_obj.search(cr, uid, [('state', '=', 'confirmed'), ('procure_method', '=', 'make_to_order')], offset=offset, limit=500, order='priority,date_planned', context=context)
                 for proc in procurement_obj.browse(cr, uid, ids, context=context):
                     if maxdate >= proc.date_planned:
                         wf_service.trg_validate(uid, 'procurement.order', proc.id, 'button_check', cr)
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 1cf0da7d916..72e0808f715 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -791,6 +791,8 @@ class procurement_order(osv.osv):
         pricelist_obj = self.pool.get('product.pricelist')
         prod_obj = self.pool.get('product.product')
         acc_pos_obj = self.pool.get('account.fiscal.position')
+        seq_obj = self.pool.get('ir.sequence')
+        wharehouse_obj = self.pool.get('stock.warehouse')
         for procurement in self.browse(cr, uid, ids, context=context):
             res_id = procurement.move_id.id
             partner = procurement.product_id.seller_id # Taken Main Supplier of Product of Procurement.
@@ -799,7 +801,7 @@ class procurement_order(osv.osv):
             partner_id = partner.id
             address_id = partner_obj.address_get(cr, uid, [partner_id], ['delivery'])['delivery']
             pricelist_id = partner.property_product_pricelist_purchase.id
-
+            warehouse_id = wharehouse_obj.search(cr, uid, [('company_id','=',procurement.company_id.id or company.id or '')], context=context)
             uom_id = procurement.product_id.uom_po_id.id
 
             qty = uom_obj._compute_qty(cr, uid, procurement.product_uom.id, procurement.product_qty, uom_id)
@@ -829,13 +831,14 @@ class procurement_order(osv.osv):
                 'notes': product.description_purchase,
                 'taxes_id': [(6,0,taxes)],
             }
-
+            name = seq_obj.get(cr, uid, 'purchase.order') or _('PO:%s') %procurement.name
             po_vals = {
+                'name': name,
                 'origin': procurement.origin,
                 'partner_id': partner_id,
                 'partner_address_id': address_id,
                 'location_id': procurement.location_id.id,
-                'warehouse_id': wharehouse_obj.search(cr, uid, [('company_id','=',procurement.company_id.id or company)])[0],
+                'warehouse_id': warehouse_id and warehouse_id[0] or False,
                 'pricelist_id': pricelist_id,
                 'company_id': procurement.company_id.id,
                 'fiscal_position': partner.property_account_position and partner.property_account_position.id or False
diff --git a/addons/stock/stock_data.xml b/addons/stock/stock_data.xml
index 3c75615dfae..bcde818c78a 100644
--- a/addons/stock/stock_data.xml
+++ b/addons/stock/stock_data.xml
@@ -91,8 +91,8 @@
         </record>
         <record id="stock_location_output" model="stock.location">
             <field name="name">Output</field>
+            <field name="location_id" ref="stock_location_company"/>
             <field name="usage">internal</field>
-            <field name="company_id"></field>
             <field name="chained_location_type">customer</field>
             <field name="chained_auto_packing">transparent</field>
             <field name="chained_picking_type">out</field>