[FIX] correciones y limpieza de codigo

.scannerwork/report-task.txt

@@ -0,0 +1,5 @@
+projectKey=eiru:sale:order
+serverUrl=http://181.40.66.126:9000
+dashboardUrl=http://181.40.66.126:9000/dashboard/index/eiru:sale:order
+ceTaskId=AV-htxCMLmS3QZZeLmum
+ceTaskUrl=http://181.40.66.126:9000/api/ce/task?id=AV-htxCMLmS3QZZeLmum

__init__.py

@@ -1,3 +1,2 @@
 # -*- coding: utf-8 -*-
 from model import sale_order
-# from model import sale

__openerp__.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 {
-    'name' : 'New Sale Order',
+    'name' : 'Sale Order for Curve',
     'version' : '1.0',
     'description' : """
     """,
@@ -9,7 +9,7 @@
     'depends' : ['sale'],
     'data' : [
         'views/template.xml',
-        'views/bank_statement_button.xml',
+        'views/sale_order_button.xml',
     ],
     'qweb' : ['static/src/xml/*.xml',],
     'installable' : True,

model/sale.py

@@ -1,37 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from datetime import datetime, timedelta
-import time
-from openerp import SUPERUSER_ID
-from openerp.osv import fields, osv
-from openerp.tools.translate import _
-from openerp.tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT
-import openerp.addons.decimal_precision as dp
-from openerp import workflow
-
-class sale_order(osv.osv):
-    _inherit = "sale.order"
-
-    def _amount_all_wrapper(self, cr, uid, ids, field_name, arg, context=None):
-        """ Wrapper because of direct method passing as parameter for function fields """
-        return self._amount_all(cr, uid, ids, field_name, arg, context=context)
-
-    def _amount_all(self, cr, uid, ids, field_name, arg, context=None):
-        cur_obj = self.pool.get('res.currency')
-        res = {}
-        # print "******************************algo*************************"
-        # for order in self.browse(cr, uid, ids, context=context):
-        #     res[order.id] = {
-        #         'amount_untaxed': 0.0,
-        #         'amount_tax': 0.0,
-        #         'amount_total': 0.0,
-        #     }
-        #     val = val1 = 0.0
-        #     cur = order.pricelist_id.currency_id
-        #     for line in order.order_line:
-        #         val1 += line.price_subtotal
-        #         val += self._amount_line_tax(cr, uid, line, context=context)
-        #     res[order.id]['amount_tax'] = cur_obj.round(cr, uid, cur, val)
-        #     res[order.id]['amount_untaxed'] = cur_obj.round(cr, uid, cur, val1)
-        #     res[order.id]['amount_total'] = res[order.id]['amount_untaxed'] + res[order.id]['amount_tax']
-        # return res

model/sale_order.py

@@ -11,8 +11,7 @@ class SaleOrder(models.Model):
 	amount_total = fields.Float( compute='_compute_amount_all') 
 
 	@api.model
-	def join_payslip_faults(self, values):
-	    sale = self.env['sale.order'].browse(values['id'])
+	def join_sale_lines(self, values):
 	    new_line = self.env['sale.order.line']
 	    sale_order_line = {
 	        'product_id': values['product_id'],

sonar-project.properties

@@ -0,0 +1,5 @@
+sonar.projectKey=eiru:sale:order
+sonar.projectName=eiru_sale_order
+sonar.projectVersion=1.0
+sonar.sources=.
+sonar.javascript.globals=openerp

static/src/js/account_bank_statement.js → static/src/js/sale_order.js

@@ -17,23 +17,9 @@ openerp.eiru_sale_order = function (instance, local) {
         },
         start: function () {
             var self = this;
-            this.$el.click(function (e) {
+            this.$el.click(function () {
                 self.fecthInitial();
             });
-            // self.buttons.click(function(e) {
-            //     /* E (Editar) */
-            //     if (e.target.accessKey === 'E')
-            //         self.$el.css('display','flex');
-            //     /* C (Crear) */
-            //     if (e.target.accessKey === 'C')
-            //         self.$el.css('display','none');
-            //     /* S (Guarrdar) */
-            //     if (e.target.accessKey === 'S')
-            //         self.$el.css('display','none');
-            //     /* D (Cancelar) */
-            //     if (e.target.accessKey === 'D')
-            //         self.$el.css('display','none');
-            // });
         },
 
         fecthInitial: function(){
@@ -50,12 +36,6 @@ openerp.eiru_sale_order = function (instance, local) {
             }).then(function(ProductProduct){
                 self.ProductProduct = ProductProduct;
                 self.inicializarBuscador();
-                // return self.factInsert();
-            // }).then(function(Line){
-            //     self.Line = line;    
-            //     return self.insertSaleOrderLine();
-            // }).then(function(saleLine){
-            //     local.parentInstance.reload();
             });
             return false;
         },
@@ -72,7 +52,6 @@ openerp.eiru_sale_order = function (instance, local) {
         },
         
         fetchProductTemplate: function () {
-            var self = this;
             var defer = $.Deferred();
             var fields=['id','name','curva'];
             var domain=[['active','=', true],['product_website_sale_type','=', true]];
@@ -123,15 +102,12 @@ openerp.eiru_sale_order = function (instance, local) {
             self.$('#productSearch').autocomplete({
                 source: results,
                 minLength:3,
-                search: function(event, ui) {
+                search: function() {
                     if (!(self.$('#productSearch').val())){
                         self.factInsert();
                     }
                 },
-                // close: function( event, ui ) {
-                //     self.factInsert();
-                // },
-                select: function(event, ui) {
+                select: function() {
                     self.factInsert();
                 }
             });
@@ -139,44 +115,31 @@ openerp.eiru_sale_order = function (instance, local) {
 
         factInsert:function(){
             var self = this;
-            var defer = $.Deferred();
-            var data = [];
             var product = this.$el.find('#productSearch').val().split('-');
-            var productproduct = self.ProductProduct;
             var template = self.getTemplate(product[0]);
             var variant = self.getProduct(product[0]);
             template = template[0].curva.split(',');
             var qty = 0;
             var contador = 0;
-            var results;
-
             for (var i = 0; i < variant.length; i++) {
                 qty = template[contador];
                 contador += 1;
-                
-                // self.joinSaleLine(variant[i].id, qty);
                 self.joinSaleLine(variant[i].id, qty).then(function(results) {
                     return results;
-                }).then(function(results){
+                }).then(function(){
                     self.reloadLine();
-                    // if (!results)
-                    //     results = false;
                 });
-
-                // break;
-                if (contador == template.length) { 
+                if (contador === template.length) { 
                     contador = 0;
                 }
             }
-            // self.reloadLine();
         },
 
-        // llama el metodo de insert en el python
         joinSaleLine: function(product_id, qty) {
             var self = this;
             var defer = $.Deferred();
             var sale = new openerp.web.Model('sale.order');
-            sale.call('join_payslip_faults',[
+            sale.call('join_sale_lines',[
                 {
                     id: self.sale[0].id,
                     product_id: product_id,

views/template.xml

@@ -1,8 +1,8 @@
 <openerp>
     <data>
-        <template id="eiru_sale_order.assets_backend" name="account_bank_statement_print_assets" inherit_id="eiru_assets.assets">
+        <template id="eiru_sale_order.assets_backend" name="sale_order_assets" inherit_id="eiru_assets.assets">
             <xpath expr="." position="inside">
-                <script type="text/javascript" src="/eiru_sale_order/static/src/js/account_bank_statement.js"/>
+                <script type="text/javascript" src="/eiru_sale_order/static/src/js/sale_order.js"/>
             </xpath>
         </template>
     </data>