[MERGE]: Merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons2

bzr revid: rpa@tinyerp.com-20100524050838-x2zks9ar4xv4rruc

diff --cc addons/crm/i18n/it.po
index 9a00ef0,bd1f540..00d2f79
--- 1/addons/crm/i18n/it.po
--- 2/addons/crm/i18n/it.po
+++ b/addons/crm/i18n/it.po
@@@ -7,13 -7,13 +7,13 @@@ msgstr "
  "Project-Id-Version: OpenERP Server 5.0.0\n"
  "Report-Msgid-Bugs-To: support@openerp.com\n"
  "POT-Creation-Date: 2010-01-05 05:59+0000\n"
- "PO-Revision-Date: 2010-02-24 10:59+0000\n"
- "Last-Translator: Carlo Vettore <Unknown>\n"
 -"PO-Revision-Date: 2010-05-24 13:41+0000\n"
++"PO-Revision-Date: 2010-05-21 06:51+0000\n"
+ "Last-Translator: eLBati - albatos.com <lorenzo.battistini@albatos.com>\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: 2010-04-17 04:02+0000\n"
 -"X-Launchpad-Export-Date: 2010-05-25 03:42+0000\n"
++"X-Launchpad-Export-Date: 2010-05-22 04:00+0000\n"
  "X-Generator: Launchpad (build Unknown)\n"
  
  #. module: crm

diff --cc addons/crm/i18n/pl.po
index 285b5cc,a5d4a80..a0d4306
--- 1/addons/crm/i18n/pl.po
--- 2/addons/crm/i18n/pl.po
+++ b/addons/crm/i18n/pl.po
@@@ -7,13 -7,13 +7,13 @@@ msgstr "
  "Project-Id-Version: OpenERP Server 5.0.0\n"
  "Report-Msgid-Bugs-To: support@openerp.com\n"
  "POT-Creation-Date: 2010-01-05 05:59+0000\n"
- "PO-Revision-Date: 2010-05-14 20:14+0000\n"
 -"PO-Revision-Date: 2010-05-24 10:56+0000\n"
++"PO-Revision-Date: 2010-05-21 17:59+0000\n"
  "Last-Translator: Grzegorz Grzelak (Cirrus.pl) <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: 2010-05-15 04:58+0000\n"
 -"X-Launchpad-Export-Date: 2010-05-25 03:42+0000\n"
++"X-Launchpad-Export-Date: 2010-05-22 04:00+0000\n"
  "X-Generator: Launchpad (build Unknown)\n"
  
  #. module: crm

diff --cc addons/marketing_campaign/marketing_campaign_view.xml
index a5553d7,0c4ede2..f013f37
--- 1/addons/marketing_campaign/marketing_campaign_view.xml
--- 2/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@@ -143,7 -163,7 +143,7 @@@
                        <newline/>
                        <field name="ir_filter_id" select="1"/>
                        <newline/>
-                       <field name="date_run"/>
 -                      <field name="date_run" attrs="{'readonly':[('date_run','!=',False),('state','=','running')]}"/>
++                      <field name="date_run" attrs="{'readonly':[('date_run','!=',False)]}"/>
                        <field name="date_done"/>
                        <separator string="Synchronization" colspan="4" />
                                <field name="sync_last_date"/>

diff --cc addons/project/report/project_report.py
index 1b74c7e,dc9ad3a..128bdb3
--- 1/addons/project/report/project_report.py
--- 2/addons/project/report/project_report.py
+++ b/addons/project/report/project_report.py
@@@ -31,8 -31,8 +31,8 @@@ class report_project_task_user(osv.osv)
          'day': fields.char('Day', size=128, readonly=True),
          'year': fields.char('Year',size=64,required=False, readonly=True),
          'user_id':fields.many2one('res.users', 'Assigned To', readonly=True),
-         'date_start': fields.datetime('Starting Date',readonly=True),
+         'date_start': fields.date('Starting Date',readonly=True),
 -        'no_of_days': fields.integer('# of Days', size=128, readonly=True),
 +        'no_of_days': fields.integer('#Days', size=128, readonly=True),
          'description': fields.text('Description',readonly=True),
          'date_end': fields.date('Ending Date',readonly=True),
          'date_deadline': fields.date('Deadline',readonly=True),

diff --cc addons/project/report/project_report_view.xml
index a4a0728,542bfec..d4443e7
--- 1/addons/project/report/project_report_view.xml
--- 2/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@@ -50,15 -53,15 +50,15 @@@
              <field name="model">report.project.task.user</field>
              <field name="type">search</field>
              <field name="arch" type="xml">
 -                <search string="Tasks Analysis">
 +                <search string="Tasks">
                        <group>
-                           <filter icon="terp-project" string="This Year"
+                           <filter icon="terp-project" string="Last 365 Days"
                                    domain="[('date_start','&lt;=', time.strftime('%%Y-%%m-%%d')),('date_start','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
-                                   help="Tasks performed in this year"/>
-                           <filter icon="terp-project" string="This Month"
+                                   help="Tasks performed in last 365 Days"/>
+                           <filter icon="terp-project" string="Last 30 Days"
                                        name="month"
                                        domain="[('date_start','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date_start','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
-                                       help="Tasks performed in this month"/>
+                                       help="Tasks performed in last 30 days"/>
                                <filter icon="gtk-media-rewind"
                                    string="    7 Days    "
                                    separator="1"
@@@ -77,7 -80,12 +77,11 @@@
                                                icon="terp-project"
                                                domain="[('state','=','pending')]"
                                                help = "Pending tasks"/>
+                               <filter string="Done"
+                                       icon="terp-project"
+                                       name="done"
+                                       domain="[('state','=','done')]"/>
                                                <separator orientation="vertical"/>
 -                                              <field name="partner_id" />
                            <field name="user_id" widget="selection">
                                <filter icon="terp-project"
                                                string="My Task"
@@@ -98,25 -106,16 +102,21 @@@
                                                help ="Non assigned tasks to projects"
                                                domain="[('project_id','=',False"/>
                            </field>
++                          <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                      </group>
                      <newline/>
                        <group expand="0" string="Extended options..." colspan="10" col="12">
-                               <filter string="Done"
-                                       icon="terp-project"
-                                       name="done"
-                                       domain="[('state','=','done')]"/>
-                       <filter string="Cancelled"
-                                       icon="terp-project"
-                                       domain="[('state','=','cancelled')]"/>
-                       <separator orientation="vertical"/>
                            <field name="type" widget="selection"/>
-                           <field name="priority"/>
-                           <field name="partner_id" widget="selection"/>
                            <separator orientation="vertical"/>
+                         <field name="date_start"/>
 -                        <field name="date_deadline"/>
 -                          <separator orientation="vertical"/>
++                        <separator orientation="vertical"/>
 +                          <field name="date_deadline"/>
 +                          <newline/>
-                           <field name="date_start"/>
+                           <field name="priority"/>
 -                          <field name="company_id" groups="base.group_multi_company" widget="selection"/>
++                          <separator orientation="vertical"/>
 +                          <field name="date_end"/>
++                          <separator orientation="vertical"/>
++                          <field name="partner_id" />
                      </group>
                      <newline/>
                      <group expand="1" string="Group By..." colspan="10" col="11">

diff --cc addons/sale/i18n/pl.po
index 2016f90,5719d8d..5a29059
--- 1/addons/sale/i18n/pl.po
--- 2/addons/sale/i18n/pl.po
+++ b/addons/sale/i18n/pl.po
@@@ -7,13 -7,13 +7,13 @@@ msgstr "
  "Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
  "Report-Msgid-Bugs-To: support@openerp.com\n"
  "POT-Creation-Date: 2009-08-28 16:01+0000\n"
- "PO-Revision-Date: 2010-05-17 14:08+0000\n"
 -"PO-Revision-Date: 2010-05-24 20:45+0000\n"
++"PO-Revision-Date: 2010-05-21 08:21+0000\n"
  "Last-Translator: Grzegorz Grzelak (Cirrus.pl) <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: 2010-05-19 05:12+0000\n"
 -"X-Launchpad-Export-Date: 2010-05-25 03:42+0000\n"
++"X-Launchpad-Export-Date: 2010-05-22 04:00+0000\n"
  "X-Generator: Launchpad (build Unknown)\n"
  
  #. module: sale