[FIX] ajustes varios

static/src/js/reports/report_sale_commission.js

@@ -831,7 +831,7 @@ function report_sale_commission(reporting){
                 ResCompany = ResCompany[0];
                 CurrencyBase = ResCompany[0].currency_id;
             }else{
-                ResCompany = self.ResCompany[0];
+                ResCompany = self.CompanyLogo[0];
                 CurrencyBase = self.ResCompany[0].currency_id;
             }
             var getColumns = [];
@@ -848,6 +848,7 @@ function report_sale_commission(reporting){
             var untaxed = UntaxedFooter(row);
             var total = TotalFooter(row);
             var utility = UtilityFooter(row);
+            var commission = CommissionFooter(row);
 
             row.push({
                 number : 'Totales',
@@ -859,6 +860,7 @@ function report_sale_commission(reporting){
                 untaxed : untaxed,
                 total : total,
                 utility : utility,
+                commission : commission,
             });
 
             if (action === 'pdf') {
@@ -878,23 +880,28 @@ function report_sale_commission(reporting){
                     CONFIGURACION DEL PDF
                 ============================================================
                 */
-                var pdf_title = 'Analisis de Utilidad de Ventas.';
+                var pdf_title = 'Analisis de Comision de Ventas.';
                 var pdf_type = 'l';
-                var pdf_name = 'analisis_de_utilidad_de_ventas_';
+                var pdf_name = 'analisis_de_comision_de_ventas_';
                 var pdf_columnStyles = {
-                    number:{columnWidth: 25, halign:'center'},
+                    number:{columnWidth: 25, halign:'left'},
                     date:{columnWidth: 20, halign:'center'},
-                    customer_name:{halign:'center'},
+                    user_name:{columnWidth: 'auto',halign:'left'},
+                    customer_name:{ccolumnWidth: 'auto',halign:'left'},
                     product_name:{columnWidth: 'auto', halign:'left'},
+                    commission_rule_name:{columnWidth: 'auto', halign:'left'},
                     product_category:{columnWidth: 40, halign:'left'},
                     cost:{columnWidth: 20, halign:'right'},
                     price_unit:{columnWidth: 20, halign:'right'},
                     quantity:{columnWidth: 20, halign:'right'},
                     total_cost:{columnWidth: 20, halign:'right'},
+                    discount:{columnWidth: 10, halign:'right'},
+                    discount_amount:{columnWidth: 20, halign:'right'},
                     untaxed:{columnWidth: 20, halign:'right'},
                     tax:{columnWidth: 20, halign:'right'},
                     total:{columnWidth: 20, halign:'right'},
                     utility:{columnWidth: 20, halign:'right'},
+                    commission:{columnWidth: 20, halign:'right'},
                 };
                 /*
                 ============================================================
@@ -902,7 +909,7 @@ function report_sale_commission(reporting){
                 ============================================================
                 */
                 var filter = self.getFilter();
-                 var pdf = new model.eiru_reports_sales.ReportSalePdfWidget(self);
+                 var pdf = new model.eiru_reports.ReportPdfWidget(self);
                 pdf.drawPDF(
                     _.flatten(getColumns),
                     row,