[MRG] merge lp:openobject-addons

bzr revid: tpa@tinyerp.com-20130813105040-bzc0jzotlnlwa197

diff --cc addons/crm/crm.py
Simple merge

diff --cc addons/crm/i18n/es_AR.po
index 7b09f19,524cdd9..818abea
--- 1/addons/crm/i18n/es_AR.po
--- 2/addons/crm/i18n/es_AR.po
+++ b/addons/crm/i18n/es_AR.po
@@@ -4,17 -5,17 +5,17 @@@
  #
  msgid ""
  msgstr ""
- "Project-Id-Version: OpenERP Server 5.0.0\n"
- "Report-Msgid-Bugs-To: support@openerp.com\n"
+ "Project-Id-Version: openobject-addons\n"
+ "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
  "POT-Creation-Date: 2012-12-21 17:04+0000\n"
- "PO-Revision-Date: 2009-09-15 15:45+0000\n"
- "Last-Translator: Silvana Herrera <sherrera@thymbra.com>\n"
- "Language-Team: \n"
 -"PO-Revision-Date: 2013-08-15 15:46+0000\n"
++"PO-Revision-Date: 2013-08-13 02:17+0000\n"
+ "Last-Translator: Laureano Kloss <Unknown>\n"
+ "Language-Team: Spanish (Argentina) <es_AR@li.org>\n"
  "MIME-Version: 1.0\n"
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
- "X-Launchpad-Export-Date: 2013-03-16 05:09+0000\n"
- "X-Generator: Launchpad (build 16532)\n"
 -"X-Launchpad-Export-Date: 2013-08-16 05:12+0000\n"
++"X-Launchpad-Export-Date: 2013-08-13 05:00+0000\n"
+ "X-Generator: Launchpad (build 16723)\n"
  
  #. module: crm
  #: view:crm.lead.report:0
@@@ -703,10 -769,10 +753,10 @@@ msgstr "
  #. module: crm
  #: view:board.board:0
  msgid "Statistics Dashboard"
 -msgstr "Tablero de estadísticas"
 +msgstr ""
  
  #. module: crm
- #: code:addons/crm/crm_lead.py:861
+ #: code:addons/crm/crm_lead.py:878
  #: model:crm.case.stage,name:crm.stage_lead2
  #: selection:crm.case.stage,type:0
  #: view:crm.lead:0
@@@ -766,10 -834,10 +816,10 @@@ msgid "Exclusive
  msgstr "Exclusivo"
  
  #. module: crm
- #: code:addons/crm/crm_lead.py:584
+ #: code:addons/crm/crm_lead.py:600
  #, python-format
  msgid "From %s : %s"
 -msgstr "Desde %s : %s"
 +msgstr ""
  
  #. module: crm
  #: view:crm.lead2opportunity.partner.mass:0

diff --cc addons/crm/report/crm_lead_report.py
Simple merge

diff --cc addons/crm/report/crm_lead_report_view.xml
index a9b7bc7,95cf1d4..f718d7a
--- 1/addons/crm/report/crm_lead_report_view.xml
--- 2/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@@ -66,10 -66,15 +66,12 @@@
              <field name="model">crm.lead.report</field>
              <field name="arch" type="xml">
                  <search string="Leads Analysis">
-                     <filter icon="terp-check" string="New" domain="[('state','=','draft')]" help="Leads/Opportunities which are in New state"/>
-                     <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]" help="Leads/Opportunities which are in open state"/>
-                     <filter icon="gtk-media-pause" string="Pending" domain="[('state','=','pending')]" help="Leads/Opportunities which are in pending state"/>
-                     <filter icon="terp-dialog-close" string="Closed" domain="[('state','=','done')]" help="Leads/Opportunities which are in done state"/>
 -                    <filter icon="terp-personal" name="lead" string="Lead" domain="[('type','=', 'lead')]" help="Show only lead"/>
 -                    <filter icon="terp-personal+" string="Opportunity" name="opportunity" domain="[('type','=','opportunity')]" help="Show only opportunity"/>
 -                    <separator/>
+                     <filter string="New" name="new"
+                             domain="[('probability', '=', 0), ('stage_id.sequence', '=', 1)]"/>
+                     <filter string="Won" name="won"
+                             domain="[('probability', '=', 100), ('stage_id.on_change', '=', 1)]"/>
+                     <filter string="Lost" name="lost"
+                             domain="[('probability', '=', 0), ('stage_id.sequence', '!=', 1)]"/>
                      <separator/>
                      <filter string="My Sales Team(s)" icon="terp-personal+" context="{'invisible_section': False}" domain="[('section_id.user_id','=',uid)]"
                              help="Leads/Opportunities that are assigned to one of the sale teams I manage" groups="base.group_multi_salesteams"/>
@@@ -146,12 -151,13 +148,13 @@@
                  <field name="type" invisible="1"/>
                  <field name="company_id" invisible="1" groups="base.group_multi_company"/>
                  <field name="nbr" string="#Opportunities" sum="#Opportunities"/>
 -                <field name="planned_revenue" sum="Planned Revenues"/>
 +                <field name="user_currency_planned_revenue" sum="Planned Revenues"/>
-                 <field name="delay_open" sum='Delay to open'/>
+                 <field name="delay_open" sum='Delay to Assign'/>
                  <field name="delay_close" sum='Delay to close'/>
+                 <field name="date_last_stage_update"/>
                  <field name="delay_expected"/>
                  <field name="probability" widget="progressbar"/>
 -                <field name="probable_revenue"/>
 +                <field name="user_currency_probable_revenue"/>
               </tree>
              </field>
          </record>

diff --cc addons/project/i18n/zh_CN.po
index c3bc3d2,242bca1..2bb41d2
--- 1/addons/project/i18n/zh_CN.po
--- 2/addons/project/i18n/zh_CN.po
+++ b/addons/project/i18n/zh_CN.po
@@@ -13,8 -13,8 +13,8 @@@ msgstr "
  "MIME-Version: 1.0\n"
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
- "X-Launchpad-Export-Date: 2013-08-07 04:46+0000\n"
- "X-Generator: Launchpad (build 16721)\n"
 -"X-Launchpad-Export-Date: 2013-08-14 04:54+0000\n"
++"X-Launchpad-Export-Date: 2013-08-13 05:00+0000\n"
+ "X-Generator: Launchpad (build 16723)\n"
  
  #. module: project
  #: view:project.project:0

diff --cc addons/sale_crm/sale_crm_view.xml
Simple merge