Merge lp:~matjaz-6/openerpsl/openerpsl_01_07 into lp:openerpsl/7.0

[Matjaz Kalic]

[FIX] m_web_api (set_izdelek_produced1 function includes mrp status in search)

[lp:~matjaz-6/openerpsl/openerpsl_01_07]

268. By Dušan Laznik (Mentis) on 2014-01-13

[FIX] m_web_api (set_izdelek_produced1 function includes mrp status in search)

=== modified file 'm_web_api/m_web.py'
--- m_web_api/m_web.py	2014-01-11 17:41:39 +0000
+++ m_web_api/m_web.py	2014-01-13 19:43:56 +0000
@@ -109,6 +109,7 @@
         #moramo najti a so se kaki produkti ki imajo enako osnovo in jih se nismo zakljucili
         if  (status == 1) and (vrstaIzdelka == 'Izdelki') and (current_qty_available - (float(kol1)-old_produced) >= 0):
             same_base_ids = self.pool.get('mrp.production').search(cr, uid, [
+                                                                             ('state', 'in', ['ready', 'confirmed', 'in_production']),
                                                                              ('product_with_bom_id', '=', product_bom_id),
                                                                              ('id', '!=', line_id),
                                                                              ('status_izdelki', '=', 0)