Selaa lähdekoodia

[FIX] correccion en el template

Rodney Elpidio Enciso Arias 7 vuotta sitten
vanhempi
commit
1bd9206a24
4 muutettua tiedostoa jossa 42 lisäystä ja 11 poistoa
  1. 3 4
      __openerp__.py
  2. 10 6
      views/product_service.xml
  3. 28 0
      views/project_service_activity.xml
  4. 1 1
      views/template.xml

+ 3 - 4
__openerp__.py

@@ -3,10 +3,9 @@
     'name': 'Eiru Base for Services',
     'version': '1.0',
     'summary': 'Base for services Operations',
-    'description': 'Vehicle workshop operations & Its reports',
-    'category': 'Industries',
-    'author': 'Cybrosys Techno Solutions - Eiru',
-    'company': 'Cybrosys Techno Solutions - Eiru',
+    'description': 'Modulo de Aervicios ',
+    'category': 'mrp',
+    'author': 'Eiru Software',
     'website': "http://www.eiru.com.py",
     'depends': ['base',
                 'account_accountant'],

+ 10 - 6
views/product_service.xml

@@ -26,18 +26,22 @@
                         <notebook>
                             <page string="Configuración">
                                 <group>
-                                    <group string="Información legal">
-                                        <field name="partner_id" string="Propietario" required="1" domain="[('customer','=',True)]"/>
-                                        <field name="valuation" string="Valoracion del producto"/>
+                                    <group>
+                                        <group string="Información legal">
+                                            <field name="partner_id" string="Propietario" required="1" domain="[('customer','=',True)]"/>
+                                            <field name="valuation" string="Valoracion del producto"/>
+                                        </group>
                                     </group>
+                                    <group>
+                                        <group string="Información Adicional">
+                                            <field name="year" string="Año"/>
+                                        </group>
+                                    </group>   
                                 </group>
                                 <group>
                                     <group string="Descripción">
                                         <field name="description" nolabel="1"/>
                                     </group>
-                                    <group string="Información Adicional">
-                                        <field name="year" string="Año"/>
-                                    </group>
                                 </group>
                             </page>
                         </notebook>

+ 28 - 0
views/project_service_activity.xml

@@ -81,6 +81,11 @@
                     <separator/>
                     <filter string="Terminados" name="End" domain="[('completed','=',1)]"/>
                     <filter string="Pendientes" name="Pending" domain="[('completed','=',0)]"/>
+                    <filter string="Hoy" domain="[('work_date', '&gt;=', datetime.datetime.now().strftime('%Y-%m-%d 00:00:00')),('work_date', '&lt;=',datetime.datetime.now().strftime('%Y-%m-%d 23:23:59'))]"/>
+                    <filter string="Ayer" domain="[('work_date','&lt;=', (datetime.date.today()-relativedelta(days=1)).strftime('%%Y-%%m-%%d')),('work_date','&gt;=',(datetime.date.today()-relativedelta(days=1)).strftime('%%Y-%%m-%%d'))]"/>
+                    <filter string="Esta semana" domain="[('work_date', '&gt;=', ((context_today()+relativedelta(weeks=-1, days=1, weekday=0)).strftime('%%Y-%%m-%%d'))),('work_date', '&lt;=', ((context_today()+relativedelta(weeks=0, weekday=6)).strftime('%%Y-%%m-%%d')))]"/>
+                    <filter string="Mes actual" domain="[('work_date','&lt;',(context_today()+relativedelta(months=1)).strftime('%%Y-%%m-01')), ('work_date','&gt;=',time.strftime('%%Y-%%m-01'))]"/>
+                    <filter string="Mes pasado" domain="[('work_date','&gt;=',(context_today()-relativedelta(months=1)).strftime('%%Y-%%m-01')),('work_date','&lt;',time.strftime('%%Y-%%m-01'))]"/>
                     <separator/>
                     <group expand="0" string="Agrupar por ">
                         <filter string="Tarea" name="task" context="{'group_by':'task_id'}"/>
@@ -91,6 +96,29 @@
             </field>
         </record>
 
+
+
+
+
+        <!-- <record id="view_planned_work_filter" model="ir.ui.view">
+            <field name="name">planned.work.filter</field>
+            <field name="model">planned.work</field>
+            <field name="arch" type="xml">
+                <search string="Search Work">
+                    <field name="work_id" string="Tarea"/>
+                    <filter string="Terminados" name="completed" domain="[('completed', '=',True)]"/>
+                    <filter string="Pendientes" name="Pending" domain="[('completed', '=',False)]"/>
+                    
+                    <separator/>
+                    <separator/>
+                    <group expand="0" string="Agrupar por ">
+                        <filter string="Responsale" name="responsible" context="{'group_by':'responsible'}"/>
+                        <filter string="Tarea" name="work_id" context="{'group_by':'work_id'}"/>
+                    </group>
+                </search>
+            </field>
+        </record> -->
+
         <!-- action -->
         
         <record model="ir.actions.act_window" id="project_service_activity_action">

+ 1 - 1
views/template.xml

@@ -3,7 +3,7 @@
     <data>
         <template id="assets_backend" name="vehicle assets" inherit_id="web.assets_backend">
             <xpath expr="." position="inside">
-                <link rel="stylesheet" href="/eiru_base_for_services/static/src/css/vehicles.css"/>
+                <link rel="stylesheet" href="/eiru_service/static/src/css/vehicles.css"/>
             </xpath>
         </template>
     </data>