[FIX] ajustes varios

__openerp__.py

@@ -11,6 +11,7 @@
         'stock',
         'eiru_assets',
         'eiru_reports',
+        'eiru_sale_commission_cemobo',
     ],
     'qweb': [
         'static/src/xml/*.xml',

controllers/helpers/account_invoice_line.py

@@ -45,7 +45,8 @@ def get_account_invoice_line():
             brand.name,
             line.discount,
             invoice.user_id,
-            user_partner.name
+            user_partner.name,
+            invoice.commission_id
             FROM account_invoice AS invoice
             LEFT JOIN account_invoice_line AS line
             ON line.invoice_id = invoice.id
@@ -128,7 +129,8 @@ def get_account_invoice_line():
             (array_agg(attr.id)) AS attr,
             line.discount,
             invoice.user_id,
-            user_partner.name
+            user_partner.name,
+            invoice.commission_id
             FROM account_invoice AS invoice
             LEFT JOIN account_invoice_line AS line
             ON line.invoice_id = invoice.id
@@ -211,6 +213,7 @@ def get_account_invoice_line():
                 'discount': j[23],
                 'user_id': j[24],
                 'user_name': j[25],
+                'commission_id': j[26],
             } for j in r.cr.fetchall()
         ]
     else:
@@ -241,5 +244,6 @@ def get_account_invoice_line():
                 'discount': j[21],
                 'user_id': j[22],
                 'user_name': j[23],
+                'commission_id': j[24],
             } for j in r.cr.fetchall()
         ]

controllers/helpers/res_users.py

@@ -10,8 +10,8 @@ def get_res_users():
             'id': user.id,
             'company_id': user.company_id.id,
             'store_id': user.store_id.id,
-            'agent': user.partner_id.agent,
-            'commission': user.partner_id.commission.id,
+            # 'agent': user.partner_id.agent,
+            # 'commission': user.partner_id.commission.id,
             'name': user.partner_id.name,
         } for user in r.env[_MODEL].search([])
     ]

static/src/js/reports/report_sale_commission.js

@@ -202,7 +202,7 @@ function report_sale_commission(reporting){
                 return DataSQL;
             }).then(function (DataSQL) {
                 self.AccountInvoiceLine = DataSQL.invoice_lines;
-                self.PosOrderLine = DataSQL.order_lines;
+                // self.PosOrderLine = DataSQL.order_lines;
                 self.SaleCommission = DataSQL.commissions;
                 return self.BuildTable();
             });
@@ -322,167 +322,166 @@ function report_sale_commission(reporting){
                 return category[0].name;
         },
 
-        getSaleCommission: function (user) {
+        getSaleCommission: function (commission_id) {
             var self = this;
-            // var user = self.$el.find('#current-user').val();
-            var ResUsers =  _.filter(self.ResUsers,function (item) {
-                return item.id == user;
+            // var ResUsers =  _.filter(self.ResUsers,function (item) {
+            //     return item.id == user;
+            // });
+            return _.filter(self.SaleCommission,function (item) {
+                return item.id == commission_id;
             });
-            var commission =  _.filter(self.SaleCommission,function (item) {
-                return item.id == ResUsers[0].commission;
-            });
-            return commission;
+            // return commission;
         },
 
-        getPosOrderLine:function() {
-            var self = this;
-            var content = self.PosOrderLine;
-            var company = self.$el.find('#current-company').val();
-            var store = self.$el.find('#current-store').val();
-            var type = self.$el.find('#current-type').val();
-            var journal = self.$el.find('#current-journal').val();
-            var user = self.$el.find('#current-user').val();
-            var category = self.$el.find('#current-category').val();
-            var brand = self.$el.find('#current-brand').val();
-            var attribute = self.$el.find('#current-attribute').val();
-            var attribute_value = self.$el.find('#current-attribute-value').val();
-            var date = self.$el.find('#current-date').val();
-            var desde = self.$el.find('#from').val();
-            var hasta = self.$el.find('#to').val();
-
-            if((store && store == 9999999)||(company && company == 9999999)){
-                var store_ids = _.flatten(_.map(self.ResStore, function (item) {
-                    return item.id;
-                }));
-                var company_ids = _.flatten(_.map(self.ResCompany, function (item) {
-                    return item.id;
-                }));
-                content = _.flatten(_.filter(content,function (item) {
-                    return _.contains(store_ids, item.store_id) && _.contains(company_ids, item.company_id);
-                }));
-            }
-
-            if(company && company != 9999999){
-                content = _.flatten(_.filter(content,function (item) {
-                    return item.company_id == company;
-                }));
-            }
-            if(store && store != 9999999){
-                content = _.flatten(_.filter(content,function (item) {
-                    return item.store_id == store;
-                }));
-            }
-            if(type && type != 9999999){
-                if(type == 'sale'){
-                    content = [];
-                }
-            }
-            if(journal && journal != 9999999){
-                content = _.flatten(_.filter(content,function (item) {
-                    return item.journal_id == journal;
-                }));
-            }
-            if(user && user != 9999999){
-                content = _.flatten(_.filter(content,function (item) {
-                    return item.user_id == user;
-                }));
-            }
-            if(date && date != 9999999){
-                if(date == 'range'){
-                    if(desde){
-                        date = desde.split('/');
-                        date = (date[2]+"-"+date[1]+"-"+date[0]);
-                        content = _.flatten(_.filter(content,function (inv) {
-                            var utc = moment.utc(inv.date,'YYYY-MM-DD h:mm:ss A');
-                            utc = moment(utc._d).format('YYYY-MM-DD');
-                            return moment(utc).format('YYYY-MM-DD') >= date;
-                        }));
-                    }
-                    if(hasta){
-                        date = hasta.split('/');
-                        date = (date[2]+"-"+date[1]+"-"+date[0]);
-                        content = _.flatten(_.filter(content,function (inv) {
-                            var utc = moment.utc(inv.date,'YYYY-MM-DD h:mm:ss A');
-                            utc = moment(utc._d).format('YYYY-MM-DD');
-                            return moment(utc).format('YYYY-MM-DD') <= date;
-                        }));
-                    }
-                }
-                if(date == 'today'){
-                    var today = moment().format('YYYY-MM-DD');
-                    content = _.flatten(_.filter(content,function (inv) {
-                        var utc = moment.utc(inv.date,'YYYY-MM-DD h:mm:ss A');
-                        utc = moment(utc._d).format('YYYY-MM-DD');
-                        return moment(utc).format('YYYY-MM-DD') === today;
-                    }));
-                }
-                if(date == 'yesterday'){
-                    var yesterday = moment().add(-1,'days').format('YYYY-MM-DD');
-                    content = _.flatten(_.filter(content,function (inv) {
-                        var utc = moment.utc(inv.date,'YYYY-MM-DD h:mm:ss A');
-                        utc = moment(utc._d).format('YYYY-MM-DD');
-                        return moment(utc).format('YYYY-MM-DD') === yesterday;
-                    }));
-                }
-                if(date == 'currentMonth'){
-                    var currentMonth = moment().format('YYYY-MM');
-                    content = _.flatten(_.filter(content,function (inv) {
-                        var utc = moment.utc(inv.date,'YYYY-MM-DD h:mm:ss A');
-                        utc = moment(utc._d).format('YYYY-MM-DD');
-                        return moment(utc).format('YYYY-MM') === currentMonth;
-                    }));
-                }
-                if(date == 'lastMonth'){
-                    var lastMonth = moment().add(-1,'months').format('YYYY-MM');
-                    content = _.flatten(_.filter(content,function (inv) {
-                        var utc = moment.utc(inv.date,'YYYY-MM-DD h:mm:ss A');
-                        utc = moment(utc._d).format('YYYY-MM-DD');
-                        return moment(utc).format('YYYY-MM') === lastMonth;
-                    }));
-                }
-            }
-            if(category && category != 9999999){
-                var category_ids = _.map(_.filter(self.ProductCategory,function (item) {
-                    return item.id == category || item.parent_id == category;
-                }), function(map){
-                    return map.id;
-                });
-                var category_children_ids = _.map(_.filter(self.ProductCategory,function (item) {
-                    return _.contains(category_ids, item.parent_id) || item.id == category;
-                }), function(map){
-                    return map.id;
-                });
-                var category_grandchildren_ids = _.map(_.filter(self.ProductCategory,function (item) {
-                    return _.contains(category_children_ids, item.parent_id) || item.id == category;
-                }), function(map){
-                    return map.id;
-                });
-                var categ_ids =  _.map(_.filter(self.ProductCategory,function (item) {
-                    return _.contains(category_grandchildren_ids, item.parent_id) || item.id == category;
-                }), function(map){
-                    return map.id;
-                });
-                content = _.flatten(_.filter(content,function (inv) {
-                    return _.contains(categ_ids, inv.categ_id);
-                }));
-            }
-            if(brand && brand != 9999999){
-                content = _.filter(content,function (item) {
-                    return item.product_brand_id == parseInt(brand);
-                });
-            }
-            if(attribute && attribute != 9999999){
-                content = _.filter(content,function (item) {
-                    return _.contains(item.attribute_ids, parseInt(attribute));
-                });
-            }
-            if(attribute_value && attribute_value != 9999999){
-                content = _.filter(content,function (item) {
-                    return _.contains(item.attribute_value_ids, parseInt(attribute_value));
-                });
-            }
-            return content;
-        },
+        // getPosOrderLine:function() {
+        //     var self = this;
+        //     var content = self.PosOrderLine;
+        //     var company = self.$el.find('#current-company').val();
+        //     var store = self.$el.find('#current-store').val();
+        //     var type = self.$el.find('#current-type').val();
+        //     var journal = self.$el.find('#current-journal').val();
+        //     var user = self.$el.find('#current-user').val();
+        //     var category = self.$el.find('#current-category').val();
+        //     var brand = self.$el.find('#current-brand').val();
+        //     var attribute = self.$el.find('#current-attribute').val();
+        //     var attribute_value = self.$el.find('#current-attribute-value').val();
+        //     var date = self.$el.find('#current-date').val();
+        //     var desde = self.$el.find('#from').val();
+        //     var hasta = self.$el.find('#to').val();
+        //
+        //     if((store && store == 9999999)||(company && company == 9999999)){
+        //         var store_ids = _.flatten(_.map(self.ResStore, function (item) {
+        //             return item.id;
+        //         }));
+        //         var company_ids = _.flatten(_.map(self.ResCompany, function (item) {
+        //             return item.id;
+        //         }));
+        //         content = _.flatten(_.filter(content,function (item) {
+        //             return _.contains(store_ids, item.store_id) && _.contains(company_ids, item.company_id);
+        //         }));
+        //     }
+        //
+        //     if(company && company != 9999999){
+        //         content = _.flatten(_.filter(content,function (item) {
+        //             return item.company_id == company;
+        //         }));
+        //     }
+        //     if(store && store != 9999999){
+        //         content = _.flatten(_.filter(content,function (item) {
+        //             return item.store_id == store;
+        //         }));
+        //     }
+        //     if(type && type != 9999999){
+        //         if(type == 'sale'){
+        //             content = [];
+        //         }
+        //     }
+        //     if(journal && journal != 9999999){
+        //         content = _.flatten(_.filter(content,function (item) {
+        //             return item.journal_id == journal;
+        //         }));
+        //     }
+        //     if(user && user != 9999999){
+        //         content = _.flatten(_.filter(content,function (item) {
+        //             return item.user_id == user;
+        //         }));
+        //     }
+        //     if(date && date != 9999999){
+        //         if(date == 'range'){
+        //             if(desde){
+        //                 date = desde.split('/');
+        //                 date = (date[2]+"-"+date[1]+"-"+date[0]);
+        //                 content = _.flatten(_.filter(content,function (inv) {
+        //                     var utc = moment.utc(inv.date,'YYYY-MM-DD h:mm:ss A');
+        //                     utc = moment(utc._d).format('YYYY-MM-DD');
+        //                     return moment(utc).format('YYYY-MM-DD') >= date;
+        //                 }));
+        //             }
+        //             if(hasta){
+        //                 date = hasta.split('/');
+        //                 date = (date[2]+"-"+date[1]+"-"+date[0]);
+        //                 content = _.flatten(_.filter(content,function (inv) {
+        //                     var utc = moment.utc(inv.date,'YYYY-MM-DD h:mm:ss A');
+        //                     utc = moment(utc._d).format('YYYY-MM-DD');
+        //                     return moment(utc).format('YYYY-MM-DD') <= date;
+        //                 }));
+        //             }
+        //         }
+        //         if(date == 'today'){
+        //             var today = moment().format('YYYY-MM-DD');
+        //             content = _.flatten(_.filter(content,function (inv) {
+        //                 var utc = moment.utc(inv.date,'YYYY-MM-DD h:mm:ss A');
+        //                 utc = moment(utc._d).format('YYYY-MM-DD');
+        //                 return moment(utc).format('YYYY-MM-DD') === today;
+        //             }));
+        //         }
+        //         if(date == 'yesterday'){
+        //             var yesterday = moment().add(-1,'days').format('YYYY-MM-DD');
+        //             content = _.flatten(_.filter(content,function (inv) {
+        //                 var utc = moment.utc(inv.date,'YYYY-MM-DD h:mm:ss A');
+        //                 utc = moment(utc._d).format('YYYY-MM-DD');
+        //                 return moment(utc).format('YYYY-MM-DD') === yesterday;
+        //             }));
+        //         }
+        //         if(date == 'currentMonth'){
+        //             var currentMonth = moment().format('YYYY-MM');
+        //             content = _.flatten(_.filter(content,function (inv) {
+        //                 var utc = moment.utc(inv.date,'YYYY-MM-DD h:mm:ss A');
+        //                 utc = moment(utc._d).format('YYYY-MM-DD');
+        //                 return moment(utc).format('YYYY-MM') === currentMonth;
+        //             }));
+        //         }
+        //         if(date == 'lastMonth'){
+        //             var lastMonth = moment().add(-1,'months').format('YYYY-MM');
+        //             content = _.flatten(_.filter(content,function (inv) {
+        //                 var utc = moment.utc(inv.date,'YYYY-MM-DD h:mm:ss A');
+        //                 utc = moment(utc._d).format('YYYY-MM-DD');
+        //                 return moment(utc).format('YYYY-MM') === lastMonth;
+        //             }));
+        //         }
+        //     }
+        //     if(category && category != 9999999){
+        //         var category_ids = _.map(_.filter(self.ProductCategory,function (item) {
+        //             return item.id == category || item.parent_id == category;
+        //         }), function(map){
+        //             return map.id;
+        //         });
+        //         var category_children_ids = _.map(_.filter(self.ProductCategory,function (item) {
+        //             return _.contains(category_ids, item.parent_id) || item.id == category;
+        //         }), function(map){
+        //             return map.id;
+        //         });
+        //         var category_grandchildren_ids = _.map(_.filter(self.ProductCategory,function (item) {
+        //             return _.contains(category_children_ids, item.parent_id) || item.id == category;
+        //         }), function(map){
+        //             return map.id;
+        //         });
+        //         var categ_ids =  _.map(_.filter(self.ProductCategory,function (item) {
+        //             return _.contains(category_grandchildren_ids, item.parent_id) || item.id == category;
+        //         }), function(map){
+        //             return map.id;
+        //         });
+        //         content = _.flatten(_.filter(content,function (inv) {
+        //             return _.contains(categ_ids, inv.categ_id);
+        //         }));
+        //     }
+        //     if(brand && brand != 9999999){
+        //         content = _.filter(content,function (item) {
+        //             return item.product_brand_id == parseInt(brand);
+        //         });
+        //     }
+        //     if(attribute && attribute != 9999999){
+        //         content = _.filter(content,function (item) {
+        //             return _.contains(item.attribute_ids, parseInt(attribute));
+        //         });
+        //     }
+        //     if(attribute_value && attribute_value != 9999999){
+        //         content = _.filter(content,function (item) {
+        //             return _.contains(item.attribute_value_ids, parseInt(attribute_value));
+        //         });
+        //     }
+        //     return content;
+        // },
 
         getAccountInvoiceLine:function() {
             var self = this;
@@ -630,88 +629,88 @@ function report_sale_commission(reporting){
             var value;
             var commission_rule_name;
             var CurrencyBase = self.ResCompany[0].currency_id;
-            var PosOrderLine = self.getPosOrderLine();
+            // var PosOrderLine = self.getPosOrderLine();
             var display_name;
             var discount_amount;
             var modules = self.checkModule('product_brand');
-            _.each(PosOrderLine,function(item) {
-                var category = self.getProductCategory(item.categ_id);
-                if(item.attribute_values[0] == null){
-                    display_name = item.product_name;
-                }else{
-                    display_name = item.product_name + ' (' + _.uniq(item.attribute_values) + ')';
-                }
-                if(modules.length > 0){
-                    if(item.product_brand_id != null){
-                        display_name = display_name + ' ( ' + item.brand_name + ')';
-                    }
-                }
-                discount_amount = 0;
-                if(item.discount > 0){
-                    discount_amount = ((item.quantity * item.price_unit) * item.discount)/100;
-                }
-                value = 0;
-                commission_rule_name = '';
-                commission = self.getSaleCommission(item.user_id);
-                if(commission.length > 0){
-                    commission_rule_name = commission[0].name;
-                    if(commission[0].amount_base_type == 'utility_amount'){
-                        value = ((item.subtotal - (item.quantity * item.cost)) * commission[0].fix_qty) / 100;
-                    }
-                    if(commission[0].amount_base_type == 'gross_amount'){
-                        value = ((item.subtotal + item.tax) * commission[0].fix_qty) / 100;
-                    }
-                    if(commission[0].amount_base_type == 'net_amount'){
-                        value = (item.subtotal * commission[0].fix_qty) / 100;
-                    }
-                }
-
-                data.push({
-                    id : item.order_line_id,
-                    number:item.name,
-                    date:moment(item.date).format('DD/MM/YYYY'),
-                    customer_name:self.valorNull(item.customer_name),
-                    user_name:self.valorNull(item.user_name),
-                    product_name:display_name,
-                    commission_rule_name:self.valorNull(commission_rule_name),
-                    cost:accounting.formatMoney(item.cost, '', CurrencyBase.decimal_places, CurrencyBase.thousands_separator, CurrencyBase.decimal_separator),
-                    product_category:category,
-                    discount:accounting.formatNumber(item.discount,2,'.',',') + '%',
-                    discount_amount:accounting.formatMoney(discount_amount, '', CurrencyBase.decimal_places, CurrencyBase.thousands_separator, CurrencyBase.decimal_separator),
-                    price_unit:accounting.formatMoney(item.price_unit, '', CurrencyBase.decimal_places, CurrencyBase.thousands_separator, CurrencyBase.decimal_separator),
-                    quantity:accounting.formatNumber(item.quantity,2,'.',','),
-                    total_cost:accounting.formatMoney(item.quantity * item.cost, '', CurrencyBase.decimal_places, CurrencyBase.thousands_separator, CurrencyBase.decimal_separator),
-                    untaxed:accounting.formatMoney(item.subtotal, '', CurrencyBase.decimal_places, CurrencyBase.thousands_separator, CurrencyBase.decimal_separator),
-                    tax:accounting.formatMoney(item.tax, '', CurrencyBase.decimal_places, CurrencyBase.thousands_separator, CurrencyBase.decimal_separator),
-                    total:accounting.formatMoney(item.subtotal + item.tax, '', CurrencyBase.decimal_places, CurrencyBase.thousands_separator, CurrencyBase.decimal_separator),
-                    utility:accounting.formatMoney(item.subtotal - (item.quantity * item.cost), '', CurrencyBase.decimal_places, CurrencyBase.thousands_separator, CurrencyBase.decimal_separator),
-                    commission:accounting.formatMoney(value, '', CurrencyBase.decimal_places, CurrencyBase.thousands_separator, CurrencyBase.decimal_separator),
-                    /*
-                    =============================
-                        NO FORMAT
-                    =============================
-                    */
-                    date_no_format:item.date,
-                    cost_no_format:item.cost,
-                    price_unit_no_format:item.price_unit,
-                    quantity_no_format:item.quantity,
-                    total_cost_no_format:item.quantity * item.cost,
-                    discount_amount_no_format:discount_amount,
-                    untaxed_no_format:item.subtotal,
-                    tax_no_format:item.tax,
-                    total_no_format:item.subtotal + item.tax,
-                    utility_no_format:item.subtotal - (item.quantity * item.cost),
-                    commission_no_format:value,
-                    /*
-                    ==============================
-                        FOOTER
-                    ==============================
-                    */
-                    decimal_places:CurrencyBase.decimal_places,
-                    thousands_separator:CurrencyBase.thousands_separator,
-                    decimal_separator:CurrencyBase.decimal_separator,
-                });
-            });
+            // _.each(PosOrderLine,function(item) {
+            //     var category = self.getProductCategory(item.categ_id);
+            //     if(item.attribute_values[0] == null){
+            //         display_name = item.product_name;
+            //     }else{
+            //         display_name = item.product_name + ' (' + _.uniq(item.attribute_values) + ')';
+            //     }
+            //     if(modules.length > 0){
+            //         if(item.product_brand_id != null){
+            //             display_name = display_name + ' ( ' + item.brand_name + ')';
+            //         }
+            //     }
+            //     discount_amount = 0;
+            //     if(item.discount > 0){
+            //         discount_amount = ((item.quantity * item.price_unit) * item.discount)/100;
+            //     }
+            //     value = 0;
+            //     commission_rule_name = '';
+            //     commission = self.getSaleCommission(item.user_id);
+            //     if(commission.length > 0){
+            //         commission_rule_name = commission[0].name;
+            //         if(commission[0].amount_base_type == 'utility_amount'){
+            //             value = ((item.subtotal - (item.quantity * item.cost)) * commission[0].fix_qty) / 100;
+            //         }
+            //         if(commission[0].amount_base_type == 'gross_amount'){
+            //             value = ((item.subtotal + item.tax) * commission[0].fix_qty) / 100;
+            //         }
+            //         if(commission[0].amount_base_type == 'net_amount'){
+            //             value = (item.subtotal * commission[0].fix_qty) / 100;
+            //         }
+            //     }
+            //
+            //     data.push({
+            //         id : item.order_line_id,
+            //         number:item.name,
+            //         date:moment(item.date).format('DD/MM/YYYY'),
+            //         customer_name:self.valorNull(item.customer_name),
+            //         user_name:self.valorNull(item.user_name),
+            //         product_name:display_name,
+            //         commission_rule_name:self.valorNull(commission_rule_name),
+            //         cost:accounting.formatMoney(item.cost, '', CurrencyBase.decimal_places, CurrencyBase.thousands_separator, CurrencyBase.decimal_separator),
+            //         product_category:category,
+            //         discount:accounting.formatNumber(item.discount,2,'.',',') + '%',
+            //         discount_amount:accounting.formatMoney(discount_amount, '', CurrencyBase.decimal_places, CurrencyBase.thousands_separator, CurrencyBase.decimal_separator),
+            //         price_unit:accounting.formatMoney(item.price_unit, '', CurrencyBase.decimal_places, CurrencyBase.thousands_separator, CurrencyBase.decimal_separator),
+            //         quantity:accounting.formatNumber(item.quantity,2,'.',','),
+            //         total_cost:accounting.formatMoney(item.quantity * item.cost, '', CurrencyBase.decimal_places, CurrencyBase.thousands_separator, CurrencyBase.decimal_separator),
+            //         untaxed:accounting.formatMoney(item.subtotal, '', CurrencyBase.decimal_places, CurrencyBase.thousands_separator, CurrencyBase.decimal_separator),
+            //         tax:accounting.formatMoney(item.tax, '', CurrencyBase.decimal_places, CurrencyBase.thousands_separator, CurrencyBase.decimal_separator),
+            //         total:accounting.formatMoney(item.subtotal + item.tax, '', CurrencyBase.decimal_places, CurrencyBase.thousands_separator, CurrencyBase.decimal_separator),
+            //         utility:accounting.formatMoney(item.subtotal - (item.quantity * item.cost), '', CurrencyBase.decimal_places, CurrencyBase.thousands_separator, CurrencyBase.decimal_separator),
+            //         commission:accounting.formatMoney(value, '', CurrencyBase.decimal_places, CurrencyBase.thousands_separator, CurrencyBase.decimal_separator),
+            //         /*
+            //         =============================
+            //             NO FORMAT
+            //         =============================
+            //         */
+            //         date_no_format:item.date,
+            //         cost_no_format:item.cost,
+            //         price_unit_no_format:item.price_unit,
+            //         quantity_no_format:item.quantity,
+            //         total_cost_no_format:item.quantity * item.cost,
+            //         discount_amount_no_format:discount_amount,
+            //         untaxed_no_format:item.subtotal,
+            //         tax_no_format:item.tax,
+            //         total_no_format:item.subtotal + item.tax,
+            //         utility_no_format:item.subtotal - (item.quantity * item.cost),
+            //         commission_no_format:value,
+            //         /*
+            //         ==============================
+            //             FOOTER
+            //         ==============================
+            //         */
+            //         decimal_places:CurrencyBase.decimal_places,
+            //         thousands_separator:CurrencyBase.thousands_separator,
+            //         decimal_separator:CurrencyBase.decimal_separator,
+            //     });
+            // });
             var AccountInvoiceLine = self.getAccountInvoiceLine();
             _.each(AccountInvoiceLine,function(item) {
                 var category = self.getProductCategory(item.categ_id);
@@ -732,7 +731,7 @@ function report_sale_commission(reporting){
 
                 value = 0;
                 commission_rule_name = '';
-                commission = self.getSaleCommission(item.user_id);
+                commission = self.getSaleCommission(item.commission_id);
                 if(commission.length > 0){
                     commission_rule_name = commission[0].name;
                     if(commission[0].amount_base_type == 'utility_amount'){