From a6a2df0a92bf5a25757e11b84cf610ae48e5697b Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Tue, 15 Dec 2009 16:18:32 +0530
Subject: [PATCH] [IMP,MOD] adding year and month for search view

bzr revid: vir@tinyerp.com-20091215104832-szlf05amh6vsoamg
---
 addons/report_intrastat/report_intrastat.py   | 14 ++++----
 .../report_intrastat_view.xml                 | 32 ++++++++++---------
 2 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/addons/report_intrastat/report_intrastat.py b/addons/report_intrastat/report_intrastat.py
index 61c1e0058f6..5da69c1e579 100644
--- a/addons/report_intrastat/report_intrastat.py
+++ b/addons/report_intrastat/report_intrastat.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -61,7 +61,9 @@ class report_intrastat(osv.osv):
     _description = "Intrastat report"
     _auto = False
     _columns = {
-        'name': fields.many2one('account.period', 'Period', readonly=True, select=True),
+        'name': fields.char('Year',size=64,required=False, readonly=True),
+        'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
+                                  ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
         'supply_units':fields.float('Supply Units', readonly=True),
         'ref':fields.char('Origin',size=64, readonly=True),
         'code': fields.char('Country code', size="2", readonly=True),
@@ -76,7 +78,8 @@ class report_intrastat(osv.osv):
         cr.execute("""
             create or replace view report_intrastat as (
                 select
-                    inv.period_id as name,
+                    to_char(inv.create_date, 'YYYY') as name,
+                    to_char(inv.create_date, 'MM') as month,
                     min(inv_line.id) as id,
                     intrastat.id as intrastat_id,
                     upper(inv_country.code) as code,
@@ -130,8 +133,7 @@ class report_intrastat(osv.osv):
                     inv.state in ('open','paid')
                     and inv_line.product_id is not null
                     and inv_country.intrastat=true
-                group by inv.period_id,intrastat.id,inv.type,pt.intrastat_id, inv_country.code,inv.number,  inv.currency_id
+                group by to_char(inv.create_date, 'YYYY'), to_char(inv.create_date, 'MM'),intrastat.id,inv.type,pt.intrastat_id, inv_country.code,inv.number,  inv.currency_id
             )""")
 
 report_intrastat()
-
diff --git a/addons/report_intrastat/report_intrastat_view.xml b/addons/report_intrastat/report_intrastat_view.xml
index baeb7f53af0..2242d37545b 100644
--- a/addons/report_intrastat/report_intrastat_view.xml
+++ b/addons/report_intrastat/report_intrastat_view.xml
@@ -12,7 +12,7 @@
                 </field>
             </field>
         </record>
-        
+
         <record id="view_country_form" model="ir.ui.view">
             <field name="name">res.country.form</field>
             <field name="model">res.country</field>
@@ -23,7 +23,7 @@
                 </field>
             </field>
         </record>
-        
+
         <!-- Product -->
         <record id="product_normal_form_view" model="ir.ui.view">
             <field name="name">product.normal.form</field>
@@ -35,7 +35,7 @@
                 </field>
             </field>
         </record>
-        
+
         <!-- Intrastat code -->
         <record id="view_report_intrastat_code_tree" model="ir.ui.view">
             <field name="name">report.intrastat.code.tree</field>
@@ -66,18 +66,19 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        
+
         <menuitem action="action_report_intrastat_code_tree" id="menu_report_intrastat_code" parent="product.menu_config_product"/>
-        
-        
+
+
         <record id="view_report_intrastat_tree" model="ir.ui.view">
             <field name="name">report.intrastat.view</field>
             <field name="model">report.intrastat</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Intrastat Data">
-                    <field name="name"/>
-                    <field name="code"/>    
+                    <field name="name" />
+	                <field name="month"/>
+                    <field name="code"/>
                     <field name="ref"/>
                     <field name="intrastat_id"/>
                     <field name="weight"/>
@@ -88,26 +89,27 @@
                 </tree>
             </field>
         </record>
-        
+
         <record id="view_report_intrastat_search" model="ir.ui.view">
             <field name="name">report.intrastat.search</field>
             <field name="model">report.intrastat</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Intrastat Data">
-                	<group col="8" colspan="4">
-	                	<filter icon="terp-stock" string="This Year" domain="[('name','=',time.strftime('%%Y'))]"/>
-						<filter icon="terp-stock" string="This Month" domain="[('name','=',time.strftime('%%b.%%Y'))]"/>
+                	<group col="10" colspan="4">
+                		<filter string="This Year" icon="terp-stock" domain="[('name','=',time.localtime()[0])]"/>
+						<filter string="This Month" icon="terp-stock" domain="[('month','=',time.localtime()[1])]"/>
 						<separator orientation="vertical"/>
 	                    <field name="name" select="1"/>
-	                    <field name="code" select="1"/>    
+	                    <field name="month" select="1"/>
+	                    <field name="code" select="1"/>
 	                    <field name="intrastat_id" select="1"/>
 	                    <field name="type" select="1"/>
 					</group>
                 </search>
             </field>
         </record>
-        
+
         <record id="action_report_intrastat_tree_all" model="ir.actions.act_window">
             <field name="name">Intrastat</field>
             <field name="type">ir.actions.act_window</field>
@@ -116,7 +118,7 @@
             <field name="view_mode">tree</field>
             <field name="search_view_id" ref="view_report_intrastat_search"/>
         </record>
-        
+
 		<menuitem action="action_report_intrastat_tree_all" id="menu_report_intrastat_all" parent="stock.next_id_61"/>
     </data>
 </openerp>