瀏覽代碼

[FIX] modificacion en la vista

Rodney Elpidio Enciso Arias 7 年之前
父節點
當前提交
02328ccac6
共有 3 個文件被更改,包括 54 次插入16 次删除
  1. 44 11
      static/src/js/main.js
  2. 7 4
      static/src/xml/view.xml
  3. 3 1
      views/sale_order_search_box.xml

+ 44 - 11
static/src/js/main.js

@@ -24,6 +24,34 @@ openerp.eiru_purchase_to_sale = function (instance, local) {
                 self.fecthInitial();
             });
         },
+        showMensaje : function(){
+            var self = this;
+            $("#dialog" ).dialog({
+                autoOpen: true,
+                resizable: false,
+                modal: true,
+                title: 'Atención',
+                width: 500,
+                open: function() {
+                    $(this).html('Debe guardar el pedido anter de continuar');
+                },
+                show: {
+                    effect: "fade",
+                    duration: 200
+                },
+                hide: {
+                    effect: "fade",
+                    duration: 200
+                },
+                buttons: {
+                    Aceptar: function() {
+                        $(this).dialog('close');
+                        // self.renderReport();
+                    }
+                }
+            });
+            return
+        },
 
         fecthInitial: function(){
             var id= openerp.webclient._current_state.id;
@@ -108,20 +136,25 @@ openerp.eiru_purchase_to_sale = function (instance, local) {
         factInsertProduct:function(selectProduct){
             var self = this;
             var data = [];
+            console.log(self);
             var order = selectProduct.value.split('-');
             var order_line = self.getPurchaseOrderLine(order[0]);
-            _.each(order_line, function(item){
-                data.push({
-                    order_id: self.SaleOrder[0].id,
-                    product_id: item.product_id[0],
-                    product_uom_qty: item.product_qty
+            if(self.SaleOrder.length > 0){
+                _.each(order_line, function(item){
+                    data.push({
+                        order_id: self.SaleOrder[0].id,
+                        product_id: item.product_id[0],
+                        product_uom_qty: item.product_qty
+                    });
                 });
-            });
-            self.joinSaleLine(data).then(function(results) {
-                return results;
-            }).then(function(){
-                self.reloadLine();
-            });
+                self.joinSaleLine(data).then(function(results) {
+                    return results;
+                }).then(function(){
+                    self.reloadLine();
+                });
+            }else{
+                self.showMensaje();
+            }
         },
 
         joinSaleLine: function(data) {

+ 7 - 4
static/src/xml/view.xml

@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template xml:space="preserve">
     <t t-name="eiru_purchase_to_sale.PurchaseToSale">
-        <div class="ui-widget col-md-8 col-md-offset-2">
-        	<div class="form-group">
-        		<label for="PurchaseSearch">Buscar: </label>
-		  		<input id="PurchaseSearch" class="form-control"/>
+        <div class="ui-widget">
+        	<div class="ui-widget col-md-4 col-md-offset-4">
+        		<div id="dialog"></div>
+			    <div class="form-group">
+		    		<label for="PurchaseSearch">Buscar Solicitud de compra: </label>
+			  		<input id="PurchaseSearch" class="form-control"/>
+		    	</div>	
         	</div>
 		</div>
     </t>

+ 3 - 1
views/sale_order_search_box.xml

@@ -7,7 +7,9 @@
             <field name="inherit_id" ref="sale.view_order_form"/>
             <field name="arch" type="xml">
                 <field name="order_line" position="before">
-                    <div class="product_search_box" attrs="{'invisible': [('state','not in',['draft','sent'])]}"></div>
+                    <div class="oe_edit_only">
+                        <div class="product_search_box" attrs="{'invisible': [('state','not in',['draft','sent'])]}"></div>
+                    </div>
                 </field>
             </field>
         </record>