Просмотр исходного кода

Retocar utilidad por línea vendedor

sebas 4 лет назад
Родитель
Сommit
d8935dfb2f

+ 2 - 2
static/src/js/main.js

@@ -7,7 +7,7 @@ openerp.eiru_reports_imperio= function (instance) {
 
     try {
         group_by_pdf(reporting);
-        report_seller(reporting);
+        // report_seller(reporting);
         report_sale_utility_vendor(reporting);
     } catch (e) {
         // ignorar error
@@ -16,7 +16,7 @@ openerp.eiru_reports_imperio= function (instance) {
 
     // Rendicion de venta por vendedor
 
-     instance.web.client_actions.add('eiru_reports_imperio.seller_action', 'instance.eiru_reports_imperio.ReportSellerWidget');
+     // instance.web.client_actions.add('eiru_reports_imperio.seller_action', 'instance.eiru_reports_imperio.ReportSellerWidget');
 
     //  venta agrupado por vendedor
 

+ 6 - 6
static/src/js/reports/report_sale_utility_vendor.js

@@ -538,14 +538,14 @@ function report_sale_utility_vendor(reporting){
               _.each(AccountInvoiceLine, function(line_item){
 
                 if(line_item.product_id.standard_price != 0){
-                    total_sale = (line_item.price_unit/(1.1));
-                    total_cost = line_item.product_id.standard_price * line_item.quantity;
+                    total_sale = (line_item.price_unit);
+                    total_cost = (line_item.product_id.standard_price*(1.1)) * line_item.quantity;
                     total_price = total_sale * line_item.quantity;
                     utility = total_price - total_cost;
                     porc_utility = (utility/total_cost)*100;
                 }else{
-                  total_sale = (line_item.price_unit/(1.1));
-                  total_cost = line_item.product_id.standard_price * line_item.quantity;
+                  total_sale = (line_item.price_unit);
+                  total_cost = (line_item.product_id.standard_price*(1.1))  * line_item.quantity;
                   total_price = total_sale * line_item.quantity;
                   utility = total_price - total_cost;
                   porc_utility = (0/total_cost)*100;
@@ -563,7 +563,7 @@ function report_sale_utility_vendor(reporting){
                   product_code : self.valorNull(line_item.product_id.default_code),
                   barcode : self.valorNull(line_item.product_id.ean13),
                   product_name : line_item.product_id.name,
-                  item_cost : accounting.formatMoney(line_item.product_id.standard_price,'', CurrencyBase.decimal_places, CurrencyBase.thousands_separator, CurrencyBase.decimal_separator),
+                  item_cost : accounting.formatMoney((line_item.product_id.standard_price*(1.1)),'', CurrencyBase.decimal_places, CurrencyBase.thousands_separator, CurrencyBase.decimal_separator),
                   item_price : accounting.formatMoney(total_sale,'', CurrencyBase.decimal_places, CurrencyBase.thousands_separator, CurrencyBase.decimal_separator),
                   qty : line_item.quantity,
                   total_price : accounting.formatMoney(total_price,'', CurrencyBase.decimal_places, CurrencyBase.thousands_separator, CurrencyBase.decimal_separator),
@@ -574,7 +574,7 @@ function report_sale_utility_vendor(reporting){
                   user_name : item2.user_id[1],
 
                   //VALORES SIN FORMATEAR
-                  item_cost_no_format : line_item.product_id.standard_price,
+                  item_cost_no_format : (line_item.product_id.standard_price*(1.1)),
                   item_price_no_format : total_sale,
                   total_price_no_format : total_price,
                   total_cost_no_format : total_cost,

+ 1 - 1
templates.xml

@@ -11,7 +11,7 @@
 
 
                 <!-- rendicion de venta por vendedor -->
-                <script type="text/javascript" src="/eiru_reports_imperio/static/src/js/reports/report_seller.js"/>
+                <!-- <script type="text/javascript" src="/eiru_reports_imperio/static/src/js/reports/report_seller.js"/> -->
 
                 <!-- rendicion de venta por vendedor agrupado-->
                 <script type="text/javascript" src="/eiru_reports_imperio/static/src/js/reports/report_sale_utility_vendor.js"/>

+ 2 - 2
views/actions.xml

@@ -2,10 +2,10 @@
 <openerp>
 	<data>
 
-		<record id="seller_action" model="ir.actions.client">
+		<!-- <record id="seller_action" model="ir.actions.client">
             <field name="name">Utilidad por Ventas - Vendedores</field>
             <field name="tag">eiru_reports_imperio.seller_action</field>
-    </record>
+    </record> -->
 
 		<record id="sale_utility_vendor_action" model="ir.actions.client">
 						<field name="name">Utilidad de línea de Venta por Vendedores</field>

+ 2 - 2
views/menus.xml

@@ -9,11 +9,11 @@
        <menuitem id="utility_parent_menu" name="Imperio" parent="eiru_reports.sale_parent_menu" sequence="10"/>
 
 
-       <menuitem id="seller_menu"
+       <!-- <menuitem id="seller_menu"
           parent="utility_parent_menu"
           name="Venta/Costo/Utilidad por Vendedores"
           action="seller_action"
-          sequence="1"/>
+          sequence="1"/> -->
 
         <menuitem id="sale_utility_vendor_menu"
               parent="utility_parent_menu"