Browse Source

commit inicial

Rodney Enciso Arias 8 years ago
parent
commit
d6be1d9498
4 changed files with 22 additions and 19 deletions
  1. BIN
      __init__.pyc
  2. 5 5
      __openerp__.py
  3. BIN
      contract.pyc
  4. 17 14
      view/contract_view.xml

BIN
__init__.pyc


+ 5 - 5
__openerp__.py

@@ -19,21 +19,21 @@
 #
 ##############################################################################
 {
-    "name": "Filtros para Contratos",
+    "name": "Ingresos y Gastos estimados por contratos",
     'version': '8.0.0.1.0',
     'category': 'Tools',
     'sequence': 14,
-    'author':  'Sebastian Penayo/Eiru',
+    'author':  'Eiru Software/Sebastian Penayo-Rodney Enciso Arias',
     'website': '',
     'license': 'AGPL-3',
     'summary': '',
     'description': """
-Filtros de Contractos (account_analytic_account)
+Filtro en Contractos (account_analytic_account)
 =====================
-Este modulo es una extension del modulo account_analytic_account que permite filtrar por dia, semana, semana pasada y agrupar por fecha.
+Ingresos y Gastos estimados en contratos
 """,
     'depends': [
-        'account_analytic_analysis',
+        'account_analytic_analysis', 'account_analytic_purchase_contract',
     ],
     'external_dependencies': {
     },

BIN
contract.pyc


+ 17 - 14
view/contract_view.xml

@@ -2,28 +2,31 @@
 <openerp>
     <data>
 
-        <record id="view_account_analytic_search1" model="ir.ui.view">
-            <field name="name">account.analytic.filter.search1</field>
+        <record id="view_account_analytic_sale_search" model="ir.ui.view">
+            <field name="name">account.analytic.filter.sale</field>
             <field name="model">account.analytic.account</field>
             <field name="inherit_id" ref="account_analytic_analysis.view_account_analytic_account_overdue_search" />
             <field name="arch" type="xml">
               <search>
                   <separator/>
-                  <filter string="Este año" name="year" domain="[('recurring_next_date','&lt;=', time.strftime('%%Y-12-31')),('recurring_next_date','&gt;=',time.strftime('%%Y-01-01'))]"/>
-                  <filter string="Año pasado  " domain="[('recurring_next_date','&gt;=',(context_today()-relativedelta(years=1)).strftime('%%Y-01-01')),('recurring_next_date','&lt;=', time.strftime('%%Y-01-01'))]"/>
-                  <filter string="Mes actual" domain="[('recurring_next_date','&lt;',(context_today()+relativedelta(months=1)).strftime('%%Y-%%m-01')), ('recurring_next_date','&gt;=',time.strftime('%%Y-%%m-01'))]"/>
-                  <filter string="Mes pasado" domain="[('recurring_next_date','&gt;=',(context_today()-relativedelta(months=1)).strftime('%%Y-%%m-01')),('recurring_next_date','&lt;',time.strftime('%%Y-%%m-01'))]"/>
-                  <filter string="Cuota a Generar Hoy" domain="[('recurring_next_date', '&gt;=', datetime.datetime.now().strftime('%Y-%m-%d 00:00:00')),('recurring_next_date', '&lt;=',datetime.datetime.now().strftime('%Y-%m-%d 23:23:59'))]"/>
-                  <filter string="Cuota generado ayer " domain="[('recurring_next_date','&lt;=', (datetime.date.today()-relativedelta(days=1)).strftime('%%Y-%%m-%%d')),('recurring_next_date','&gt;=',(datetime.date.today()-relativedelta(days=1)).strftime('%%Y-%%m-%%d'))]"/>
-                  <filter string="Cuota generado semana anterior" domain="[('recurring_next_date', '&gt;=', ((context_today()+relativedelta(weeks=-2, days=1, weekday=0)).strftime('%%Y-%%m-%%d'))),('recurring_next_date', '&lt;=', ((context_today()+relativedelta(weeks=-1, weekday=6)).strftime('%%Y-%%m-%%d')))]"/>
-                  <filter string="Cuota a generar esta semana" domain="[('recurring_next_date', '&gt;=', ((context_today()+relativedelta(weeks=-1, days=1, weekday=0)).strftime('%%Y-%%m-%%d'))),('recurring_next_date', '&lt;=', ((context_today()+relativedelta(weeks=0, weekday=6)).strftime('%%Y-%%m-%%d')))]"/>
+                  <filter string="Ingreso Estimado para el siquiente Mes" name="next_month" domain="[('recurring_next_date','&gt;=',(context_today()+relativedelta(months=1)).strftime('%%Y-%%m-01')), ('recurring_next_date','&lt;',(context_today()+relativedelta(months=2)).strftime('%%Y-%%m-01'))]"/>
+               </search>
+            </field>
+        </record>
+
+        <record id="view_account_analytic_purchase" model="ir.ui.view">
+            <field name="name">account.analytic.filter.purchase</field>
+            <field name="model">account.analytic.account</field>
+            <field name="inherit_id" ref="account.view_account_analytic_account_search"/>
+            <field name="arch" type="xml">
+              <search>
+                  <separator/>
+                  <filter string="Gasto Estimado para el siquiente Mes" name="next_month" domain="[('recurring_next_date','&gt;=',(context_today()+relativedelta(months=1)).strftime('%%Y-%%m-01')), ('recurring_next_date','&lt;',(context_today()+relativedelta(months=2)).strftime('%%Y-%%m-01'))]"/>
 
-                  <group string="Agrupar">
-                      <filter string="Cuota a Generar por mes" context="{'group_by':'recurring_next_date:month'}"/>
-                      <filter string="Cuota a Generar por dia" context="{'group_by':'recurring_next_date:day'}"/>
-                  </group>
                </search>
             </field>
         </record>
+
+
     </data>
 </openerp>