deisy 6 years ago
parent
commit
64826f01f7

BIN
__init__.pyc


+ 17 - 5
__openerp__.py

@@ -3,25 +3,37 @@
 {
     'name': 'EIRU Base Menu',
     'version': '8.0.0.1.0',
-    'category': 'Product',
+    'category': 'Menu',
     'summary': 'Menus for EIRU SYSTEM CRAZY',
     'author': 'eiru',
     'license': 'AGPL-3',
     'depends': [
         'base',
         'web',
+        'sale',
+        'purchase',
+        'product',
+        'product_brand',
+        'account',
+        'stock',
+        'account_voucher',
+        'eiru_reports',
         'account_analytic_analysis',
         'account_analytic_purchase_contract',
-        'product_brand',
         'expense_menu',
-        'eiru_reports_dashboard'],
+        'eiru_reports_dashboard',
+        'eiru_bank_payments_references',
+        ],
     'data': [
         'views/webclient_templates.xml',
         'views/dashboard_menu.xml',
         'views/accounting_menu.xml',
         'views/hide_menu.xml',
-        'views/operations_menu.xml',
-        'views/registration_menu.xml',
+        'views/sale_menu.xml',
+        'views/purchase_menu.xml',
+        'views/expenses_menu.xml',
+        'views/stock_menu.xml',
     ],
+
     'installable': True,
 }

+ 18 - 8
static/src/css/advance_nav.css

@@ -3,7 +3,8 @@
         border: 1px solid rgba(0, 0, 0, 0);
         border-radius: 4px;
         float: left;
-        border-color: #333333;
+        font-size: 22px;
+        color: white;
     }
     .navbar-header .oe_leftbar_open:hover, .navbar-collapse .oe_leftbar_open:hover{
         background-color:#444444;
@@ -33,20 +34,33 @@
         text-shadow: 0 1px 1px #FFFFFF;
         width: 218px;
     }
+
+    .openerp .oe_leftbar > div {
+      height: 100%;
+      display: table;
+      width: 220px;
+      position: absolute;
+    }
+
     .openerp .oe_webclient .oe_application {
         display: table-cell;
+        float: right;
     }
-    .openerp .oe_webclient .oe_leftbar.leftbarhide{
+    .leftbarhide{
         display:none !important;
     }
 
+    .leftbarshow{
+        display:table-cell !important;
+    }
+
     .oe_secondary_submenu li:hover{
        background: #eaeaea;
     }
 
 /*ajuste eiru_them*/
 
-    /* #oe_main_menu_placeholder{
+    #oe_main_menu_placeholder{
      height: 35px !important;
     }
 
@@ -73,15 +87,11 @@
      height: 35px !important;
     }
 
-    .openerp.openerp_webclient_container{
+    /* .openerp.openerp_webclient_container{
       overflow: visible;
     } */
 
 
-
-
-
-
 @media (min-width: 768px){.navbar .navbar-collapse .oe_leftbar_open.show1{display:inline-block !important;}}
 @media (max-width: 768px){.navbar .navbar-header .oe_leftbar_open.show1{display:inline-block !important;}}
 

+ 18 - 7
static/src/js/advance_nav.js

@@ -1,13 +1,18 @@
-    openerp.eiru_base_menu = function(instance) {
+openerp.eiru_base_menu = function(instance) {
     var _t = instance.web._t,
         _lt = instance.web._lt,
         QWeb = instance.web.qweb;
 
+    if(window.location.href == window.location.origin+'/web'){
+      var first_menu = document.getElementsByClassName("oe_menu_leaf");
+      window.location.href = first_menu[0].href;
+    }
+
     instance.web.Menu.include({
 
         bind_menu: function() {
-
             var self = this;
+
             if($('nav ul li.tnav ul').closest("li").children("ul").length) {
                $('nav ul li.tnav ul').closest("li").children("ul li a").append('<b class="caret"></b>');
             }
@@ -32,13 +37,18 @@
             instance.web.bus.trigger('resize');
             $('nav#oe_main_menu_navbar ul li ul.oe_secondary_submenu').addClass("tnav");
             $('.oe_leftbar_open').toggle(
-                // function(){
-                //     $(this).removeClass("show1");
-                //     $(".oe_leftbar").fadeIn(500).removeClass("leftbarhide")},
                 function(){
-                    $(this).addClass("show1");
+                    // $(this).removeClass("show1");
+                    $(".oe_leftbar").fadeIn(500).removeClass("leftbarhide")
+                    $(".oe_leftbar").fadeOut(500).addClass("leftbarshow");
+                  },
+                function(){
+                    // $(this).addClass("show1");
                     $(".oe_leftbar").fadeOut(500).addClass("leftbarhide");
-                   });
+                    $(".oe_leftbar").fadeIn(500).removeClass("leftbarshow")
+                  }
+            );
+
             this.is_bound.resolve();
         },
 
@@ -77,5 +87,6 @@
                 $toplevel.hide();
             }
         },
+
     });
     };

+ 2 - 1
views/accounting_menu.xml

@@ -9,7 +9,7 @@
         <menuitem
             name="Finanzas"
             id="top_menu_accounting"
-            sequence="2"/>
+            sequence="40"/>
 
         <menuitem name="Clientes" id="menu_clientes" parent="top_menu_accounting" sequence="1"/>
             <menuitem name="Factura de cliente" id="account.menu_action_invoice_tree1" sequence="1" parent="menu_clientes"/>
@@ -26,5 +26,6 @@
             <menuitem name="Extractos bancarios" id="account.menu_bank_statement_tree" sequence="2" parent="menu_banco"/>
             <menuitem name="Operaciones bancarias" id="eiru_bank_payments_references.eiru_res_bank_payments_line" sequence="3" parent="menu_banco"/>
 
+        <menuitem name="Informes" id="eiru_reports.account_parent_menu" parent="top_menu_accounting" sequence="4"/>
     </data>
 </openerp>

+ 12 - 3
views/dashboard_menu.xml

@@ -2,8 +2,17 @@
 <openerp>
   <data>
     <!-- main top menu -->
-    <menuitem name="Dashboard"
-          id="eiru_reports_dashboard.report_dashboard_menu_submenu"
-          sequence="0"/>
+
+    <menuitem name="Ventas" id="eiru_base_menu.sale_menu" parent="eiru_reports_dashboard.eiru_report_main_menu" sequence="10"/>
+        <menuitem name="Clientes" id="base.menu_partner_form" parent="eiru_base_menu.sale_menu" sequence="1"/>
+        <menuitem name="Pedidos de venta" id="sale.menu_sale_order" parent="eiru_base_menu.sale_menu" sequence="2"/>
+
+    <menuitem name="Compras" id="eiru_base_menu.purchase_menu" parent="eiru_reports_dashboard.eiru_report_main_menu" sequence="20"/>
+        <menuitem name="Proveedores" id="base.menu_procurement_management_supplier_name" parent="eiru_base_menu.purchase_menu" sequence="1"/>
+        <menuitem name="Pedidos de compra" id="purchase.menu_purchase_form_action" parent="eiru_base_menu.purchase_menu" sequence="2"/>
+
+    <menuitem name="Productos" id="eiru_base_menu.product_menu" parent="eiru_reports_dashboard.eiru_report_main_menu" sequence="30"/>
+        <menuitem name="Productos" id="product.menu_product_template_action" parent="eiru_base_menu.product_menu" sequence="1"/>
+
   </data>
 </openerp>

+ 12 - 0
views/expenses_menu.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+  <data>
+    <!-- MENU GASTOS -->
+
+    <menuitem name="Gastos" id="eiru_expenses_menu" sequence="30"/>
+      <menuitem name="Registrar gastos" id="expense_menu.menu_expense" parent="eiru_base_menu.eiru_expenses_menu" sequence="1"/>
+      <menuitem name="Proveedores" id="base.menu_procurement_management_supplier_name" parent="eiru_base_menu.eiru_expenses_menu" sequence="2"/>
+      <menuitem name="Informes" id="eiru_reports.expense_parent_menu" parent="eiru_base_menu.eiru_expenses_menu" sequence="3"/>
+
+  </data>
+</openerp>

+ 4 - 4
views/hide_menu.xml

@@ -66,13 +66,13 @@
               <field name="name">Ocultar Menus</field>
             </record>
 
-            <!-- menu inicio -->
-            <record id="eiru_reports_dashboard.eiru_report_main_menu" model="ir.ui.menu">
+            <!-- menu informe -->
+            <record id="base.menu_reporting" model="ir.ui.menu">
               <field name="groups_id" eval="[(6,0,[ref('make_invisible')])]"/>
             </record>
 
-            <!-- menu informe -->
-            <record id="base.menu_reporting" model="ir.ui.menu">
+            <!-- menu informes -->
+            <record id="eiru_reports.eiru_reports_main_menu" model="ir.ui.menu">
               <field name="groups_id" eval="[(6,0,[ref('make_invisible')])]"/>
             </record>
 

+ 0 - 72
views/operations_menu.xml

@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <!--
-        ====================================
-            MENU OPERACIONES
-        ====================================
-        -->
-        <menuitem
-            name="Operaciones"
-            id="menu_operations"
-            sequence="1"/>
-
-        <!-- Ventas -->
-        <menuitem
-            name="Sales"
-            id="base.menu_sales"
-            parent="eiru_base_menu.menu_operations"
-            sequence="10"/>
-
-        <!-- Compras -->
-        <menuitem
-            name="Purchase"
-            id="purchase.menu_procurement_management"
-            parent="eiru_base_menu.menu_operations"
-            sequence="20"/>
-
-        <!-- Gastos -->
-        <menuitem
-            name="Gastos"
-            id="eiru_base_menu.menu_operation_expenses"
-            parent="eiru_base_menu.menu_operations"
-            sequence="30"/>
-
-            <menuitem
-                name="Registar Gastos"
-                id="expense_menu.menu_expense"
-                parent="eiru_base_menu.menu_operation_expenses"
-                sequence="0"/>
-
-        <!-- Stock -->
-        <menuitem
-            name="Stock"
-            id="eiru_base_menu.menu_operation_stock"
-            parent="eiru_base_menu.menu_operations"
-            sequence="50"/>
-
-            <menuitem
-                name="All Operations"
-                id="stock.menu_action_picking_type_form"
-                parent="eiru_base_menu.menu_operation_stock"
-                sequence="0"/>
-
-            <menuitem
-                name="Inventory Adjustments"
-                id="stock.menu_action_inventory_form"
-                parent="eiru_base_menu.menu_operation_stock"
-                sequence="1"/>
-
-             <menuitem
-                name="Stock Moves"
-                id="stock.menu_action_move_form2"
-                parent="eiru_base_menu.menu_operation_stock"
-                sequence="2"/>
-
-        <!-- menu CRM -->
-        <menuitem name="CRM"
-            id="base.menu_crm"
-            parent="eiru_base_menu.menu_operations"
-            sequence="60"/>
-    </data>
-</openerp>

+ 21 - 0
views/purchase_menu.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+  <data>
+    <!-- MENU COMPRAS -->
+
+    <menuitem name="Compras" id="eiru_purchase_menu" sequence="10"/>
+      <menuitem name="Presupuesto de compra" id="purchase.menu_purchase_rfq" parent="eiru_base_menu.eiru_purchase_menu" sequence="1"/>
+      <menuitem name="Pedido de compra" id="purchase.menu_purchase_form_action" parent="eiru_base_menu.eiru_purchase_menu" sequence="2"/>
+      <menuitem name="Proveedores" id="base.menu_procurement_management_supplier_name" parent="eiru_base_menu.eiru_purchase_menu" sequence="3"/>
+      <menuitem name="Contratos de proveedores" id="account_analytic_purchase_contract.contract_purchase" parent="eiru_base_menu.eiru_purchase_menu" sequence="4"/>
+      <menuitem name="Productos" id="eiru_purchase_menu_product" parent="eiru_base_menu.eiru_purchase_menu" sequence="5"/>
+        <menuitem name="Registrar producto" id="purchase.menu_procurement_partner_contact_form" parent="eiru_base_menu.eiru_purchase_menu_product" sequence="1"/>
+        <menuitem name="Registrar categorías" id="purchase.menu_product_by_category_purchase_form" parent="eiru_base_menu.eiru_purchase_menu_product" sequence="2"/>
+        <menuitem name="Registrar marcas" id="product_brand.menu_product_brand" parent="eiru_base_menu.eiru_purchase_menu_product" sequence="3"/>
+        <menuitem name="Registrar atributos" id="product.menu_attribute_action" parent="eiru_base_menu.eiru_purchase_menu_product" sequence="3"/>
+        <menuitem name="Registrar valores de atributos" id="product.menu_variants_action" parent="eiru_base_menu.eiru_purchase_menu_product" sequence="3"/>
+      <menuitem name="Lista de precio de compra" id="purchase.menu_purchase_config_pricelist" parent="eiru_base_menu.eiru_purchase_menu" sequence="6"/>
+      <menuitem name="Informes" id="eiru_reports.purchase_parent_menu" parent="eiru_base_menu.eiru_purchase_menu" sequence="7"/>
+
+  </data>
+</openerp>

+ 0 - 36
views/registration_menu.xml

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-    	<!--
-        ====================================
-            MENU REGISTROS
-        ====================================
-        -->
-        <menuitem name="Registros" id="menu_registrations" sequence="3"/>
-
-        <!-- Ventas -->
-        <menuitem name="Ventas" id="eiru_base_menu.menu_registration_sales" parent="eiru_base_menu.menu_registrations" sequence="10" />
-              <menuitem name="Registrar clientes" id="base.menu_partner_form" parent="eiru_base_menu.menu_registration_sales" sequence="1"/>
-              <menuitem name="Registrar contrato de cliente" id="account_analytic_analysis.menu_action_account_analytic_overdue_all" parent="eiru_base_menu.menu_registration_sales" sequence="2"/>
-              <menuitem id="product.menu_product_pricelist_action" name="Registrar tarifa de precio de venta" parent="eiru_base_menu.menu_registration_sales" sequence="3"/>
-
-        <!-- Compras -->
-        <menuitem name="Compras" id="eiru_base_menu.menu_registration_purchases" parent="eiru_base_menu.menu_registrations" sequence="20"/>
-              <menuitem name="Registrar proveedores" id="base.menu_procurement_management_supplier_name" parent="eiru_base_menu.menu_registration_purchases" sequence="1"/>
-              <menuitem name="Registrar contrato de proveedor" id="account_analytic_purchase_contract.contract_purchase" parent="eiru_base_menu.menu_registration_purchases" sequence="2"/>
-              <menuitem name="Registrar tarifa de compra" id="purchase.menu_purchase_pricelist_version_action" parent="eiru_base_menu.menu_registration_purchases" sequence="3"/>
-
-        <!-- Productos -->
-        <menuitem name="Productos" id="eiru_base_menu.menu_producto" parent="menu_registrations" sequence="30"/>
-              <menuitem name="Registrar productos" id="product.menu_product_template_action" parent="eiru_base_menu.menu_producto" sequence="1"/>
-              <menuitem name="Registrar categorías" id="product.menu_products_category" parent="eiru_base_menu.menu_producto" sequence="2"/>
-              <menuitem name="Registrar marcas" id="product_brand.menu_product_brand" parent="eiru_base_menu.menu_producto" sequence="3"/>
-              <menuitem name="Registrar atributos" id="product.menu_attribute_action" parent="eiru_base_menu.menu_producto" sequence="4"/>
-              <menuitem name="Registrar valores de atributo" id="product.menu_variants_action" parent="eiru_base_menu.menu_producto" sequence="5"/>
-
-        <!-- Finanzas -->
-        <menuitem name="Finanzas" id="eiru_base_menu.menu_finanzas" parent="menu_registrations" sequence="40"/>
-              <menuitem name="Objetivos del dashboard" id="eiru_reports_dashboard.dashboard_objetive_parent_menu" parent="eiru_base_menu.menu_finanzas"/>
-
-    </data>
-</openerp>

+ 22 - 0
views/sale_menu.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+  <data>
+    <!-- MENU VENTAS -->
+
+    <menuitem name="Ventas" id="eiru_sale_menu" sequence="20"/>
+      <menuitem name="Presupuesto de venta" id="sale.menu_sale_quotations" parent="eiru_base_menu.eiru_sale_menu" sequence="1"/>
+      <menuitem name="Pedido de venta" id="sale.menu_sale_order" parent="eiru_base_menu.eiru_sale_menu" sequence="2"/>
+      <menuitem name="Clientes" id="base.menu_partner_form" parent="eiru_base_menu.eiru_sale_menu" sequence="3"/>
+      <menuitem name="Contratos de clientes" id="account_analytic_analysis.menu_action_account_analytic_overdue_all" parent="eiru_base_menu.eiru_sale_menu" sequence="4"/>
+      <menuitem name="Productos" id="eiru_sale_menu_product" parent="eiru_base_menu.eiru_sale_menu" sequence="5"/>
+        <menuitem name="Registrar producto" id="product.menu_product_template_action" parent="eiru_base_menu.eiru_sale_menu_product" sequence="1"/>
+        <menuitem name="Registrar categorías" id="product.menu_products_category" parent="eiru_base_menu.eiru_sale_menu_product" sequence="2"/>
+        <menuitem name="Registrar marcas" id="product_brand.menu_product_brand" parent="eiru_base_menu.eiru_sale_menu_product" sequence="3"/>
+        <menuitem name="Registrar atributos" id="product.menu_attribute_action" parent="eiru_base_menu.eiru_sale_menu_product" sequence="3"/>
+        <menuitem name="Registrar valores de atributos" id="product.menu_variants_action" parent="eiru_base_menu.eiru_sale_menu_product" sequence="3"/>
+      <menuitem name="Lista de precio de venta" id="product.menu_product_pricelist_main" parent="eiru_base_menu.eiru_sale_menu" sequence="6"/>
+      <menuitem name="Condiciones de pago" id="account.menu_action_payment_term_form" parent="eiru_base_menu.eiru_sale_menu" sequence="7"/>
+      <menuitem name="Informes" id="eiru_reports.sale_parent_menu" parent="eiru_base_menu.eiru_sale_menu" sequence="9"/>
+
+  </data>
+</openerp>

+ 16 - 0
views/stock_menu.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+  <data>
+    <!-- MENU STOCK -->
+
+    <menuitem name="Stock" id="eiru_stock_menu" sequence="50"/>
+      <menuitem name="Todas las operaciones" id="stock.menu_action_picking_type_form" parent="eiru_base_menu.eiru_stock_menu" sequence="1"/>
+      <menuitem name="Ajuste de inventario" id="stock.menu_action_inventory_form" parent="eiru_base_menu.eiru_stock_menu" sequence="2"/>
+      <menuitem name="Movimiento de existencia" id="stock.menu_action_move_form2" parent="eiru_base_menu.eiru_stock_menu" sequence="3"/>
+      <menuitem name="Informes" id="eiru_reports.stock_parent_menu" parent="eiru_base_menu.eiru_stock_menu" sequence="4"/>
+
+
+  </data>
+
+
+</openerp>

+ 32 - 3
views/webclient_templates.xml

@@ -13,6 +13,9 @@
         <template id="eiru_base_menu.webclient_bootstrap" inherit_id="web.webclient_bootstrap" name="Webclient Bootstrap">
             <xpath expr="//div[@id='oe_main_menu_placeholder']" position="replace">
                     <div class="navbar-collapse collapse" id="oe_main_menu_placeholder">
+                      <button class="oe_leftbar_open show1" title="Left menu button">
+                          <i class="fa fa-bars"></i>
+                      </button>
                         <t t-call="web.menu"/>
                     </div>
              </xpath>
@@ -22,7 +25,8 @@
                     <div class="oe_webclient">
                             <div class="oe_leftbar leftbarhide" valign="top">
                                 <div groups="base.group_user,base.group_portal">
-                                    <!-- <t t-call="web.menu_secondary"/> -->
+                                  <t t-call="eiru_base_menu.leftmenu"/>
+                                  <!-- <t t-call="web.menu_secondary"/> -->
                                 </div>
                             </div>
                             <div class="oe_application"/>
@@ -31,9 +35,35 @@
              </xpath>
         </template>
 
+        <template id="eiru_base_menu.leftmenu">
+            <a class="oe_logo" t-att-href="'/web/?debug' if debug else '/web'">
+                <span class="oe_logo_edit">Edit Company data</span>
+                <img src='/web/binary/company_logo'/>
+            </a>
+            <div>
+                <div>
+
+                  <div class="oe_secondary_menus_container">
+                      <t t-foreach="menu_data['children']" t-as="menu">
+                        <t t-if="menu['name'] == 'Inicio'" >
+                              <t t-foreach="menu['children']" t-as="menu">
+                                  <div class="oe_secondary_menu_section">
+                                      <t t-esc="menu['name']"/>
+                                  </div>
+                                  <t t-call="web.menu_secondary_submenu"/>
+                              </t>
+
+                          </t>
+                      </t>
+                  </div>
+
+                </div>
+            </div>
+        </template>
+
         <template id="eiru_base_menu.menu" inherit_id="web.menu">
             <xpath expr="//ul[@class='nav navbar-nav navbar-left oe_application_menu_placeholder']" position="replace">
-                <ul class="nav navbar-nav navbar-left oe_application_menu_placeholder">
+                <ul class="nav navbar-nav navbar-left oe_application_menu_placeholder" style="width:auto">
                     <li t-foreach="menu_data['children']" t-as="menu" class="tnav">
                         <t t-call="web.menu_link"/>
                         <t t-call="web.menu_secondary_submenu"/>
@@ -45,6 +75,5 @@
                 </ul>
             </xpath>
         </template>
-
     </data>
 </openerp>