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

[Matjaz Kalic]

[FIX] mrp_procurement_qty/mrp_production.py (get product name) + show it on tablet
[FIX] mrp_procurement_qty/bakery_production.py (translation, filters, check if it was started today)

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

353. By Dušan Laznik (Mentis) on 2014-03-03

[FIX] mrp_procurement_qty/mrp_production.py (get product name) + show it on tablet
[FIX] mrp_procurement_qty/bakery_production.py (translation, filters, check if it was started today)

=== modified file 'm_web_api/static/src/js/core.js'
--- m_web_api/static/src/js/core.js	2014-02-27 18:33:07 +0000
+++ m_web_api/static/src/js/core.js	2014-03-03 10:53:58 +0000
@@ -365,7 +365,7 @@
     //------------------------------------------------//
     
     //Prikaz podjetja in verzije
-    $("#podjetje").text('Podjetje: ' + document.getElementById("s1").options[so].text + ', Verzija: v.02.27');
+    $("#podjetje").text('Podjetje: ' + document.getElementById("s1").options[so].text + ', Verzija: v.03.03');
     
     openERP_user = '';
     if (document.getElementById("u").value == 'Testo-Polizdelki'){
@@ -896,7 +896,10 @@
       				//results[i].product_code = '';
     				results[i].product_qty_onstock=results[i].product_on_bom_qty_stock;
       				results[i].product_on_bom_qty_ready = results[i].product_on_bom_qty_O_ready;
-      				product_name = results[i].product_is_product;
+      				//product_name = results[i].product_is_product;
+      				
+      				//alert(results[i].product_is_product);
+      				product_name = results[i].product_is_product.toString().substring(results[i].product_is_product.toString().indexOf(',')+1);
       			}
     			
     			product_code = product_name.substring(0,product_name.indexOf(' '));

=== modified file 'mrp_procurement_qty/bakery_production.py'
--- mrp_procurement_qty/bakery_production.py	2014-02-25 17:15:39 +0000
+++ mrp_procurement_qty/bakery_production.py	2014-03-03 10:53:58 +0000
@@ -45,6 +45,7 @@
         'date_start': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
         'running': 1,
     }
+    _order = 'id desc'
     
     def process_start(self, cr, uid, process, context=None):
         res = self.create(cr, uid,
@@ -106,10 +107,14 @@
         running_id = self.search(cr, uid, [('process','=',process)], order='id desc', limit=1, context=context)
         for line in self.browse(cr, uid, running_id):
             if line.running:
-                d_date = datetime.strptime(line.date_start, ('%Y-%m-%d %H:%M:%S'))
-                d_date = d_date + timedelta(hours=1)
+                #Preverimo ali je bil tekoci proces zagnan vceraj
+                d_start = datetime.strptime(line.date_start, ('%Y-%m-%d %H:%M:%S')).date()
+                d_now = datetime.now().date()
+                if d_start == d_now:
+                    d_date = datetime.strptime(line.date_start, ('%Y-%m-%d %H:%M:%S'))
+                    d_date = d_date + timedelta(hours=1)
                 
-                res = 'Process started by %s, on %s' %(line.user_id.name, d_date)
+                    res = 'Process started by %s, on %s' %(line.user_id.name, d_date)
         return res
     
 bakery_process()
@@ -132,6 +137,7 @@
         'date_start': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
         'running': 1,
     }
+    _order = 'id desc'
     
     def production_start(self, cr, uid, context=None):
         res = self.create(cr, uid, {})

=== modified file 'mrp_procurement_qty/bakery_production_view.xml'
--- mrp_procurement_qty/bakery_production_view.xml	2014-02-25 17:15:39 +0000
+++ mrp_procurement_qty/bakery_production_view.xml	2014-03-03 10:53:58 +0000
@@ -93,6 +93,22 @@
             </field>
         </record>
         
+        <record id="search_bakery_process" model="ir.ui.view">
+            <field name="name">bakery.process.search</field>
+            <field name="model">bakery.process</field>
+            <field eval="50" name="priority"/>
+            <field name="arch" type="xml">
+                <search string="Stock Moves">
+					<filter string="Confirm sale orders" name="sale" domain="[('process','=',10)]" />
+					<filter string="Procurement" name="sale" domain="[('process','=',20)]" />
+					<filter string="Procurement with OP" name="sale" domain="[('process','=',30)]" />
+					<filter string="Deliver delivery orders" name="sale" domain="[('process','=',40)]" />
+					<filter string="Produce manufacturing orders" name="sale" domain="[('process','=',50)]" />
+					<filter string="Stock moved" name="sale" domain="[('process','=',60)]" />
+                </search>
+            </field>
+        </record>
+        
         <record id="action_bakery_process" model="ir.actions.act_window">
             <field name="name">Bakery Process</field>
             <field name="type">ir.actions.act_window</field>

=== modified file 'mrp_procurement_qty/i18n/en_US.po'
--- mrp_procurement_qty/i18n/en_US.po	2014-02-17 17:10:14 +0000
+++ mrp_procurement_qty/i18n/en_US.po	2014-03-03 10:53:58 +0000
@@ -474,3 +474,39 @@
 #: view:procurement.order.orderpoint.run.wizard:0
 msgid "Run Orderpoint Scheduler multiple times"
 msgstr ""
+
+
+
+
+
+#. module: mrp_procurement_qty
+#: selection:bakery.process,process:0
+msgid "Confirm sale orders"
+msgstr ""
+
+#. module: mrp_procurement_qty
+#: selection:bakery.process,process:0
+msgid "Procurement"
+msgstr ""
+
+#. module: mrp_procurement_qty
+#: selection:bakery.process,process:0
+msgid "Procurement with OP"
+msgstr ""
+
+#. module: mrp_procurement_qty
+#: selection:bakery.process,process:0
+msgid "Deliver delivery orders"
+msgstr ""
+
+#. module: mrp_procurement_qty
+#: selection:bakery.process,process:0
+msgid "Produce manufacturing orders"
+msgstr ""
+
+#. module: mrp_procurement_qty
+#: selection:bakery.process,process:0
+#: field:bakery.production,stock_moved:0
+#: field:procurement.order.move.stock.wizard,status_move:0
+msgid "Stock moved"
+msgstr ""

=== modified file 'mrp_procurement_qty/i18n/mrp_procurement_qty.pot'
--- mrp_procurement_qty/i18n/mrp_procurement_qty.pot	2014-02-17 17:10:14 +0000
+++ mrp_procurement_qty/i18n/mrp_procurement_qty.pot	2014-03-03 10:53:58 +0000
@@ -473,3 +473,39 @@
 #: view:procurement.order.orderpoint.run.wizard:0
 msgid "Run Orderpoint Scheduler multiple times"
 msgstr ""
+
+
+
+
+
+#. module: mrp_procurement_qty
+#: selection:bakery.process,process:0
+msgid "Confirm sale orders"
+msgstr ""
+
+#. module: mrp_procurement_qty
+#: selection:bakery.process,process:0
+msgid "Procurement"
+msgstr ""
+
+#. module: mrp_procurement_qty
+#: selection:bakery.process,process:0
+msgid "Procurement with OP"
+msgstr ""
+
+#. module: mrp_procurement_qty
+#: selection:bakery.process,process:0
+msgid "Deliver delivery orders"
+msgstr ""
+
+#. module: mrp_procurement_qty
+#: selection:bakery.process,process:0
+msgid "Produce manufacturing orders"
+msgstr ""
+
+#. module: mrp_procurement_qty
+#: selection:bakery.process,process:0
+#: field:bakery.production,stock_moved:0
+#: field:procurement.order.move.stock.wizard,status_move:0
+msgid "Stock moved"
+msgstr ""

=== modified file 'mrp_procurement_qty/i18n/sl.po'
--- mrp_procurement_qty/i18n/sl.po	2014-02-17 17:10:14 +0000
+++ mrp_procurement_qty/i18n/sl.po	2014-03-03 10:53:58 +0000
@@ -443,7 +443,7 @@
 #. module: mrp_procurement_qty
 #: field:bakery.production,manufactury_done:0
 msgid "Manufactury done"
-msgstr "Proizvodnja zaključena"
+msgstr "Delovni nal. zaključeni"
 
 
 #. module: mrp_procurement_qty
@@ -474,3 +474,39 @@
 #: view:procurement.order.orderpoint.run.wizard:0
 msgid "Run Orderpoint Scheduler multiple times"
 msgstr "Lansiranje proizvodnje iz zaloge"
+
+
+
+
+
+#. module: mrp_procurement_qty
+#: selection:bakery.process,process:0
+msgid "Confirm sale orders"
+msgstr "Prodaja potrjena"
+
+#. module: mrp_procurement_qty
+#: selection:bakery.process,process:0
+msgid "Procurement"
+msgstr "Proizvodnja lansirana"
+
+#. module: mrp_procurement_qty
+#: selection:bakery.process,process:0
+msgid "Procurement with OP"
+msgstr "Proizvodnja lans. iz zaloge"
+
+#. module: mrp_procurement_qty
+#: selection:bakery.process,process:0
+msgid "Deliver delivery orders"
+msgstr "Dobava opravljena"
+
+#. module: mrp_procurement_qty
+#: selection:bakery.process,process:0
+msgid "Produce manufacturing orders"
+msgstr "Delovni nal. zaključeni"
+
+#. module: mrp_procurement_qty
+#: selection:bakery.process,process:0
+#: field:bakery.production,stock_moved:0
+#: field:procurement.order.move.stock.wizard,status_move:0
+msgid "Stock moved"
+msgstr "Zaloga umaknjena"

=== modified file 'mrp_procurement_qty/mrp_production.py'
--- mrp_procurement_qty/mrp_production.py	2014-02-27 11:43:23 +0000
+++ mrp_procurement_qty/mrp_production.py	2014-03-03 10:53:58 +0000
@@ -176,17 +176,22 @@
                 
             if order.product_id.product_tmpl_id.categ_id.parent_id.id == 38:
                 if order.product_with_bom_relation:
-                    tmp_name = '['
-                    if order.product_with_bom_relation.default_code:
-                        tmp_name = tmp_name + order.product_with_bom_relation.default_code
-                        
-                    if order.product_with_bom_relation.name_template:
-                        tmp_name = tmp_name + '] >'+ order.product_with_bom_relation.name_template
-                        
-                    if order.product_with_bom_relation.variants:
-                        tmp_name = tmp_name + ' - ' + order.product_with_bom_relation.variants
-                    
-                    res_tmp['product_is_product'] = tmp_name
+                    #_____________________________________
+                    
+                    product_obj = self.pool.get('product.product')
+                    pro_name = product_obj.name_get(cr, uid, [order.product_with_bom_relation.id], context)
+                    
+#                    tmp_name = '['
+#                    if order.product_with_bom_relation.default_code:
+#                        tmp_name = tmp_name + order.product_with_bom_relation.default_code
+#                        
+#                    if order.product_with_bom_relation.name_template:
+#                        tmp_name = tmp_name + '] >'+ order.product_with_bom_relation.name_template
+#                        
+#                    if order.product_with_bom_relation.variants:
+#                        tmp_name = tmp_name + ' - ' + order.product_with_bom_relation.variants
+                    
+                    res_tmp['product_is_product'] = pro_name
                 else:
                     res_tmp['product_is_product'] = '[' + order.product_id.default_code + '] <'+ order.product_id.name_template + '[Osnova] - ' + order.product_id.variants
             else: