Rodney Enciso Arias 7 years ago
parent
commit
2b0a42aa3c

+ 1 - 1
__openerp__.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 {
     'name': "EIRU SET",
-    'author': "Eiru Software / Rodney Enciso Arias",
+    'author': "Eiru Software",
     'category': 'Reporte',
     'version': '0.1',
     'depends': ['base','eiru_assets','company_set_information','invoice_credit','attachments_views'],

+ 4 - 7
static/src/css/eiru_reporting.css → static/src/css/eiru_set.css

@@ -73,10 +73,7 @@
 .report_action > button {
     width: 100%;
 }
-.sucursal{
-    font-weight: bold;
-}
-#txt{
-    height: 35px; 
-    font-size: 15px;
-}
+
+.oe_form_sheet_width{
+    max-width: 1100px !important;
+}

+ 3 - 5
static/src/js/configuration_reporting.js → static/src/js/configuration_set.js

@@ -1,11 +1,9 @@
-function configuration_reporting (instance, widget) {
+function configuration_set (instance, widget) {
     "use strict";
     var widgets = widget;
 
-
-
-    widget.ReportingWidget = instance.Widget.extend({
-        template: 'EiruReporting',
+    widget.SetWidget = instance.Widget.extend({
+        template: 'EiruSet',
         events: {
             'click .report_action > button': 'clickOnReport',
         },

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

@@ -4,13 +4,13 @@ openerp.eiru_set = function (instance) {
     var set = instance.eiru_set;
 
     //reportingBase
-    reporting_base(instance,set);
-    configuration_reporting(instance,set);
+    set_base(instance,set);
+    configuration_set(instance,set);
 
     // Lista de Reportes
     report_purchases(set);
     report_sales(set);
 
 
-    instance.web.client_actions.add('eiru_set.action_report', 'instance.eiru_set.ReportingWidget');
+    instance.web.client_actions.add('eiru_set.action_set', 'instance.eiru_set.SetWidget');
 }

+ 2 - 2
static/src/js/reporting_base.js → static/src/js/set_base.js

@@ -1,4 +1,4 @@
-function reporting_base (instance, widget) {
+function set_base (instance, widget) {
     "use strict";
 
     widget.Base = instance.Widget.extend({
@@ -10,7 +10,7 @@ function reporting_base (instance, widget) {
             this.position = position || this.position;
         },
         start: function () {
-            // console.log('Reporting Locoo');
+            
         },
         getPosition: function () {
             return this.position;

+ 1 - 1
static/src/reports/report_purchases.xml

@@ -34,7 +34,7 @@
                 data-search="true">
                 <thead>
                     <tr>
-                        <th data-field="linea">#</th>
+                        <th data-field="linea" data-align="center">#</th>
                         <th data-field="tipo_registro">Tipo de registro</th>
                         <th data-field="ruc_proveedor">Ruc Proveedor</th>
                         <th data-field="dv">DV Proveedor</th>

+ 24 - 21
static/src/reports/report_sales.xml

@@ -6,36 +6,39 @@
                 <h1>Tributación de Ventas</h1>
                 <div id="volver"></div>
             </div>
-            <div class="row">
-                <div class="col-md-6 col-md-offset-3">
-                    <table class="table table-condensed">
-                        <tr>
-                            <th>
-                                <label for="current-period">Período: </label>
-                                <select id="current-period" class="ui-autocomplete-input form-control"  name="period"></select>
-                            </th>
-                        </tr>
-                        <tr>
-                            <th>
-                                <button class="oe_button oe_form_button oe_highlight btn-block txt" value="txt" id="txt">Exportar a txt</button>
-                            </th>
-                        </tr>
-                    </table> 
-                </div>   
-            </div>
+            <!-- <div id="toolbar"> -->
+                <div class="row">
+                    <div class="col-md-6 col-md-offset-3">
+                        <table class="table table-condensed">
+                            <tr>
+                                <th>
+                                    <label for="current-period">Período: </label>
+                                    <select id="current-period" class="ui-autocomplete-input form-control"  name="period"></select>
+                                </th>
+                            </tr>
+                            <tr>
+                                <th>
+                                    <button class="oe_button oe_form_button oe_highlight btn btn-block btn-lg" value="txt" id="txt">Exportar <i class="fa fa-file-text fa-lg"></i></button> 
+                                </th>
+                            </tr>
+                        </table> 
+                    </div>   
+                </div>
+            <!-- </div> -->
             <table id="table"
                 data-pagination="true"
                 data-toggle="table"
                 data-reorderable-columns="true"
-                data-toolbar="#toolbar"
+                data-toolbar="#toolbar"                
                 data-buttons-class="oe_button oe_form_button oe_highlight"
                 data-height="auto"
-                data-classes="table table-hover table-condensed table-bordered"
+                data-classes="table table-hover table-condensed"
                 data-row-style="rowStyle"
-                data-search="true">
+                data-search="true"
+                value="bottom">
                 <thead>
                     <tr>
-                        <th data-field="linea">#</th>
+                        <th data-field="linea" data-align="center">#</th>
                         <th data-field="tipo_registro" >Tipo de Registro</th>
                         <th data-field="ruc_cliente" >RUC Cliente</th>
                         <th data-field="dv">DV Cliente</th>

+ 3 - 3
static/src/xml/eiru_reporting.xml → static/src/xml/eiru_set.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <template xml:space="preserve">
-    <t t-name="EiruReporting">
-        <t t-call="EiruReportingBase">
+    <t t-name="EiruSet">
+        <t t-call="EiruSetBase">
             <div class="oe_form_sheetbg">
-                <t t-call="EiruReportingCards" />
+                <t t-call="EiruSetCards" />
             </div>
         </t>
     </t>

+ 1 - 1
static/src/xml/eiru_reporting_base.xml → static/src/xml/eiru_set_base.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <template xml:space="preserve">
-    <t t-name="EiruReportingBase">
+    <t t-name="EiruSetBase">
         <div class="oe_form_container">
             <div class="oe_form">
                 <div class="">

+ 1 - 1
static/src/xml/eiru_reporting_cards.xml → static/src/xml/eiru_set_cards.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <template xml:space="preserve">
-    <t t-name="EiruReportingCards">
+    <t t-name="EiruSetCards">
         <div class="oe_form_sheet oe_form_sheet_width">
             <div class="report_view">
                 <div class="report_group">

+ 6 - 6
templates.xml

@@ -4,13 +4,13 @@
         <template id="eiru_set_assets" inherit_id="eiru_assets.assets">
             <xpath expr="." position="inside">
                 <!-- Report style -->
-                <link rel="stylesheet" href="/eiru_set/static/src/css/eiru_reporting.css" />
+                <link rel="stylesheet" href="/eiru_set/static/src/css/eiru_set.css" />
                 <link rel="stylesheet" href="/eiru_set/static/src/css/lightbox.css" />
 
                 <!-- configuration < main > -->
                 <script type="text/javascript" src="/eiru_set/static/src/js/main.js" />
-                <script type="text/javascript" src="/eiru_set/static/src/js/reporting_base.js" />
-                <script type="text/javascript" src="/eiru_set/static/src/js/configuration_reporting.js" />
+                <script type="text/javascript" src="/eiru_set/static/src/js/set_base.js" />
+                <script type="text/javascript" src="/eiru_set/static/src/js/configuration_set.js" />
                 <script type="text/javascript" src="/eiru_set/static/src/js/download.js" />
                 <script type="text/javascript" src="/eiru_set/static/src/js/lightbox.js" />
 
@@ -22,10 +22,10 @@
 
         <record id="eiru_set_action" model="ir.actions.client">
             <field name="name">SET</field>
-            <field name="tag">eiru_set.action_report</field>
+            <field name="tag">eiru_set.action_set</field>
         </record>
 
-        <menuitem id="eiru_report_menu" name="SET" parent="base.menu_reporting" />
-        <menuitem id="eiru_report_menu_submenu" parent="eiru_report_menu" name="Analisis de Tributacion" action="eiru_set_action" />
+        <menuitem id="eiru_set_menu" name="SET" parent="base.menu_reporting" />
+        <menuitem id="eiru_set_menu_submenu" parent="eiru_set_menu" name="Analisis de Tributacion" action="eiru_set_action" />
     </data>
 </openerp>