[IMP] English Improvement resolved conflicts

bzr revid: kum@tinyerp.co.in-20091125113147-pmsqovlrx4ia54hf
bzr revid: kum@tinyerp.co.in-20091126062538-149ru08q9obdlksy
bzr revid: kum@tinyerp.co.in-20091126084252-ml6pgh170e6f4r3f

3 files changed, 34 insertions, 13 deletions

diff --git a/addons/report_document/i18n/sl.po b/addons/report_document/i18n/sl.po
index a8e4995fcd1..890690aa297 100644
--- a/addons/report_document/i18n/sl.po
+++ b/addons/report_document/i18n/sl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-17 06:52+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2009-11-23 07:35+0000\n"
+"Last-Translator: Simon Vidmar <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-11-18 04:43+0000\n"
+"X-Launchpad-Export-Date: 2009-11-24 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_document
@@ -39,7 +39,7 @@ msgstr ""
 #: model:ir.ui.menu,name:report_document.menu_action_view_my_document_report_shame
 #: view:report.document.wall:0
 msgid "Wall of Shame"
-msgstr ""
+msgstr "Zid sramu"
 
 #. module: report_document
 #: model:ir.model,name:report_document.model_report_files_partner
@@ -102,7 +102,7 @@ msgstr "Poročanje"
 #. module: report_document
 #: model:ir.model,name:report_document.model_report_document_wall
 msgid "Users that did not inserted documents since one month"
-msgstr ""
+msgstr "Uporabniki, ki v zadnjem mesecu niso vložili dokumentov"
 
 #. module: report_document
 #: model:ir.ui.menu,name:report_document.menu_action_view_my_document
@@ -229,12 +229,12 @@ msgstr "Datoteke po mesecih"
 #: model:ir.actions.act_window,name:report_document.action_view_document_by_resourcetype_graph
 #: view:report.document.user:0
 msgid "Files by Resource Type"
-msgstr ""
+msgstr "Datoteke po tipih virov"
 
 #. module: report_document
 #: model:ir.actions.act_window,name:report_document.action_view_all_document_tree
 msgid "All Users files (This month)"
-msgstr ""
+msgstr "Vse datoteke uporabnika (ta mesec)"
 
 #. module: report_document
 #: field:report.document.wall,last:0
diff --git a/addons/report_document/report_document.py b/addons/report_document/report_document.py
index 0da5b3430e5..911dc3a6ace 100644
--- a/addons/report_document/report_document.py
+++ b/addons/report_document/report_document.py
@@ -32,7 +32,7 @@
 
 from osv import fields,osv
 import time
-
+import tools
 
 class report_document_user(osv.osv):
     _name = "report.document.user"
@@ -81,7 +81,7 @@ class report_files_partner(osv.osv):
     _description = "Files details by Partners"
     _auto = False
     _columns = {
-        'name': fields.date('Month', readonly=True),
+        'name': fields.char('Year',size=64,required=False, readonly=True),
         'file_title': fields.char('File Name',size=64,readonly=True),
         'directory': fields.char('Directory',size=64,readonly=True),
         'create_date': fields.datetime('Date Created', readonly=True),
@@ -90,19 +90,23 @@ class report_files_partner(osv.osv):
         'nbr':fields.integer('# of Files', readonly=True),
         'type':fields.char('Directory Type',size=64,readonly=True),
         'partner':fields.char('Partner',size=64,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),
      }
     def init(self, cr):
+         tools.drop_view_if_exists(cr, 'report_files_partner')
          cr.execute("""
             create or replace view report_files_partner as (
                 select min(f.id) as id,count(*) as nbr,
-                       min(to_char(f.create_date,'YYYY-MM-01')) as name,
+                       to_char(f.create_date,'YYYY') as name,
+                       min(to_char(f.create_date,'MM')) as month,
                        min(f.title) as file_title,
                        p.name as partner 
                 from ir_attachment f 
                 inner join res_partner p 
                 on (f.partner_id=p.id)
                 where f.datas_fname is not null
-                group by p.name
+                group by p.name, to_char(f.create_date,'YYYY')
              )
          """)
 report_files_partner()
diff --git a/addons/report_document/report_document_view.xml b/addons/report_document/report_document_view.xml
index 746bf6d89c4..7226e953aa9 100644
--- a/addons/report_document/report_document_view.xml
+++ b/addons/report_document/report_document_view.xml
@@ -209,13 +209,14 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Files by Month">
-                    <field name="name" />
+                    <field name="name"/>
+                    <field name="month"/>
                     <field name="nbr"/>
                 </tree>
             </field>
         </record>
         
-            <record model="ir.actions.act_window" id="action_view_files_by_month_graph">
+        <record model="ir.actions.act_window" id="action_view_files_by_month_graph">
             <field name="name">Files by Month</field>
             <field name="res_model">report.document.user</field>
             <field name="view_id" ref="view_files_by_month_graph"></field>
@@ -269,11 +270,27 @@
             <field name="arch" type="xml">
                 <tree string="Files per Month">
                     <field name="name"/>
+                    <field name="month"/>
+                    <field name="partner"/>
+                    <field name="nbr"/>
+                </tree>
+            </field>
+        </record>
+        
+        <record model="ir.ui.view" id="view_files_by_partner_form">
+            <field name="name">view.files.partner.form</field>
+            <field name="model">report.files.partner</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <tree string="Files per Month">
+                    <field name="name" select="1"/>
+                    <field name="month" select="1"/>
                     <field name="partner"/>
                     <field name="nbr"/>
                 </tree>
             </field>
         </record>
+        
         <record model="ir.actions.act_window" id="action_view_files_by_partner">
             <field name="name">Files Per Partner</field>
             <field name="res_model">report.files.partner</field>