From 2926ac88a07b44a23879692f549e027b6c3d100d Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Mon, 19 Jul 2010 18:41:55 +0530
Subject: [PATCH 1/9] [IMP]: crm: Added selection in opportunity to phonecall
 wizard for phonecall type + Some minor Fixes

bzr revid: rpa@tinyerp.com-20100719131155-yl80i3mtq0g6tfuo
---
 addons/crm/crm_opportunity_view.xml               |  2 +-
 addons/crm/wizard/crm_lead_to_opportunity.py      |  2 +-
 addons/crm/wizard/crm_opportunity_to_phonecall.py | 15 ++++++++++++---
 .../wizard/crm_opportunity_to_phonecall_view.xml  |  1 +
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 894a4e86ea3..3a2e58efdb0 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -188,7 +188,7 @@
                                 <button string="Forward"
                                     attrs="{'invisible':[('partner_assigned_id','=',False)]}"
                                     name="%(crm_lead_forward_to_partner_act)d"
-                                    icon="gtk-go-forward" type="action"
+                                    icon="terp-mail-forward" type="action"
                                     context="{'default_name': 'partner', 'default_partner_id': partner_assigned_id}"
                                 />
                             </group>
diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index b8bc3172019..6ec060e624e 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -79,7 +79,7 @@ class crm_lead2opportunity(osv.osv_memory):
                 'probability': this.probability,
                 'name': this.name, 
                 'partner_id': this.partner_id.id, 
-                'user_id': this.partner_id.user_id.id or lead.user_id.id, 
+                'user_id': (this.partner_id.user_id and this.partner_id.user_id.id) or (lead.user_id and lead.user_id.id), 
                 'type': 'opportunity'
             }
             lead_obj.write(cr, uid, lead.id, vals, context=context)
diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall.py b/addons/crm/wizard/crm_opportunity_to_phonecall.py
index b808703304f..8c40201243c 100644
--- a/addons/crm/wizard/crm_opportunity_to_phonecall.py
+++ b/addons/crm/wizard/crm_opportunity_to_phonecall.py
@@ -33,6 +33,9 @@ class crm_opportunity2phonecall(osv.osv_memory):
         'user_id' : fields.many2one('res.users', "Assign To"),
         'date': fields.datetime('Date' , required=True),
         'section_id': fields.many2one('crm.case.section', 'Sales Team'),
+        'categ_id': fields.many2one('crm.case.categ', 'Category', required=True, \
+                        domain="[('section_id','=',section_id),\
+                        ('object_id.model', '=', 'crm.phonecall')]"), 
     }
 
     def default_get(self, cr, uid, fields, context=None):
@@ -47,6 +50,12 @@ class crm_opportunity2phonecall(osv.osv_memory):
         @return : default values of fields.
         """
         opp_obj = self.pool.get('crm.lead')
+        categ_id = False
+        data_obj = self.pool.get('ir.model.data')
+        res_id = data_obj._get_id(cr, uid, 'crm', 'categ_phone2')
+        if res_id:
+            categ_id = data_obj.browse(cr, uid, res_id, context=context).res_id
+
         record_ids = context and context.get('active_ids', []) or []
         res = super(crm_opportunity2phonecall, self).default_get(cr, uid, fields, context=context)
         for opp in opp_obj.browse(cr, uid, record_ids, context=context):
@@ -56,6 +65,8 @@ class crm_opportunity2phonecall(osv.osv_memory):
                 res.update({'user_id': opp.user_id and opp.user_id.id or False})
             if 'section_id' in fields:
                 res.update({'section_id': opp.section_id and opp.section_id.id or False})
+            if 'categ_id' in fields:
+                res.update({'categ_id': categ_id})
         return res
 
     def action_cancel(self, cr, uid, ids, context=None):
@@ -90,8 +101,6 @@ class crm_opportunity2phonecall(osv.osv_memory):
         res = mod_obj.read(cr, uid, result, ['res_id'])
 
         data_obj = self.pool.get('ir.model.data')
-        categ_id = mod_obj._get_id(cr, uid, 'crm', 'categ_phone1')
-        categ_id = data_obj.browse(cr, uid, categ_id, context=context).res_id
 
         # Select the view
         id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_phone_tree_view')
@@ -107,7 +116,7 @@ class crm_opportunity2phonecall(osv.osv_memory):
                         'name' : opp.name,
                         'case_id' : opp.id ,
                         'user_id' : this.user_id and this.user_id.id or False,
-                        'categ_id' : categ_id,
+                        'categ_id' : this.categ_id.id,
                         'description' : opp.description or False,
                         'date' : this.date,
                         'section_id' : this.section_id.id or opp.section_id.id or False,
diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
index da8db534812..4d0cf3129f6 100644
--- a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
+++ b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
@@ -17,6 +17,7 @@
                 		<newline/>
 						<field name="user_id" />
 						<field name="section_id"/>
+						<field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.phonecall')]"/>
 						<separator string="" colspan="4"/>
 						<label string ="" colspan="2"/>
 						<button name="action_cancel" string="_Cancel"

From 3f83263b12fe477375e5a775c1fe57860875aa3a Mon Sep 17 00:00:00 2001
From: "DBR(Open ERP)" <>
Date: Mon, 19 Jul 2010 19:11:03 +0530
Subject: [PATCH 2/9] [MOD] account invoice : tree view, color set for state

bzr revid: vir@tinyerp.com-20100719134103-fku44uean4ojkjy2
---
 addons/account/account_invoice_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 4cadfdfe5fe..90ef039e550 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -115,7 +115,7 @@
             <field name="model">account.invoice</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="blue:state in ('draft');black:state not in ('draft')" string="Invoice">
+                <tree colors="blue:state in ('draft');black:state in ('proforma','proforma2','open');gray:state in ('paid','cancel')" string="Invoice">
                     <field name="date_invoice"/>
                     <field name="number"/>
                     <field name="partner_id" groups="base.group_user"/>

From 0430e76c7e69a373813c71f265df0ced85b57d37 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Mon, 19 Jul 2010 19:12:08 +0530
Subject: [PATCH 3/9] [MOD] BI wizard : modificaiton in view size

bzr revid: vir@tinyerp.com-20100719134208-o35lkz10fk6mo461
---
 addons/olap/data/olap_cube_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/olap/data/olap_cube_view.xml b/addons/olap/data/olap_cube_view.xml
index bd30efeafe7..a93f59c2759 100644
--- a/addons/olap/data/olap_cube_view.xml
+++ b/addons/olap/data/olap_cube_view.xml
@@ -78,8 +78,8 @@
 	            <field name="arch" type="xml">
                 <form string="Parameters Configure wizard">
                    <group colspan="4" col="8">
-                       <group colspan="3" width="180" height="250">
-                           <field name="config_logo" widget="image" width="200" height="100" nolabel="1" colspan="1"/>
+                       <group colspan="3" width="220" height="250">
+                           <field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/>
                            <newline/>
                            <label align="0.0" string="This wizard will automatically configure the web client for Business Intelligence." width="200" colspan="2"/>
                        </group>

From 3adba48137d36dfb71a8835d71ca4517cad79fd8 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Mon, 19 Jul 2010 19:17:09 +0530
Subject: [PATCH 4/9] [FIX]: fix a problme bug/544287 - partner_bank to be
 partner_bank_id

lp bug: https://launchpad.net/bugs/544287 fixed

bzr revid: mga@tinyerp.com-20100719134709-7vuwjnto8s5p43jz
---
 addons/account/account.py                     | 30 +++++++++----------
 addons/account/account_invoice_view.xml       | 19 +++++++-----
 addons/account/invoice.py                     |  6 ++--
 .../account/report/account_invoice_report.py  |  6 ++--
 .../report/account_invoice_report_view.xml    |  2 +-
 addons/account_payment/account_move_line.py   |  4 +--
 addons/l10n_ch/account_invoice.xml            | 10 +++----
 addons/l10n_ch/account_move_line.py           |  4 +--
 addons/l10n_ch/invoice.py                     |  8 ++---
 addons/l10n_ch/wizard/wizard_bvr.py           |  8 ++---
 10 files changed, 50 insertions(+), 47 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 45d3cb4377c..9aadf24b7dd 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -2572,12 +2572,10 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         data_id = data_pool.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_journal_bank_view')])
         data = data_pool.browse(cr, uid, data_id[0])
         view_id_cash = data.res_id
-        #view_id_cash = self.pool.get('account.journal.view').search(cr, uid, [('name','=','Bank/Cash Journal View')])[0] #TOFIX: why put  fix name
-        
+       
         data_id = data_pool.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_journal_bank_view_multi')])
         data = data_pool.browse(cr, uid, data_id[0])
         ref_acc_bank = data.res_id
-        #ref_acc_bank = self.pool.get('account.journal.view').search(cr, uid, [('name','=','Bank/Cash Journal (Multi-Currency) View')])[0] #TOFIX: why put fix name
         ref_acc_bank = obj_multi.chart_template_id.bank_account_view_id
 
         current_num = 1
@@ -2604,8 +2602,8 @@ class wizard_multi_charts_accounts(osv.osv_memory):
 
             if obj_multi.seq_journal:
                 vals_seq={
-                        'name': _('Bank Journal ') + vals['name'],
-                        'code': 'account.journal',
+                    'name': _('Bank Journal ') + vals['name'],
+                    'code': 'account.journal',
                 }
                 seq_id = obj_sequence.create(cr,uid,vals_seq)
 
@@ -2661,9 +2659,9 @@ class wizard_multi_charts_accounts(osv.osv_memory):
             for position in obj_fiscal_position_template.browse(cr, uid, fp_ids):
 
                 vals_fp = {
-                           'company_id' : company_id,
-                           'name' : position.name,
-                           }
+                    'company_id' : company_id,
+                    'name' : position.name,
+                }
                 new_fp = obj_fiscal_position.create(cr, uid, vals_fp)
 
                 obj_tax_fp = self.pool.get('account.fiscal.position.tax')
@@ -2671,18 +2669,18 @@ class wizard_multi_charts_accounts(osv.osv_memory):
 
                 for tax in position.tax_ids:
                     vals_tax = {
-                                'tax_src_id' : tax_template_ref[tax.tax_src_id.id],
-                                'tax_dest_id' : tax.tax_dest_id and tax_template_ref[tax.tax_dest_id.id] or False,
-                                'position_id' : new_fp,
-                                }
+                        'tax_src_id' : tax_template_ref[tax.tax_src_id.id],
+                        'tax_dest_id' : tax.tax_dest_id and tax_template_ref[tax.tax_dest_id.id] or False,
+                        'position_id' : new_fp,
+                    }
                     obj_tax_fp.create(cr, uid, vals_tax)
 
                 for acc in position.account_ids:
                     vals_acc = {
-                                'account_src_id' : acc_template_ref[acc.account_src_id.id],
-                                'account_dest_id' : acc_template_ref[acc.account_dest_id.id],
-                                'position_id' : new_fp,
-                                }
+                        'account_src_id' : acc_template_ref[acc.account_src_id.id],
+                        'account_dest_id' : acc_template_ref[acc.account_dest_id.id],
+                        'position_id' : new_fp,
+                    }
                     obj_ac_fp.create(cr, uid, vals_acc)
         
         #fially inactive the demo chart of accounts
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 90ef039e550..7572ae2aa59 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -5,7 +5,6 @@
         <!--
         Invoices
         -->
-
         <record id="view_invoice_line_calendar" model="ir.ui.view">
             <field name="name">account.invoice.calendar</field>
             <field name="model">account.invoice</field>
@@ -17,6 +16,7 @@
                 </calendar>
             </field>
         </record>
+        
         <record model="ir.ui.view" id="view_invoice_graph">
             <field name="name">account.invoice.graph</field>
             <field name="model">account.invoice</field>
@@ -28,6 +28,7 @@
                 </graph>
             </field>
         </record>
+        
         <record id="view_invoice_line_tree" model="ir.ui.view">
             <field name="name">account.invoice.line.tree</field>
             <field name="model">account.invoice.line</field>
@@ -44,6 +45,7 @@
                 </tree>
             </field>
         </record>
+        
         <record id="view_invoice_line_form" model="ir.ui.view">
             <field name="name">account.invoice.line.form</field>
             <field name="model">account.invoice.line</field>
@@ -74,6 +76,7 @@
                 </form>
             </field>
         </record>
+        
         <record id="view_invoice_tax_tree" model="ir.ui.view">
             <field name="name">account.invoice.tax.tree</field>
             <field name="model">account.invoice.tax</field>
@@ -89,6 +92,7 @@
                 </tree>
             </field>
         </record>
+        
         <record id="view_invoice_tax_form" model="ir.ui.view">
             <field name="name">account.invoice.tax.form</field>
             <field name="model">account.invoice.tax</field>
@@ -149,7 +153,7 @@
                         <field name="currency_id" domain="[('company_id','=', company_id)]" on_change="onchange_currency_id(currency_id, company_id)" width="50"/>
                         <button name="%(action_account_change_currency)d" type="action" icon="terp-stock_effects-object-colorize" string="Change"/>
                         <newline/>
-                        <field name="partner_id" domain="[('supplier','=', 1)]" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank,company_id)" context="{'default_customer': 0}"/>
+                        <field name="partner_id" domain="[('supplier','=', 1)]" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" context="{'default_customer': 0}"/>
                         <field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/>
                         <field name="fiscal_position" groups="base.group_extended" widget="selection"/>
                         <newline/>
@@ -212,7 +216,7 @@
                             </group>
                         </page>
                         <page string="Other Info">
-                            <field domain="[('partner_id', '=', partner_id)]" name="partner_bank" on_change="onchange_partner_bank(partner_bank)"/>
+                            <field domain="[('partner_id', '=', partner_id)]" name="partner_bank_id" on_change="onchange_partner_bank(partner_bank_id)"/>
 
                             <field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line,currency_id)" widget="selection" groups="base.group_multi_company"/>
                             <newline/>
@@ -245,7 +249,6 @@
             </field>
         </record>
 
-
         <record id="invoice_form" model="ir.ui.view">
             <field name="name">account.invoice.form</field>
             <field name="model">account.invoice</field>
@@ -259,7 +262,7 @@
                     <field name="currency_id" domain="[('company_id','=', company_id)]" on_change="onchange_currency_id(currency_id, company_id)" width="50"/>
                     <button name="%(action_account_change_currency)d" type="action" icon="terp-stock_effects-object-colorize" string="Change"/>
                     <newline/>
-                    <field name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank,company_id)" groups="base.group_user"/>
+                    <field name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" groups="base.group_user"/>
                     <field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/>
                     <field name="fiscal_position" groups="base.group_extended" widget="selection"/>
                     <newline/>
@@ -312,7 +315,7 @@
                             <field name="date_due"/>
                             <field name="user_id"/>
                             <newline/>
-                            <field domain="[('partner_id.ref_companies', 'in', [company_id])]" name="partner_bank"
+                            <field domain="[('partner_id.ref_companies', 'in', [company_id])]" name="partner_bank_id"
                                 groups="base.group_extended"/>
                             <field name="origin"/>
                             <field colspan="4" domain="[('partner_id','=',partner_id)]" name="address_contact_id"
@@ -403,6 +406,7 @@
             <field name="view_mode">tree</field>
             <field name="act_window_id" ref="action_invoice_tree"/>
         </record>
+        
         <record id="action_invoice_tree_view2" model="ir.actions.act_window.view">
             <field eval="2" name="sequence"/>
             <field name="view_mode">form</field>
@@ -421,11 +425,13 @@
             <field name="context">{'type':'out_invoice'}</field>
             <field name="search_view_id" ref="view_account_invoice_filter"/>
         </record>
+        
         <record id="action_invoice_tree1_view1" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
             <field name="view_mode">tree</field>
             <field name="act_window_id" ref="action_invoice_tree1"/>
         </record>
+        
         <record id="action_invoice_tree1_view2" model="ir.actions.act_window.view">
             <field eval="2" name="sequence"/>
             <field name="view_mode">form</field>
@@ -469,7 +475,6 @@
             <field name="view_id" ref="invoice_form"/>
             <field name="act_window_id" ref="action_invoice_tree3"/>
         </record>
-
         <menuitem action="action_invoice_tree3" id="menu_action_invoice_tree3" parent="menu_finance_receivables"/>
 
         <record id="action_invoice_tree4" model="ir.actions.act_window">
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 3ccfdb160c9..55ec3ab43f1 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -299,7 +299,7 @@ class account_invoice(osv.osv):
                 'account.move.line': (_get_invoice_from_line, None, 50),
                 'account.move.reconcile': (_get_invoice_from_reconcile, None, 50),
             }, help="The Ledger Postings of the invoice have been reconciled with Ledger Postings of the payment(s)."),
-        'partner_bank': fields.many2one('res.partner.bank', 'Bank Account',
+        'partner_bank_id': fields.many2one('res.partner.bank', 'Bank Account',
             help='Bank Account Number, Company bank account if Invoice is customer or supplier refund, otherwise Parner bank account number.', readonly=True, states={'draft':[('readonly',False)]}),
         'move_lines':fields.function(_get_lines , method=True, type='many2many', relation='account.move.line', string='Entry Lines'),
         'residual': fields.function(_amount_residual, method=True, digits_compute=dp.get_precision('Account'), string='Residual',
@@ -373,7 +373,7 @@ class account_invoice(osv.osv):
 #   def get_invoice_address(self, cr, uid, ids):
 #       res = self.pool.get('res.partner').address_get(cr, uid, [part], ['invoice'])
 #       return [{}]
-    def onchange_partner_id(self, cr, uid, ids, type, partner_id,
+    def onchange_partner_id(self, cr, uid, ids, type, partner_id,\
             date_invoice=False, payment_term=False, partner_bank=False, company_id=False):
         invoice_addr_id = False
         contact_addr_id = False
@@ -429,7 +429,7 @@ class account_invoice(osv.osv):
         }
 
         if type in ('in_invoice', 'in_refund'):
-            result['value']['partner_bank'] = bank_id
+            result['value']['partner_bank_id'] = bank_id
 
         if payment_term != partner_payment_term:
             if partner_payment_term:
diff --git a/addons/account/report/account_invoice_report.py b/addons/account/report/account_invoice_report.py
index a06c59da06a..825fdeaa44f 100644
--- a/addons/account/report/account_invoice_report.py
+++ b/addons/account/report/account_invoice_report.py
@@ -68,7 +68,7 @@ class account_invoice_report(osv.osv):
         'address_contact_id': fields.many2one('res.partner.address', 'Contact Address Name', readonly=True),
         'address_invoice_id': fields.many2one('res.partner.address', 'Invoice Address Name', readonly=True),
         'account_id': fields.many2one('account.account', 'Account',readonly=True),
-        'partner_bank': fields.many2one('res.partner.bank', 'Bank Account',readonly=True),
+        'partner_bank_id': fields.many2one('res.partner.bank', 'Bank Account',readonly=True),
         'residual':fields.float('Total Residual', readonly=True),
         'delay_to_pay':fields.float('Avg. Delay To Pay', readonly=True, group_operator="avg"),
     }
@@ -101,7 +101,7 @@ class account_invoice_report(osv.osv):
                     ai.address_contact_id as address_contact_id,
                     ai.address_invoice_id as address_invoice_id,
                     ai.account_id as account_id,
-                    ai.partner_bank as partner_bank,
+                    ai.partner_bank_id as partner_bank_id,
                     sum(case when ai.type in ('out_refund','in_invoice') then
                          ail.quantity * u.factor * -1
                         else
@@ -152,7 +152,7 @@ class account_invoice_report(osv.osv):
                     ai.address_contact_id,
                     ai.address_invoice_id,
                     ai.account_id,
-                    ai.partner_bank,
+                    ai.partner_bank_id,
                     ai.residual
             )
         """)
diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index d03e977336b..3ea50b8925c 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -25,7 +25,7 @@
                 <field name="date_due" invisible="1"/>
                 <field name="address_contact_id" invisible="1"/>
                 <field name="address_invoice_id" invisible="1"/>
-                <field name="partner_bank" invisible="1"/>
+                <field name="partner_bank_id" invisible="1"/>
                 <field name="account_id" invisible="1"/>
                 <field name="nbr" sum="# of Lines"/>
                 <field name="product_qty" sum="Qty"/>
diff --git a/addons/account_payment/account_move_line.py b/addons/account_payment/account_move_line.py
index 27455183afd..ca583188a63 100644
--- a/addons/account_payment/account_move_line.py
+++ b/addons/account_payment/account_move_line.py
@@ -93,8 +93,8 @@ class account_move_line(osv.osv):
                 context=context)
         for line in self.browse(cr, uid, ids, context=context):
             line2bank[line.id] = False
-            if line.invoice and line.invoice.partner_bank:
-                line2bank[line.id] = line.invoice.partner_bank.id
+            if line.invoice and line.invoice.partner_bank_id:
+                line2bank[line.id] = line.invoice.partner_bank_id.id
             elif line.partner_id:
                 if not line.partner_id.bank_ids:
                     #raise osv.except_osv(_('Error !'), _('Partner '+ line.partner_id.name+ ' has no bank account defined'))
diff --git a/addons/l10n_ch/account_invoice.xml b/addons/l10n_ch/account_invoice.xml
index e6602e686f8..e66f2b0f888 100644
--- a/addons/l10n_ch/account_invoice.xml
+++ b/addons/l10n_ch/account_invoice.xml
@@ -22,10 +22,10 @@
             <field name="inherit_id" ref="account.invoice_supplier_form"/>
             <field name="priority" eval="18"/>
             <field name="arch" type="xml">
-                <field name="partner_bank" position="replace">
-                    <field name="partner_bank"
+                <field name="partner_bank_id" position="replace">
+                    <field name="partner_bank_id"
                         domain="[('partner_id', '=', partner_id)]"
-                        on_change="onchange_partner_bank(partner_bank)"/>
+                        on_change="onchange_partner_bank(partner_bank_id)"/>
                 </field>
             </field>
         </record>
@@ -35,8 +35,8 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.invoice_form"/>
             <field name="arch" type="xml">
-                <field name="partner_bank" position="replace">
-                    <field name="partner_bank"
+                <field name="partner_bank_id" position="replace">
+                    <field name="partner_bank_id"
                         domain="[('partner_id.ref_companies', 'in', [company_id])]"/>
                 </field>
             </field>
diff --git a/addons/l10n_ch/account_move_line.py b/addons/l10n_ch/account_move_line.py
index 006b79d24f8..d326a98b611 100644
--- a/addons/l10n_ch/account_move_line.py
+++ b/addons/l10n_ch/account_move_line.py
@@ -57,8 +57,8 @@ class AccountMoveLine(osv.osv):
         bank_type = payment_mode_obj.suitable_bank_types(cr, uid, payment_type,
                 context=context)
         for line in self.browse(cr, uid, ids, context=context):
-            if line.invoice and line.invoice.partner_bank:
-                line2bank[line.id] = line.invoice.partner_bank.id
+            if line.invoice and line.invoice.partner_bank_id:
+                line2bank[line.id] = line.invoice.partner_bank_id.id
             elif line.partner_id:
                 for bank in line.partner_id.bank_ids:
                     if bank.state in bank_type:
diff --git a/addons/l10n_ch/invoice.py b/addons/l10n_ch/invoice.py
index 3d707b3b39e..fc0ec3dd762 100644
--- a/addons/l10n_ch/invoice.py
+++ b/addons/l10n_ch/invoice.py
@@ -82,7 +82,7 @@ class account_invoice(osv.osv):
         'reference_type': fields.selection(_get_reference_type,
             'Reference Type', required=True),
         ### Partner bank link between bank and partner id   
-        'partner_bank': fields.many2one('res.partner.bank', 'Bank Account',
+        'partner_bank_id': fields.many2one('res.partner.bank', 'Bank Account',
             help='The partner bank account to pay\nKeep empty to use the default'
             ),
         ### Amount to pay
@@ -129,8 +129,8 @@ class account_invoice(osv.osv):
         on the BVR reference type and the invoice partner bank type"""
         for invoice in self.browse(cursor, user, ids):
             if invoice.type in 'in_invoice':
-                if invoice.partner_bank and \
-                        invoice.partner_bank.state in \
+                if invoice.partner_bank_id and \
+                        invoice.partner_bank_id.state in \
                         ('bvrbank', 'bvrpost') and \
                         invoice.reference_type != 'bvr':
                             return False
@@ -173,7 +173,7 @@ class account_invoice(osv.osv):
                 bank_id = p.bank_ids[0].id
 
         if type in ('in_invoice', 'in_refund'):
-            res['value']['partner_bank'] = bank_id
+            res['value']['partner_bank_id'] = bank_id
 
         if partner_bank != bank_id:
             to_update = self.onchange_partner_bank(cr, uid, ids, bank_id)
diff --git a/addons/l10n_ch/wizard/wizard_bvr.py b/addons/l10n_ch/wizard/wizard_bvr.py
index 15bdb85b356..10258a4b8bd 100644
--- a/addons/l10n_ch/wizard/wizard_bvr.py
+++ b/addons/l10n_ch/wizard/wizard_bvr.py
@@ -39,22 +39,22 @@ def _check(self, cr, uid, data, context):
     pool = pooler.get_pool(cr.dbname)
     invoice_obj = pool.get('account.invoice')
     for invoice in invoice_obj.browse(cr, uid, data['ids'], context):
-        if not invoice.partner_bank:
+        if not invoice.partner_bank_is:
             raise wizard.except_wizard(_('UserError'),
                     _('No bank specified on invoice:\n%s') % \
                             invoice_obj.name_get(cr, uid, [invoice.id], context=context)[0][1])
 
         if not re.compile('[0-9][0-9]-[0-9]{3,6}-[0-9]').match(
-                invoice.partner_bank.bvr_number or ''):
+                invoice.partner_bank_id.bvr_number or ''):
             raise wizard.except_wizard(_('UserError'),
                     _('Your bank BVR number should be of the form 0X-XXX-X!\n' \
                             'Please check your company ' \
                             'information for the invoice:\n%s') % \
                             invoice_obj.name_get(cr, uid, [invoice.id], context=context)[0][1])
 
-        if invoice.partner_bank.bvr_adherent_num \
+        if invoice.partner_bank_id.bvr_adherent_num \
                 and not re.compile('[0-9]*$').match(
-                        invoice.partner_bank.bvr_adherent_num):
+                        invoice.partner_bank_id.bvr_adherent_num):
             raise wizard.except_wizard(_('UserError'),
                     _('Your bank BVR adherent number must contain exactly seven' \
                             'digits!\nPlease check your company ' \

From 1417b374c3c8dbb1ad443fb1522d3decdbae14a1 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Mon, 19 Jul 2010 19:23:20 +0530
Subject: [PATCH 5/9] [IMP]: crm: Added probable revenue in opportunities
 analysis

bzr revid: rpa@tinyerp.com-20100719135320-yv322stesi4xxwmn
---
 addons/crm/report/crm_lead_report.py       | 2 ++
 addons/crm/report/crm_lead_report_view.xml | 1 +
 2 files changed, 3 insertions(+)

diff --git a/addons/crm/report/crm_lead_report.py b/addons/crm/report/crm_lead_report.py
index 98515b6ab43..4f6f39e0690 100644
--- a/addons/crm/report/crm_lead_report.py
+++ b/addons/crm/report/crm_lead_report.py
@@ -97,6 +97,7 @@ class crm_lead_report(osv.osv):
         'delay_expected': fields.float('Overpassed Deadline',digits=(16,2),readonly=True, group_operator="avg"),
         'probability': fields.float('Probability',digits=(16,2),readonly=True, group_operator="avg"),
         'planned_revenue': fields.float('Planned Revenue',digits=(16,2),readonly=True),
+        'probable_revenue': fields.float('Probable Revenue', digits=(16,2),readonly=True),
         'categ_id': fields.many2one('crm.case.categ', 'Category',\
                          domain="[('section_id','=',section_id),\
                         ('object_id.model', '=', 'crm.lead')]" , readonly=True),
@@ -144,6 +145,7 @@ class crm_lead_report(osv.osv):
                     c.partner_id,
                     c.country_id,
                     c.planned_revenue,
+                    c.planned_revenue*(c.probability/100) as probable_revenue, 
                     1 as nbr,
                     0 as avg_answers,
                     0.0 as perc_done,
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index 30e01c2c713..1334014063f 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -175,6 +175,7 @@
                 <field name="delay_close" sum='Delay to close'/>
                 <field name="delay_expected"/>
                 <field name="probability" widget="progressbar"/>
+                <field name="probable_revenue"/>
              </tree>
             </field>
         </record>

From e368981d2e2655b33fecd446bd12baaef5e7f9f4 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Mon, 19 Jul 2010 19:32:15 +0530
Subject: [PATCH 6/9] [FIX]: crm: Always add the To to global CC when forward
 that lead to any partner

bzr revid: rpa@tinyerp.com-20100719140215-q0ek406j71mynts5
---
 addons/crm/wizard/crm_forward_to_partner.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/crm/wizard/crm_forward_to_partner.py b/addons/crm/wizard/crm_forward_to_partner.py
index d0b3179a0ca..a942b79380b 100644
--- a/addons/crm/wizard/crm_forward_to_partner.py
+++ b/addons/crm/wizard/crm_forward_to_partner.py
@@ -186,13 +186,13 @@ class crm_lead_forward_to_partner(osv.osv_memory):
             to_write.update({'user_id' : this.user_id.id})
         email_re = r'([^ ,<@]+@[^> ,]+)'
         email_cc = re.findall(email_re, case.email_cc or '')
-        new_cc = ''
+        new_cc = []
         for to in this.email_to.split(','):
             email_to = re.findall(email_re, to)
             email_to = email_to and email_to[0] or ''
             if email_to not in email_cc:
-                new_cc += ', ' + to
-        to_write.update({'email_cc' : case.email_cc and case.email_cc + new_cc})
+                new_cc.append(to)
+        to_write.update({'email_cc' : case.email_cc or '' + ','.join(new_cc)})
         case_pool.write(cr, uid, case.id, to_write, context=context)
 
         return {}

From bf51b2b5d62c7c7ba9d794c33bce7fe597a349b6 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Mon, 19 Jul 2010 19:37:31 +0530
Subject: [PATCH 7/9] [IMP] l10n_ch: changes of field on invoice partner_bank
 to partner_bank_id

bzr revid: mra@mra-laptop-20100719140731-i2drqon3vvvzfr10
---
 addons/l10n_ch/account_invoice.xml  |  4 +--
 addons/l10n_ch/invoice.py           | 42 ++++++++++++++---------------
 addons/l10n_ch/report/bvr.py        | 16 +++++------
 addons/l10n_ch/report/bvr.rml       | 18 ++++++-------
 addons/l10n_ch/report/invoice.rml   | 18 ++++++-------
 addons/l10n_ch/wizard/wizard_bvr.py |  4 +--
 6 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/addons/l10n_ch/account_invoice.xml b/addons/l10n_ch/account_invoice.xml
index e66f2b0f888..37bdf170ceb 100644
--- a/addons/l10n_ch/account_invoice.xml
+++ b/addons/l10n_ch/account_invoice.xml
@@ -9,12 +9,12 @@
             <field name="arch" type="xml">
                 <field name="partner_id" position="replace">
                     <field name="partner_id"
-                        on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank)"
+                        on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id)"
                         select="1"/>
                 </field>
             </field>
         </record>
-        
+
         <record model="ir.ui.view" id="invoice_supplier_form8">
             <field name="name">account.invoice.supplier.form.inherit</field>
             <field name="model">account.invoice</field>
diff --git a/addons/l10n_ch/invoice.py b/addons/l10n_ch/invoice.py
index fc0ec3dd762..afdd93c703d 100644
--- a/addons/l10n_ch/invoice.py
+++ b/addons/l10n_ch/invoice.py
@@ -40,27 +40,27 @@ class account_invoice(osv.osv):
     """Inherit account.invoice in order to add bvr
     printing functionnalites. BVR is a Swiss payment vector"""
     _inherit = "account.invoice"
-    
+
     ## @param self The object pointer.
     ## @param cursor a psycopg cursor
     ## @param user res.user.id that is currently loged
-    ## @parma context a standard dict 
+    ## @parma context a standard dict
     ## @return a list of tuple (name,value)
     def _get_reference_type(self, cursor, user, context=None):
-        """Function use by the function field reference_type in order to initalise available 
+        """Function use by the function field reference_type in order to initalise available
         BVR Reference Types"""
         res = super(account_invoice, self)._get_reference_type(cursor, user,
                 context=context)
         res.append(('bvr', 'BVR'))
         return res
-    
+
     ## @param self The object pointer.
     ## @param cursor a psycopg cursor
     ## @param user res.user.id that is currently loged
     ## @parma context a standard dict
-    ## @param name of the files 
-    ## @param args a list of diverse argument 
-    ## @parma context a standard dict 
+    ## @param name of the files
+    ## @param args a list of diverse argument
+    ## @parma context a standard dict
     ## @return a  dict (invoice id,amount to pay)
     def _amount_to_pay(self, cursor, user, ids, name, args, context=None):
         '''Return the amount still to pay regarding all the payment orders'''
@@ -81,7 +81,7 @@ class account_invoice(osv.osv):
         ### BVR reference type BVR or FREE
         'reference_type': fields.selection(_get_reference_type,
             'Reference Type', required=True),
-        ### Partner bank link between bank and partner id   
+        ### Partner bank link between bank and partner id
         'partner_bank_id': fields.many2one('res.partner.bank', 'Bank Account',
             help='The partner bank account to pay\nKeep empty to use the default'
             ),
@@ -91,12 +91,12 @@ class account_invoice(osv.osv):
             help='The amount which should be paid at the current date\n' \
                     'minus the amount which is already in payment order'),
     }
-    
+
     ## @param self The object pointer.
     ## @param cursor a psycopg cursor
     ## @param user res.user.id that is currently loged
     ## @parma ids invoices id
-    ## @return a boolean True if valid False if invalid 
+    ## @return a boolean True if valid False if invalid
     def _check_bvr(self, cr, uid, ids):
         """
         Function to validate a bvr reference like :
@@ -123,9 +123,9 @@ class account_invoice(osv.osv):
     ## @param cursor a psycopg cursor
     ## @param user res.user.id that is currently loged
     ## @parma ids invoices id
-    ## @return a boolean True if valid False if invalid 
+    ## @return a boolean True if valid False if invalid
     def _check_reference_type(self, cursor, user, ids):
-        """Check the customer invoice reference type depending 
+        """Check the customer invoice reference type depending
         on the BVR reference type and the invoice partner bank type"""
         for invoice in self.browse(cursor, user, ids):
             if invoice.type in 'in_invoice':
@@ -142,7 +142,7 @@ class account_invoice(osv.osv):
         (_check_reference_type, 'Error: BVR reference is required.',
             ['reference_type']),
     ]
-    
+
     ## @param self The object pointer.
     ## @param cr a psycopg cursor
     ## @param uid res.user.id that is currently loged
@@ -154,16 +154,16 @@ class account_invoice(osv.osv):
     ## @param partner_bank_id the partner linked invoice bank
     ## @return the dict of values with the partner_bank value updated
     def onchange_partner_id(self, cr, uid, ids, type, partner_id,
-            date_invoice=False, payment_term=False, partner_bank=False, company_id=False):
+            date_invoice=False, payment_term=False, partner_bank_id=False, company_id=False):
         """ Function that is call when the partner of the invoice is changed
         it will retriev and set the good bank partner bank"""
         res = super(account_invoice, self).onchange_partner_id(
                                                                 cr,
-                                                                 uid, 
-                                                                 ids, 
+                                                                 uid,
+                                                                 ids,
                                                                  type,
-                                                                 partner_id, 
-                                                                 date_invoice, 
+                                                                 partner_id,
+                                                                 date_invoice,
                                                                  payment_term
                                                             )
         bank_id = False
@@ -175,17 +175,17 @@ class account_invoice(osv.osv):
         if type in ('in_invoice', 'in_refund'):
             res['value']['partner_bank_id'] = bank_id
 
-        if partner_bank != bank_id:
+        if partner_bank_id != bank_id:
             to_update = self.onchange_partner_bank(cr, uid, ids, bank_id)
             res['value'].update(to_update['value'])
         return res
-        
+
     ## @param self The object pointer.
     ## @param cursor a psycopg cursor
     ## @param user res.user.id that is currently loged
     ## @parma ids invoices id
     ## @param partner_bank_id the partner linked invoice bank
-    ## @return the dict of values with the reference type  value updated 
+    ## @return the dict of values with the reference type  value updated
     def onchange_partner_bank(self, cursor, user, ids, partner_bank_id):
         """update the reference type depending of the partner bank"""
         res = {'value': {}}
diff --git a/addons/l10n_ch/report/bvr.py b/addons/l10n_ch/report/bvr.py
index ffbe45d8e80..ce97ac1a1a7 100644
--- a/addons/l10n_ch/report/bvr.py
+++ b/addons/l10n_ch/report/bvr.py
@@ -34,7 +34,7 @@ import time
 from report import report_sxw
 from tools import mod10r
 import re
-import os 
+import os
 import sys
 import shutil
 from mx.DateTime import *
@@ -61,11 +61,11 @@ class account_invoice_bvr(report_sxw.rml_parse):
         if date_to_format:
             date_formatted = strptime(date_to_format,'%Y-%m-%d').strftime('%d.%m.%Y')
         return date_formatted
-        
+
     def police_absolute_path(self, inner_path) :
         path = os.path.join(os.path.dirname(sys.argv[0]), inner_path)
         return  path
-        
+
     def copyocrbfile(self,file):
         src = self.police_absolute_path(file)
         file = os.path.basename(src)
@@ -74,10 +74,10 @@ class account_invoice_bvr(report_sxw.rml_parse):
             try:
                 shutil.copyfile(src,dest)
             except:
-                """print ocrbfile was not copy in /tmp/ please 
+                """print ocrbfile was not copy in /tmp/ please
                 copy it manually from l10_ch/report"""
-        
-            
+
+
 
     def comma_me(self,amount):
         if  type(amount) is float :
@@ -101,8 +101,8 @@ class account_invoice_bvr(report_sxw.rml_parse):
 
     def _get_ref(self, o):
         res = ''
-        if o.partner_bank.bvr_adherent_num:
-            res = o.partner_bank.bvr_adherent_num
+        if o.partner_bank_id.bvr_adherent_num:
+            res = o.partner_bank_id.bvr_adherent_num
         invoice_number = ''
         if o.number:
             invoice_number = re.sub('[^0-9]', '0', o.number)
diff --git a/addons/l10n_ch/report/bvr.rml b/addons/l10n_ch/report/bvr.rml
index a3eed479be9..b7e3388973a 100755
--- a/addons/l10n_ch/report/bvr.rml
+++ b/addons/l10n_ch/report/bvr.rml
@@ -13,7 +13,7 @@
             <stroke color="black"/>
             <lines>1.3cm 27.7cm 20cm 27.7cm</lines>
 
-            <drawRightString x="20cm" y="27.8cm">[[ company.rml_header1 ]] </drawRightString>            
+            <drawRightString x="20cm" y="27.8cm">[[ company.rml_header1 ]] </drawRightString>
             <drawString x="1.3cm" y="27.2cm">[[ company.partner_id.name ]]</drawString>
             <drawString x="1.3cm" y="26.8cm">[[ company.partner_id.address and company.partner_id.address[0].street or  '' ]]</drawString>
             <drawString x="1.3cm" y="26.4cm">[[ company.partner_id.address and company.partner_id.address[0].zip or '' ]] [[ company.partner_id.address and company.partner_id.address[0].city or '' ]] - [[ company.partner_id.address and company.partner_id.address[0].country_id and company.partner_id.address[0].country_id.name  or '']]</drawString>
@@ -112,11 +112,11 @@
 	-->
 	<illustration width="210mm" height="106mm">
 		<setFont name="Helvetica" size="11"/>
-        <drawString x="2mm" y="93mm">[[ o.partner_bank and o.partner_bank.printBank and o.partner_bank.bank and o.partner_bank.bank.name or '' ]]</drawString>
-		<drawString x="2mm" y="88mm">[[ o.partner_bank and o.partner_bank.printBank and o.partner_bank.bank and o.partner_bank.bank.zip or '']] [[ o.partner_bank and o.partner_bank.printBank and o.partner_bank.bank and o.partner_bank.bank.city or '']]</drawString>
+        <drawString x="2mm" y="93mm">[[ o.partner_bank_id and o.partner_bank_id.printBank and o.partner_bank_id.bank and o.partner_bank_id.bank.name or '' ]]</drawString>
+		<drawString x="2mm" y="88mm">[[ o.partner_bank_id and o.partner_bank_id.printBank and o.partner_bank_id.bank and o.partner_bank_id.bank.zip or '']] [[ o.partner_bank_id and o.partner_bank_id.printBank and o.partner_bank_id.bank and o.partner_bank_id.bank.city or '']]</drawString>
 
-		<drawString x="62mm" y="93mm">[[ o.partner_bank and o.partner_bank.printBank and o.partner_bank.bank and o.partner_bank.bank.name or '' ]]</drawString>
-		<drawString x="62mm" y="88mm">[[ o.partner_bank and o.partner_bank.printBank and o.partner_bank.bank and o.partner_bank.bank.zip or '']] [[ o.partner_bank and o.partner_bank.printBank and o.partner_bank.bank and o.partner_bank.bank.city or '']]</drawString>
+		<drawString x="62mm" y="93mm">[[ o.partner_bank_id and o.partner_bank_id.printBank and o.partner_bank_id.bank and o.partner_bank_id.bank.name or '' ]]</drawString>
+		<drawString x="62mm" y="88mm">[[ o.partner_bank_id and o.partner_bank_id.printBank and o.partner_bank_id.bank and o.partner_bank_id.bank.zip or '']] [[ o.partner_bank_id and o.partner_bank_id.printBank and o.partner_bank_id.bank and o.partner_bank_id.bank.city or '']]</drawString>
 
 		<drawString x="2mm" y="78mm">  [[ user.company_id.partner_id.name ]]</drawString>
 		<drawString x="2mm" y="73mm">  [[ user.company_id.partner_id.address[0].street ]]</drawString>
@@ -147,11 +147,11 @@
 		<drawString x="124mm" y="67mm">[[ _space(_get_ref(o)) ]]</drawString>
 
 		<setFont name="ocrb" size="12"/>
-        <drawRightString x="52 mm" y="59.3mm">[[ o.partner_bank and o.partner_bank.printAccount and o.partner_bank.bvr_number or '' ]]</drawRightString>
-        <drawRightString x="112mm" y="59.3mm">[[ o.partner_bank and o.partner_bank.printAccount and o.partner_bank.bvr_number or '' ]]</drawRightString>
+        <drawRightString x="52 mm" y="59.3mm">[[ o.partner_bank_id and o.partner_bank_id.printAccount and o.partner_bank_id.bvr_number or '' ]]</drawRightString>
+        <drawRightString x="112mm" y="59.3mm">[[ o.partner_bank_id and o.partner_bank_id.printAccount and o.partner_bank_id.bvr_number or '' ]]</drawRightString>
 		<drawRightString x="42mm" y="50mm">[[ _space(('%.2f' % o.amount_total)[:-3], 1) + ' ' ]]</drawRightString>
 		<drawRightString x="104mm" y="50mm">[[ _space(('%.2f' % o.amount_total)[:-3], 1) + ' ' ]]</drawRightString>
-        <drawRightString x="114 mm" y="59.3mm">[[ o.partner_bank and o.partner_bank.printAccount and o.partner_bank.bvr_number or '' ]]</drawRightString>
+        <drawRightString x="114 mm" y="59.3mm">[[ o.partner_bank_id and o.partner_bank_id.printAccount and o.partner_bank_id.bvr_number or '' ]]</drawRightString>
 		<drawRightString x="58mm" y="50mm">[[ _space(('%.2f' % o.amount_total)[-2:], 1) + ' ' ]]</drawRightString>
 		<drawRightString x="119mm" y="50mm">[[ _space(('%.2f' % o.amount_total)[-2:], 1) + ' ' ]]</drawRightString>
 
@@ -161,7 +161,7 @@
 		-->
 
 		<setFont name="ocrb" size="11.5"/>
-	<drawRightString x="195mm" y="15mm">[[mod10r('01'+str('%.2f' % o.amount_total).replace('.','').rjust(10,'0'))]]&gt;[[ _get_ref(o) ]]+ [[o.partner_bank.bvr_number.split('-')[0]+(str(o.partner_bank.bvr_number.split('-')[1])).rjust(6,'0')+o.partner_bank.bvr_number.split('-')[2] ]]&gt;</drawRightString>
+	<drawRightString x="195mm" y="15mm">[[mod10r('01'+str('%.2f' % o.amount_total).replace('.','').rjust(10,'0'))]]&gt;[[ _get_ref(o) ]]+ [[o.partner_bank_id.bvr_number.split('-')[0]+(str(o.partner_bank_id.bvr_number.split('-')[1])).rjust(6,'0')+o.partner_bank_id.bvr_number.split('-')[2] ]]&gt;</drawRightString>
 	</illustration>
   </story>
 </document>
diff --git a/addons/l10n_ch/report/invoice.rml b/addons/l10n_ch/report/invoice.rml
index 104fbf2a367..bbc7c9dfdc4 100755
--- a/addons/l10n_ch/report/invoice.rml
+++ b/addons/l10n_ch/report/invoice.rml
@@ -250,7 +250,7 @@
       <blockTable colWidths="28.0, 499.0" style="Table4">
         <tr>
           <td>
-           <para style="P9">[[ note or removeParentNode('blockTable') ]]</para>            
+           <para style="P9">[[ note or removeParentNode('blockTable') ]]</para>
           </td>
           <td>
             <xpre style="P16">[[ l.note  ]]</xpre>
@@ -326,11 +326,11 @@
 	-->
 	<illustration width="210mm" height="106mm">
 		<setFont name="Helvetica" size="11"/>
-        <drawString x="2mm" y="93mm">[[ o.partner_bank and o.partner_bank.printBank and o.partner_bank.bank and o.partner_bank.bank.name or '' ]]</drawString>
-		<drawString x="2mm" y="88mm">[[ o.partner_bank and o.partner_bank.printBank and o.partner_bank.bank and o.partner_bank.bank.zip or '']] [[ o.partner_bank and o.partner_bank.printBank and o.partner_bank.bank and o.partner_bank.bank.city or '']]</drawString>
+        <drawString x="2mm" y="93mm">[[ o.partner_bank_id and o.partner_bank_id.printBank and o.partner_bank_id.bank and o.partner_bank_id.bank.name or '' ]]</drawString>
+		<drawString x="2mm" y="88mm">[[ o.partner_bank_id and o.partner_bank_id.printBank and o.partner_bank_id.bank and o.partner_bank_id.bank.zip or '']] [[ o.partner_bank_id and o.partner_bank_id.printBank and o.partner_bank_id.bank and o.partner_bank_id.bank.city or '']]</drawString>
 
-		<drawString x="62mm" y="93mm">[[ o.partner_bank and o.partner_bank.printBank and o.partner_bank.bank and o.partner_bank.bank.name or '' ]]</drawString>
-		<drawString x="62mm" y="88mm">[[ o.partner_bank and o.partner_bank.printBank and o.partner_bank.bank and o.partner_bank.bank.zip or '']] [[ o.partner_bank and o.partner_bank.printBank and o.partner_bank.bank and o.partner_bank.bank.city or '']]</drawString>
+		<drawString x="62mm" y="93mm">[[ o.partner_bank_id and o.partner_bank_id.printBank and o.partner_bank_id.bank and o.partner_bank_id.bank.name or '' ]]</drawString>
+		<drawString x="62mm" y="88mm">[[ o.partner_bank_id and o.partner_bank_id.printBank and o.partner_bank_id.bank and o.partner_bank_id.bank.zip or '']] [[ o.partner_bank_id and o.partner_bank_id.printBank and o.partner_bank_id.bank and o.partner_bank_id.bank.city or '']]</drawString>
 		<drawString x="2mm" y="78mm"> [[user.company_id.name]]</drawString>
 		<drawString x="2mm" y="73mm"> [[ user.company_id.partner_id.address[0].street ]]</drawString>
 		<drawString x="2mm" y="68mm"> [[ (user.company_id.partner_id.address[0].street2 or '')]]</drawString>
@@ -357,12 +357,12 @@
 
 
 		<setFont name="ocrb" size="11"/>
-        
+
 		<drawString x="124mm" y="67mm">[[ _space(_get_ref(o)) ]]</drawString>
 
 		<setFont name="ocrb" size="12"/>
-        <drawRightString x="52 mm" y="59.3mm">[[ o.partner_bank and o.partner_bank.printAccount and o.partner_bank.bvr_number or '' ]]</drawRightString>
-        <drawRightString x="112mm" y="59.3mm">[[ o.partner_bank and o.partner_bank.printAccount and o.partner_bank.bvr_number or '' ]]</drawRightString>
+        <drawRightString x="52 mm" y="59.3mm">[[ o.partner_bank_id and o.partner_bank_id.printAccount and o.partner_bank_id.bvr_number or '' ]]</drawRightString>
+        <drawRightString x="112mm" y="59.3mm">[[ o.partner_bank_id and o.partner_bank_id.printAccount and o.partner_bank_id.bvr_number or '' ]]</drawRightString>
 		<drawRightString x="42mm" y="50mm">[[ _space(('%.2f' % o.amount_total)[:-3], 1) + ' ' ]]</drawRightString>
 		<drawRightString x="104mm" y="50mm">[[ _space(('%.2f' % o.amount_total)[:-3], 1) + ' ' ]]</drawRightString>
 
@@ -375,7 +375,7 @@
 		-->
 
 		<setFont name="ocrb" size="11.5"/>
-	<drawRightString x="195mm" y="15mm">[[mod10r('01'+str('%.2f' % o.amount_total).replace('.','').rjust(10,'0'))]]&gt;[[ _get_ref(o) ]]+ [[o.partner_bank.bvr_number.split('-')[0]+(str(o.partner_bank.bvr_number.split('-')[1])).rjust(6,'0')+o.partner_bank.bvr_number.split('-')[2] ]]&gt;</drawRightString>
+	<drawRightString x="195mm" y="15mm">[[mod10r('01'+str('%.2f' % o.amount_total).replace('.','').rjust(10,'0'))]]&gt;[[ _get_ref(o) ]]+ [[o.partner_bank_id.bvr_number.split('-')[0]+(str(o.partner_bank_id.bvr_number.split('-')[1])).rjust(6,'0')+o.partner_bank_id.bvr_number.split('-')[2] ]]&gt;</drawRightString>
 
 	</illustration>
 
diff --git a/addons/l10n_ch/wizard/wizard_bvr.py b/addons/l10n_ch/wizard/wizard_bvr.py
index 10258a4b8bd..9d7d74b1bc1 100644
--- a/addons/l10n_ch/wizard/wizard_bvr.py
+++ b/addons/l10n_ch/wizard/wizard_bvr.py
@@ -39,7 +39,7 @@ def _check(self, cr, uid, data, context):
     pool = pooler.get_pool(cr.dbname)
     invoice_obj = pool.get('account.invoice')
     for invoice in invoice_obj.browse(cr, uid, data['ids'], context):
-        if not invoice.partner_bank_is:
+        if not invoice.partner_bank_id:
             raise wizard.except_wizard(_('UserError'),
                     _('No bank specified on invoice:\n%s') % \
                             invoice_obj.name_get(cr, uid, [invoice.id], context=context)[0][1])
@@ -65,7 +65,7 @@ def _check(self, cr, uid, data, context):
 class wizard_report(wizard.interface):
     states = {
         'init': {
-            'actions': [_check], 
+            'actions': [_check],
             'result': {'type':'print', 'report':'l10n_ch.bvr', 'state':'end'}
         }
     }

From 9f6839faa1900a1dc012884b012b4d0d255c1acc Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Mon, 19 Jul 2010 16:08:30 +0200
Subject: [PATCH 8/9] [FIX] marketing_campaign: correct check when passing the
 campaign in running mode

bzr revid: chs@openerp.com-20100719140830-dkaei6y2r20iwyaf
---
 .../marketing_campaign/marketing_campaign.py  | 46 +++++++++----------
 1 file changed, 22 insertions(+), 24 deletions(-)

diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py
index 38707ace374..46e1e28ade7 100644
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -83,13 +83,6 @@ class marketing_campaign(osv.osv):
     _name = "marketing.campaign"
     _description = "Marketing Campaign"
 
-
-    def _check_has_start(self, cr, uid, ids, context=None):
-        for campaign in self.browse(cr, uid, ids, context=context):
-            if not any(a.start for a in campaign.activity_ids):
-                return False
-        return True
-
     _columns = {
         'name': fields.char('Name', size=64, required=True),
         'object_id': fields.many2one('ir.model', 'Model', required=True,
@@ -121,29 +114,34 @@ Normal - the campaign runs normally and automatically sends all emails and repor
         'state': lambda *a: 'draft',
         'mode': lambda *a: 'test',
     }
-           
-    _constraints = [(_check_has_start, 'Please mark at least one activity as a start activity', ['Activities'])]
 
     def state_running_set(self, cr, uid, ids, *args):
         # TODO check that all subcampaigns are running
         campaign = self.browse(cr, uid, ids[0])
-        if not campaign.activity_ids :
-            raise osv.except_osv("Error", "There is no activitity in the campaign")
-        activity_ids = [ act_id.id for act_id in campaign.activity_ids]
-        
-        if not activity_ids:
-            raise osv.except_osv(_("Error"), _("The campaign cannot be started : there are no activities in it"))
-        
-        act_obj = self.pool.get('marketing.campaign.activity')
-        act_ids = act_obj.search(cr, uid, [('id', 'in', activity_ids),
-                                            ('type', '=', 'email')])
-        for activity in act_obj.browse(cr, uid, act_ids):
-            if not activity.email_template_id.enforce_from_account :
+
+        if not campaign.activity_ids:
+            raise osv.except_osv(_("Error"), _("The campaign cannot be started: there are no activities in it"))
+
+        has_start = False
+        has_signal_without_from = False
+
+        for activity in campaign.activity_ids:
+            if activity.start:
+                has_start = True
+            if activity.signal and len(activity.from_ids) == 0:
+                has_signal_without_from = True
+
+            if activity.type != 'email':
+                continue
+            if not activity.email_template_id.enforce_from_account:
                 raise osv.except_osv(_("Error"), _("The campaign cannot be started: an email account is missing in the email activity '%s'")%activity.name)
-            if activity.email_template_id.enforce_from_account.state != 'approved' :
+            if activity.email_template_id.enforce_from_account.state != 'approved':
                 raise osv.except_osv(_("Error"), _("The campaign cannot be started: the email account is not approved in the email activity '%s'")%activity.name)
-        self.write(cr, uid, ids, {'state': 'running'})
-        return True
+
+        if not has_start and not has_signal_without_from:
+            raise osv.except_osv(_("Error"), _("The campaign hasn't any starting activity nor any activity with a signal and no previous activity."))
+
+        return self.write(cr, uid, ids, {'state': 'running'})
 
     def state_done_set(self, cr, uid, ids, *args):
         # TODO check that this campaign is not a subcampaign in running mode.

From 2302968bcc0f0cca04532f2df2cc67b254be9f7b Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Tue, 20 Jul 2010 09:08:21 +0530
Subject: [PATCH 9/9] [FIX] project_scrum: Translations

bzr revid: mra@mra-laptop-20100720033821-pu9jgaxnxep30f3q
---
 addons/project_scrum/i18n/ar.po               |   2 +-
 addons/project_scrum/i18n/bg.po               |   2 +-
 addons/project_scrum/i18n/bs.po               |   2 +-
 addons/project_scrum/i18n/ca.po               |   2 +-
 addons/project_scrum/i18n/cs.po               |   2 +-
 addons/project_scrum/i18n/de.po               |   2 +-
 addons/project_scrum/i18n/es.po               |   2 +-
 addons/project_scrum/i18n/es_AR.po            |   2 +-
 addons/project_scrum/i18n/et.po               |   2 +-
 addons/project_scrum/i18n/fr.po               |   2 +-
 addons/project_scrum/i18n/hr.po               |   2 +-
 addons/project_scrum/i18n/hu.po               |   2 +-
 addons/project_scrum/i18n/id.po               |   2 +-
 addons/project_scrum/i18n/it.po               |   2 +-
 addons/project_scrum/i18n/ko.po               |   2 +-
 addons/project_scrum/i18n/lt.po               |   2 +-
 addons/project_scrum/i18n/nl.po               |   2 +-
 addons/project_scrum/i18n/nl_BE.po            |   2 +-
 addons/project_scrum/i18n/pl.po               |   2 +-
 .../i18n/{scrum.pot => project_scrum.pot}     | 476 +++++++++++++++---
 addons/project_scrum/i18n/pt.po               |   2 +-
 addons/project_scrum/i18n/pt_BR.po            |   2 +-
 addons/project_scrum/i18n/ro.po               |   2 +-
 addons/project_scrum/i18n/ru.po               |   2 +-
 addons/project_scrum/i18n/sl.po               |   2 +-
 addons/project_scrum/i18n/sq.po               |   2 +-
 addons/project_scrum/i18n/sv.po               |   2 +-
 addons/project_scrum/i18n/tlh.po              |   2 +-
 addons/project_scrum/i18n/tr.po               |   2 +-
 addons/project_scrum/i18n/uk.po               |   2 +-
 addons/project_scrum/i18n/vi.po               |   2 +-
 addons/project_scrum/i18n/zh_CN.po            |   2 +-
 addons/project_scrum/i18n/zh_TW.po            |   2 +-
 33 files changed, 439 insertions(+), 101 deletions(-)
 rename addons/project_scrum/i18n/{scrum.pot => project_scrum.pot} (65%)

diff --git a/addons/project_scrum/i18n/ar.po b/addons/project_scrum/i18n/ar.po
index 575ec3d7653..5d5fb6f9c2e 100644
--- a/addons/project_scrum/i18n/ar.po
+++ b/addons/project_scrum/i18n/ar.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 16:00+0000\n"
+"PO-Revision-Date: 2010-07-19 19:07:52+0000\n"
 "Last-Translator: Genie-soft <rawan@genie-soft.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/project_scrum/i18n/bg.po b/addons/project_scrum/i18n/bg.po
index c7db9dc5cca..65094bfdb6a 100644
--- a/addons/project_scrum/i18n/bg.po
+++ b/addons/project_scrum/i18n/bg.po
@@ -7,7 +7,7 @@ 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: 2010-03-29 11:28+0000\n"
+"PO-Revision-Date: 2010-07-19 19:07:52+0000\n"
 "Last-Translator: Boris <boris.t.ivanov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/project_scrum/i18n/bs.po b/addons/project_scrum/i18n/bs.po
index 9366501f496..684c099c4e3 100644
--- a/addons/project_scrum/i18n/bs.po
+++ b/addons/project_scrum/i18n/bs.po
@@ -7,7 +7,7 @@ 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 10:41+0000\n"
+"PO-Revision-Date: 2010-07-19 19:07:52+0000\n"
 "Last-Translator: Miro Glavić <glavicmiro@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/project_scrum/i18n/ca.po b/addons/project_scrum/i18n/ca.po
index e68fa0852a4..cde5d7b6057 100644
--- a/addons/project_scrum/i18n/ca.po
+++ b/addons/project_scrum/i18n/ca.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-20 17:36+0000\n"
+"PO-Revision-Date: 2010-07-19 19:07:52+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
diff --git a/addons/project_scrum/i18n/cs.po b/addons/project_scrum/i18n/cs.po
index 6f11bb5025f..00859ed586d 100644
--- a/addons/project_scrum/i18n/cs.po
+++ b/addons/project_scrum/i18n/cs.po
@@ -7,7 +7,7 @@ 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-02-04 06:31+0000\n"
+"PO-Revision-Date: 2010-07-19 19:07:52+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/project_scrum/i18n/de.po b/addons/project_scrum/i18n/de.po
index 2a9eb813a6a..6dfb60d6851 100644
--- a/addons/project_scrum/i18n/de.po
+++ b/addons/project_scrum/i18n/de.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-22 19:33+0000\n"
+"PO-Revision-Date: 2010-07-19 19:07:52+0000\n"
 "Last-Translator: Ferdinand @ ChriCar <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/project_scrum/i18n/es.po b/addons/project_scrum/i18n/es.po
index 3581d899f1e..d3bb38ee977 100644
--- a/addons/project_scrum/i18n/es.po
+++ b/addons/project_scrum/i18n/es.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-20 17:46+0000\n"
+"PO-Revision-Date: 2010-07-19 19:07:52+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
diff --git a/addons/project_scrum/i18n/es_AR.po b/addons/project_scrum/i18n/es_AR.po
index eab24f83502..44991d642fd 100644
--- a/addons/project_scrum/i18n/es_AR.po
+++ b/addons/project_scrum/i18n/es_AR.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-23 13:46+0000\n"
+"PO-Revision-Date: 2010-07-19 19:07:52+0000\n"
 "Last-Translator: Julieta Catalano <jcatalano@thymbra.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/project_scrum/i18n/et.po b/addons/project_scrum/i18n/et.po
index fe1fcf33554..ef01761f39f 100644
--- a/addons/project_scrum/i18n/et.po
+++ b/addons/project_scrum/i18n/et.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-09 19:58+0000\n"
+"PO-Revision-Date: 2010-07-19 19:07:52+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/project_scrum/i18n/fr.po b/addons/project_scrum/i18n/fr.po
index 51c6ca1c50f..78d6b374a7d 100644
--- a/addons/project_scrum/i18n/fr.po
+++ b/addons/project_scrum/i18n/fr.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-05-22 09:49+0000\n"
+"PO-Revision-Date: 2010-07-19 19:07:52+0000\n"
 "Last-Translator: Christophe Chauvet - http://www.syleam.fr/ <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/project_scrum/i18n/hr.po b/addons/project_scrum/i18n/hr.po
index b2e813f5c38..d159cf00cfe 100644
--- a/addons/project_scrum/i18n/hr.po
+++ b/addons/project_scrum/i18n/hr.po
@@ -7,7 +7,7 @@ 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-02-03 06:26+0000\n"
+"PO-Revision-Date: 2010-07-19 19:07:52+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/project_scrum/i18n/hu.po b/addons/project_scrum/i18n/hu.po
index b2e813f5c38..d159cf00cfe 100644
--- a/addons/project_scrum/i18n/hu.po
+++ b/addons/project_scrum/i18n/hu.po
@@ -7,7 +7,7 @@ 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-02-03 06:26+0000\n"
+"PO-Revision-Date: 2010-07-19 19:07:52+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/project_scrum/i18n/id.po b/addons/project_scrum/i18n/id.po
index 79d9e786ec9..d159cf00cfe 100644
--- a/addons/project_scrum/i18n/id.po
+++ b/addons/project_scrum/i18n/id.po
@@ -7,7 +7,7 @@ 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-09 13:58+0000\n"
+"PO-Revision-Date: 2010-07-19 19:07:52+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/project_scrum/i18n/it.po b/addons/project_scrum/i18n/it.po
index 4a8557f9545..48eeb044c4b 100644
--- a/addons/project_scrum/i18n/it.po
+++ b/addons/project_scrum/i18n/it.po
@@ -7,7 +7,7 @@ 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: 2008-11-08 09:17+0000\n"
+"PO-Revision-Date: 2010-07-19 19:07:52+0000\n"
 "Last-Translator: LucaSub <subluca@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/project_scrum/i18n/ko.po b/addons/project_scrum/i18n/ko.po
index d8f6fb74453..1581a5ae68e 100644
--- a/addons/project_scrum/i18n/ko.po
+++ b/addons/project_scrum/i18n/ko.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-04-04 01:39+0000\n"
+"PO-Revision-Date: 2010-07-19 19:07:52+0000\n"
 "Last-Translator: Bundo <bundo@bundo.biz>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
diff --git a/addons/project_scrum/i18n/lt.po b/addons/project_scrum/i18n/lt.po
index b2e813f5c38..d159cf00cfe 100644
--- a/addons/project_scrum/i18n/lt.po
+++ b/addons/project_scrum/i18n/lt.po
@@ -7,7 +7,7 @@ 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-02-03 06:26+0000\n"
+"PO-Revision-Date: 2010-07-19 19:07:52+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/project_scrum/i18n/nl.po b/addons/project_scrum/i18n/nl.po
index 1845b2fa27e..d38d8cbe693 100644
--- a/addons/project_scrum/i18n/nl.po
+++ b/addons/project_scrum/i18n/nl.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-15 15:27+0000\n"
+"PO-Revision-Date: 2010-07-19 19:07:52+0000\n"
 "Last-Translator: Pieter J. Kersten (EduSense BV) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/project_scrum/i18n/nl_BE.po b/addons/project_scrum/i18n/nl_BE.po
index 4a30cc7e013..e6c8a668fe3 100644
--- a/addons/project_scrum/i18n/nl_BE.po
+++ b/addons/project_scrum/i18n/nl_BE.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-04-10 09:36+0000\n"
+"PO-Revision-Date: 2010-07-19 19:07:52+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/project_scrum/i18n/pl.po b/addons/project_scrum/i18n/pl.po
index d26ee00622e..dd80030b20a 100644
--- a/addons/project_scrum/i18n/pl.po
+++ b/addons/project_scrum/i18n/pl.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-22 14:18+0000\n"
+"PO-Revision-Date: 2010-07-19 19:07:52+0000\n"
 "Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/project_scrum/i18n/scrum.pot b/addons/project_scrum/i18n/project_scrum.pot
similarity index 65%
rename from addons/project_scrum/i18n/scrum.pot
rename to addons/project_scrum/i18n/project_scrum.pot
index bf675509564..ab982287b75 100644
--- a/addons/project_scrum/i18n/scrum.pot
+++ b/addons/project_scrum/i18n/project_scrum.pot
@@ -7,7 +7,7 @@ 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:52+0000\n"
-"PO-Revision-Date: 2010-07-19 17:07:52+0000\n"
+"PO-Revision-Date: 2010-07-19 19:07:52+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -30,6 +30,11 @@ msgstr ""
 msgid "From backlog create task."
 msgstr ""
 
+#. module: project_scrum
+#: field:project.scrum.product.backlog,user_id:0
+msgid "Author"
+msgstr ""
+
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_view_task4
 #: model:ir.ui.menu,name:project_scrum.menu_action_view_task4
@@ -42,6 +47,18 @@ msgstr ""
 msgid "My opened sprints (Product Owner)"
 msgstr ""
 
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "What did you do since the last meeting?"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+#: view:project.scrum.product.backlog:0
+#: view:project.scrum.sprint:0
+msgid "Group By..."
+msgstr ""
+
 #. module: project_scrum
 #: model:process.node,note:project_scrum.process_node_productbacklog0
 msgid "Create task from backlogs"
@@ -57,13 +74,19 @@ msgstr ""
 msgid "Scrum, Agile Development Method"
 msgstr ""
 
+
+#. module: project_scrum
+#: view:project.scrum.backlog.merge:0
+msgid "Are you sure you want to merge these Backlogs?"
+msgstr ""
+
 #. module: project_scrum
 #: field:project.scrum.project,progress_rate:0
 msgid "Progress"
 msgstr ""
 
 #. module: project_scrum
-#: help:scrum.task,remaining_hours:0
+#: help:project.scrum.task,remaining_hours:0
 msgid "Total remaining time, can be re-estimated periodically by the assignee of the task."
 msgstr ""
 
@@ -77,11 +100,18 @@ msgstr ""
 msgid "What have you accomplished since yesterday ?"
 msgstr ""
 
+#. module: project_scrum
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr ""
+
+
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 msgid "Are your Sprint Backlog estimate accurate ?"
 msgstr ""
 
+
 #. module: project_scrum
 #: field:project.scrum.project,members:0
 msgid "Project Members"
@@ -93,17 +123,17 @@ msgid "Scrum Projects"
 msgstr ""
 
 #. module: project_scrum
-#: field:scrum.task,child_ids:0
+#: field:project.scrum.task,child_ids:0
 msgid "Delegated Tasks"
 msgstr ""
 
 #. module: project_scrum
-#: help:scrum.project,warn_header:0
+#: help:project.scrum.project,warn_header:0
 msgid "Header added at the beginning of the email for the warning message sent to the customer when a task is closed."
 msgstr ""
 
 #. module: project_scrum
-#: field:scrum.task,priority:0
+#: field:project.scrum.task,priority:0
 msgid "Importance"
 msgstr ""
 
@@ -112,19 +142,145 @@ msgstr ""
 msgid "Scrum Task"
 msgstr ""
 
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: view:project.scrum.sprint:0
+msgid "Set to Draft"
+msgstr ""
+
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,create_date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Are there anything blocking you?"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Editable"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_project_scrum_backlog_assign_sprint
+msgid "Assign sprint to backlogs"
+msgstr ""
+
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_scrum_backlog_to_sprint
+#: view:project.scrum.backlog.assign.sprint:0
+msgid "Assign Sprint"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.sprint,expected_hours:0
+msgid "Estimated time to do the task."
+msgstr ""
+
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,task_hours:0
+msgid "Task Hours"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Dates"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Send to Scrum Master"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Daily"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,backlog_ids:0
+msgid "Sprint Backlog"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Delegate"
+msgstr ""
+
+#. module: project_scrum
+#: view:board.board:0
+msgid "My Board"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,date:0
+msgid "Meeting Date"
+msgstr ""
+
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_project_scrum_backlog_merge
+msgid "Merge Product Backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form
+#: view:project.scrum.product.backlog:0
+msgid "Product Backlogs"
+msgstr ""
+
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_scrum_backlog_merge
+#: view:project.scrum.backlog.merge:0
+msgid "Merge Backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Change Stage"
+msgstr ""
+
+#. module: project_scrum
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Owners"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_project_task
+msgid "Task"
+msgstr ""
+
+#. module: project_scrum
+#: constraint:project.task:0
+msgid "Error! task start-date must be lower then task end-date."
+msgstr ""
+
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.dblc_proj
 msgid "View project's backlog"
 msgstr ""
 
 #. module: project_scrum
-#: help:scrum.project,members:0
+#: help:project.scrum.project,members:0
 msgid "Project's member. Not used in any computation, just for information purpose."
 msgstr ""
 
 #. module: project_scrum
 #: selection:project.scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
+#: selection:project.scrum.task,priority:0
 msgid "Very urgent"
 msgstr ""
 
@@ -139,39 +295,44 @@ msgid "Sprint Name"
 msgstr ""
 
 #. module: project_scrum
-#: help:scrum.task,planned_hours:0
+#: help:project.scrum.task,planned_hours:0
 msgid "Estimated time to do the task, usually set by the project manager when the task is in draft state."
 msgstr ""
 
 #. module: project_scrum
 #: field:project.scrum.project,notes:0
-#: field:scrum.task,notes:0
+#: field:project.scrum.task,notes:0
 msgid "Notes"
 msgstr ""
 
 #. module: project_scrum
 #: model:ir.model,name:project_scrum.model_scrum_product_backlog
-#: field:scrum.task,product_backlog_id:0
+#: field:project.scrum.task,product_backlog_id:0
 msgid "Product Backlog"
 msgstr ""
 
 #. module: project_scrum
 #: field:project.scrum.sprint,project_id:0
-#: field:scrum.task,project_id:0
+#: field:project.scrum.task,project_id:0
 msgid "Project"
 msgstr ""
 
 #. module: project_scrum
-#: help:scrum.project,warn_manager:0
+#: help:project.scrum.project,warn_manager:0
 msgid "If you check this field, the project manager will receive a request each time a task is completed by his team."
 msgstr ""
 
 #. module: project_scrum
-#: selection:scrum.project,state:0
-#: selection:scrum.task,state:0
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.task,state:0
 msgid "Cancelled"
 msgstr ""
 
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Convert to Task"
+msgstr ""
+
 #. module: project_scrum
 #: field:scrum.team,name:0
 msgid "Team Name"
@@ -182,6 +343,12 @@ msgstr ""
 msgid "Mail Header"
 msgstr ""
 
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Expected hours"
+msgstr ""
+
 #. module: project_scrum
 #: field:project.scrum.project,sprint_size:0
 msgid "Sprint Days"
@@ -193,12 +360,12 @@ msgid "Ending Date"
 msgstr ""
 
 #. module: project_scrum
-#: help:scrum.task,effective_hours:0
+#: help:project.scrum.task,effective_hours:0
 msgid "Computed using the sum of the task work done."
 msgstr ""
 
 #. module: project_scrum
-#: help:scrum.project,warn_customer:0
+#: help:project.scrum.project,warn_customer:0
 msgid "If you check this, the user will have a popup when closing a task that propose a message to send by email to the customer."
 msgstr ""
 
@@ -219,25 +386,25 @@ msgid "All Tasks"
 msgstr ""
 
 #. module: project_scrum
-#: field:scrum.task,date_deadline:0
+#: field:project.scrum.task,date_deadline:0
 msgid "Deadline"
 msgstr ""
 
 #. module: project_scrum
 #: field:project.scrum.project,partner_id:0
-#: field:scrum.task,partner_id:0
+#: field:project.scrum.task,partner_id:0
 msgid "Partner"
 msgstr ""
 
 #. module: project_scrum
 #: field:project.scrum.product.backlog,planned_hours:0
 #: field:project.scrum.sprint,planned_hours:0
-#: field:scrum.task,planned_hours:0
+#: field:project.scrum.task,planned_hours:0
 msgid "Planned Hours"
 msgstr ""
 
 #. module: project_scrum
-#: selection:scrum.project,state:0
+#: selection:project.scrum.project,state:0
 msgid "Template"
 msgstr ""
 
@@ -253,12 +420,12 @@ msgid "State"
 msgstr ""
 
 #. module: project_scrum
-#: help:scrum.project,progress_rate:0
+#: help:project.scrum.project,progress_rate:0
 msgid "Percent of tasks closed according to the total of tasks todo."
 msgstr ""
 
 #. module: project_scrum
-#: help:scrum.project,notes:0
+#: help:project.scrum.project,notes:0
 msgid "Internal description of the project."
 msgstr ""
 
@@ -268,12 +435,12 @@ msgid "Daily Scrum"
 msgstr ""
 
 #. module: project_scrum
-#: help:scrum.task,total_hours:0
+#: help:project.scrum.task,total_hours:0
 msgid "Computed as: Time Spent + Remaining Time."
 msgstr ""
 
 #. module: project_scrum
-#: field:scrum.task,type:0
+#: field:project.scrum.task,type:0
 msgid "Type"
 msgstr ""
 
@@ -284,7 +451,7 @@ msgstr ""
 
 #. module: project_scrum
 #: selection:project.scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
+#: selection:project.scrum.task,priority:0
 msgid "Medium"
 msgstr ""
 
@@ -316,10 +483,32 @@ msgstr ""
 #. module: project_scrum
 #: field:project.scrum.project,date_start:0
 #: field:project.scrum.sprint,date_start:0
-#: field:scrum.task,date_start:0
+#: field:project.scrum.task,date_start:0
 msgid "Starting Date"
 msgstr ""
 
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Extended Options..."
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Planning"
+msgstr ""
+
+#. module: project_scrum
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.sprint,scrum_master_id:0
+msgid "The person who is maintains the processes for the product"
+msgstr ""
+
+
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_scrum_project_tree
 #: model:ir.ui.menu,name:project_scrum.menu_action_scrum_project_tree
@@ -332,7 +521,7 @@ msgid "Invalid XML for View Architecture!"
 msgstr ""
 
 #. module: project_scrum
-#: field:scrum.task,history:0
+#: field:project.scrum.task,history:0
 msgid "Task Details"
 msgstr ""
 
@@ -342,7 +531,7 @@ msgid "View project's tasks"
 msgstr ""
 
 #. module: project_scrum
-#: field:scrum.task,delay_hours:0
+#: field:project.scrum.task,delay_hours:0
 msgid "Delay Hours"
 msgstr ""
 
@@ -356,11 +545,6 @@ msgstr ""
 msgid "Scrum Tasks"
 msgstr ""
 
-#. module: project_scrum
-#: field:project.scrum.meeting,date:0
-msgid "Meeting Date"
-msgstr ""
-
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Tasks"
@@ -378,18 +562,24 @@ msgid "Create Tasks"
 msgstr ""
 
 #. module: project_scrum
-#: field:scrum.task,progress:0
+#: field:project.scrum.task,progress:0
 msgid "Progress (%)"
 msgstr ""
 
 #. module: project_scrum
-#: help:scrum.task,progress:0
+#: help:project.scrum.task,progress:0
 msgid "Computed as: Time Spent / Total Time."
 msgstr ""
 
+#. module: project_scrum
+#: help:project.scrum.backlog.assign.sprint,convert_to_task:0
+msgid "Create Task for Product Backlog"
+msgstr ""
+
+
 #. module: project_scrum
 #: field:project.scrum.project,scrum:0
-#: field:scrum.task,scrum:0
+#: field:project.scrum.task,scrum:0
 msgid "Is Scrum"
 msgstr ""
 
@@ -415,13 +605,35 @@ msgstr ""
 msgid "Blocks encountered"
 msgstr ""
 
+#. module: project_scrum
+#: help:project.scrum.backlog.assign.sprint,state_open:0
+msgid "Change the state of product backlogs to open if its in draft state"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.project,product_owner_id:0
+#: help:project.scrum.sprint,product_owner_id:0
+msgid "The person who is responsible for the product"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "What do you plan to do till the next meeting?"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.task,product_backlog_id:0
+msgid "Related product backlog that contains this task. Used in SCRUM methodology"
+msgstr ""
+
+
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 msgid "Optionnal Info"
 msgstr ""
 
 #. module: project_scrum
-#: help:scrum.project,total_hours:0
+#: help:project.scrum.project,total_hours:0
 msgid "Sum of total hours of all tasks related to this project."
 msgstr ""
 
@@ -451,13 +663,13 @@ msgstr ""
 #. module: project_scrum
 #: selection:project.scrum.product.backlog,state:0
 #: selection:project.scrum.sprint,state:0
-#: selection:scrum.task,state:0
+#: selection:project.scrum.task,state:0
 msgid "Draft"
 msgstr ""
 
 #. module: project_scrum
 #: selection:project.scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
+#: selection:project.scrum.task,priority:0
 msgid "Low"
 msgstr ""
 
@@ -473,8 +685,8 @@ msgid "Project Manager"
 msgstr ""
 
 #. module: project_scrum
-#: selection:scrum.project,state:0
-#: selection:scrum.task,state:0
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.task,state:0
 msgid "Pending"
 msgstr ""
 
@@ -486,7 +698,7 @@ msgstr ""
 #. module: project_scrum
 #: field:project.scrum.product.backlog,state:0
 #: field:project.scrum.sprint,state:0
-#: field:scrum.task,state:0
+#: field:project.scrum.task,state:0
 msgid "Status"
 msgstr ""
 
@@ -507,12 +719,57 @@ msgstr ""
 msgid "Project Name"
 msgstr ""
 
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Optional Info"
+msgstr ""
+
 #. module: project_scrum
 #: field:project.scrum.project,product_owner_id:0
 #: field:project.scrum.sprint,product_owner_id:0
 msgid "Product Owner"
 msgstr ""
 
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Post Pone"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_meeting_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_meeting_form
+msgid "Scrum Meetings"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.product.backlog,expected_hours:0
+msgid "Estimated total time to do the Backlog"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.backlog.merge,project_id:0
+msgid "Select project for the new product backlog"
+msgstr ""
+
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_project_scrum_backlog_create_task
+msgid "Create Tasks from Product Backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.project,sprint_size:0
+msgid "Number of days allocated for sprint"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.product.backlog,sequence:0
+msgid "Gives the sequence order when displaying a list of product backlog."
+msgstr ""
+
+
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree5
 #: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree5
@@ -539,17 +796,17 @@ msgstr ""
 #. module: project_scrum
 #: field:project.scrum.product.backlog,active:0
 #: field:project.scrum.project,active:0
-#: field:scrum.task,active:0
+#: field:project.scrum.task,active:0
 msgid "Active"
 msgstr ""
 
 #. module: project_scrum
-#: help:scrum.task,delay_hours:0
+#: help:project.scrum.task,delay_hours:0
 msgid "Computed as: Total Time - Estimated Time. It gives the difference of the time estimated by the project manager and the real time to close the task."
 msgstr ""
 
 #. module: project_scrum
-#: field:scrum.task,timebox_id:0
+#: field:project.scrum.task,timebox_id:0
 msgid "Timebox"
 msgstr ""
 
@@ -565,27 +822,32 @@ msgid "Working Time"
 msgstr ""
 
 #. module: project_scrum
-#: field:scrum.task,work_ids:0
+#: field:project.scrum.task,work_ids:0
 msgid "Work done"
 msgstr ""
 
+#. module: project_scrum
+#: view:project.scrum.backlog.merge:0
+msgid "Merge"
+msgstr ""
+
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
 msgid "View sprint backlog"
 msgstr ""
 
 #. module: project_scrum
-#: field:scrum.task,delegated_user_id:0
+#: field:project.scrum.task,delegated_user_id:0
 msgid "Delegated To"
 msgstr ""
 
 #. module: project_scrum
-#: field:scrum.task,date_close:0
+#: field:project.scrum.task,date_close:0
 msgid "Date Closed"
 msgstr ""
 
 #. module: project_scrum
-#: field:scrum.task,user_id:0
+#: field:project.scrum.task,user_id:0
 msgid "Assigned to"
 msgstr ""
 
@@ -595,17 +857,45 @@ msgid "Backlog Accurate"
 msgstr ""
 
 #. module: project_scrum
-#: help:scrum.project,effective_hours:0
+#: help:project.scrum.project,effective_hours:0
 msgid "Sum of spent hours of all tasks related to this project."
 msgstr ""
 
+
 #. module: project_scrum
-#: help:scrum.task,project_id:0
+#: model:ir.model,name:project_scrum.model_project_scrum_sprint
+msgid "Project Scrum Sprint"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Feature Description"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,effective_hours:0
+msgid "Spent Hours"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.product.backlog,effective_hours:0
+msgid "Computed using the sum of the time spent on every related tasks"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.open_board_project_scrum
+#: model:ir.ui.menu,name:project_scrum.menu_deshboard_scurm
+msgid "Scrum Dashboard"
+msgstr ""
+
+
+#. module: project_scrum
+#: help:project.scrum.task,project_id:0
 msgid "If you have [?] in the project name, it means there are no analytic account linked to this project."
 msgstr ""
 
 #. module: project_scrum
-#: help:scrum.project,planned_hours:0
+#: help:project.scrum.project,planned_hours:0
 msgid "Sum of planned hours of all tasks related to this project."
 msgstr ""
 
@@ -621,20 +911,20 @@ msgid "My Sprints (Product Owner)"
 msgstr ""
 
 #. module: project_scrum
-#: field:scrum.task,name:0
+#: field:project.scrum.task,name:0
 msgid "Task summary"
 msgstr ""
 
 #. module: project_scrum
-#: help:scrum.project,category_id:0
+#: help:project.scrum.project,category_id:0
 msgid "Link this project to an analytic account if you need financial management on projects. It enables you to connect projects with budgets, planning, cost and revenue analysis, timesheets on projects, etc."
 msgstr ""
 
 #. module: project_scrum
 #: selection:project.scrum.product.backlog,state:0
-#: selection:scrum.project,state:0
+#: selection:project.scrum.project,state:0
 #: selection:project.scrum.sprint,state:0
-#: selection:scrum.task,state:0
+#: selection:project.scrum.task,state:0
 msgid "Done"
 msgstr ""
 
@@ -664,7 +954,7 @@ msgid "Warn Manager"
 msgstr ""
 
 #. module: project_scrum
-#: selection:scrum.task,state:0
+#: selection:project.scrum.task,state:0
 msgid "In Progress"
 msgstr ""
 
@@ -679,12 +969,12 @@ msgid "The Object name must start with x_ and not contain any special character
 msgstr ""
 
 #. module: project_scrum
-#: field:scrum.task,remaining_hours:0
+#: field:project.scrum.task,remaining_hours:0
 msgid "Remaining Hours"
 msgstr ""
 
 #. module: project_scrum
-#: field:scrum.task,parent_id:0
+#: field:project.scrum.task,parent_id:0
 msgid "Parent Task"
 msgstr ""
 
@@ -695,12 +985,12 @@ msgstr ""
 
 #. module: project_scrum
 #: selection:project.scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
+#: selection:project.scrum.task,priority:0
 msgid "Very Low"
 msgstr ""
 
 #. module: project_scrum
-#: help:scrum.project,timesheet_id:0
+#: help:project.scrum.project,timesheet_id:0
 msgid "Timetable working hours to adjust the gantt diagram report"
 msgstr ""
 
@@ -728,6 +1018,11 @@ msgstr ""
 msgid "Edit Projects"
 msgstr ""
 
+#. module: project_scrum
+#: field:project.scrum.backlog.assign.sprint,state_open:0
+msgid "Set Open"
+msgstr ""
+
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_meeting_form
 #: model:ir.model,name:project_scrum.model_scrum_meeting
@@ -737,16 +1032,23 @@ msgid "Scrum Meeting"
 msgstr ""
 
 #. module: project_scrum
-#: field:scrum.task,description:0
+#: field:project.scrum.task,description:0
 msgid "Description"
 msgstr ""
 
 #. module: project_scrum
 #: selection:project.scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
+#: selection:project.scrum.task,priority:0
 msgid "Urgent"
 msgstr ""
 
+
+#. module: project_scrum
+#: model:ir.actions.report.xml,name:project_scrum.report_scrum_sprint_burndown_chart
+#: view:project.scrum.sprint:0
+msgid "Burndown Chart"
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Daily Meetings"
@@ -758,7 +1060,7 @@ msgid "What are you working on today ?"
 msgstr ""
 
 #. module: project_scrum
-#: selection:scrum.project,state:0
+#: selection:project.scrum.project,state:0
 msgid "Running"
 msgstr ""
 
@@ -789,28 +1091,58 @@ msgstr ""
 msgid "Sprint Info"
 msgstr ""
 
+
+#. module: project_scrum
+#: help:project.scrum.product.backlog,active:0
+msgid "If Active field is set to true, it will allow you to hide the product backlog without removing it."
+msgstr ""
+
+
+#. module: project_scrum
+#: help:project.scrum.product.backlog,task_hours:0
+msgid "Estimated time of the total hours of the tasks"
+msgstr ""
+
+
 #. module: project_scrum
 #: field:project.scrum.sprint,scrum_master_id:0
 msgid "Scrum Master"
 msgstr ""
 
+
+#. module: project_scrum
+#: field:project.project,scrum:0
+msgid "Is a Scrum Project"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.backlog.merge:0
+msgid "This wizard merge backlogs and create one new backlog with draft state (Old backlogs Will be deleted). And it also merge old tasks from backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.backlog.merge:0
+msgid "Select the project for merged backlogs"
+msgstr ""
+
+
 #. module: project_scrum
 #: field:project.scrum.product.backlog,tasks_id:0
 msgid "Tasks Details"
 msgstr ""
 
 #. module: project_scrum
-#: field:scrum.task,effective_hours:0
+#: field:project.scrum.task,effective_hours:0
 msgid "Hours Spent"
 msgstr ""
 
 #. module: project_scrum
-#: field:scrum.task,context_id:0
+#: field:project.scrum.task,context_id:0
 msgid "Context"
 msgstr ""
 
 #. module: project_scrum
-#: field:scrum.task,total_hours:0
+#: field:project.scrum.task,total_hours:0
 msgid "Total Hours"
 msgstr ""
 
@@ -822,12 +1154,18 @@ msgstr ""
 #. module: project_scrum
 #: field:project.scrum.product.backlog,sequence:0
 #: field:project.scrum.project,priority:0
-#: field:scrum.task,sequence:0
+#: field:project.scrum.task,sequence:0
 msgid "Sequence"
 msgstr ""
 
 #. module: project_scrum
-#: help:scrum.project,warn_footer:0
+#: view:project.scrum.meeting:0
+msgid "Send to Product Owner"
+msgstr ""
+
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_footer:0
 msgid "Footer added at the beginning of the email for the warning message sent to the customer when a task is closed."
 msgstr ""
 
diff --git a/addons/project_scrum/i18n/pt.po b/addons/project_scrum/i18n/pt.po
index b947ad8e596..91d946773e6 100644
--- a/addons/project_scrum/i18n/pt.po
+++ b/addons/project_scrum/i18n/pt.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 14:56+0000\n"
+"PO-Revision-Date: 2010-07-19 19:07:52+0000\n"
 "Last-Translator: neiva.soares@prime.cv <neiva.soares@prime.cv>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/project_scrum/i18n/pt_BR.po b/addons/project_scrum/i18n/pt_BR.po
index 3aea082e8f6..f08c77315e3 100644
--- a/addons/project_scrum/i18n/pt_BR.po
+++ b/addons/project_scrum/i18n/pt_BR.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-02-22 19:01+0000\n"
+"PO-Revision-Date: 2010-07-19 19:07:52+0000\n"
 "Last-Translator: Luiz Fernando M.França <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/project_scrum/i18n/ro.po b/addons/project_scrum/i18n/ro.po
index b2e813f5c38..d159cf00cfe 100644
--- a/addons/project_scrum/i18n/ro.po
+++ b/addons/project_scrum/i18n/ro.po
@@ -7,7 +7,7 @@ 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-02-03 06:26+0000\n"
+"PO-Revision-Date: 2010-07-19 19:07:52+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/project_scrum/i18n/ru.po b/addons/project_scrum/i18n/ru.po
index 79f90286f97..9516f178036 100644
--- a/addons/project_scrum/i18n/ru.po
+++ b/addons/project_scrum/i18n/ru.po
@@ -7,7 +7,7 @@ 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: 2010-07-11 08:27+0000\n"
+"PO-Revision-Date: 2010-07-19 19:07:52+0000\n"
 "Last-Translator: Pomazan Bogdan <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/project_scrum/i18n/sl.po b/addons/project_scrum/i18n/sl.po
index 15729fac6a9..3fdb9a36212 100644
--- a/addons/project_scrum/i18n/sl.po
+++ b/addons/project_scrum/i18n/sl.po
@@ -7,7 +7,7 @@ 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-12-10 22:08+0000\n"
+"PO-Revision-Date: 2010-07-19 19:07:52+0000\n"
 "Last-Translator: Simon Vidmar <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/project_scrum/i18n/sq.po b/addons/project_scrum/i18n/sq.po
index b0ba9983298..9ebdada149d 100644
--- a/addons/project_scrum/i18n/sq.po
+++ b/addons/project_scrum/i18n/sq.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 15:23:46+0000\n"
-"PO-Revision-Date: 2009-08-28 15:23:46+0000\n"
+"PO-Revision-Date: 2010-07-19 19:07:52+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/project_scrum/i18n/sv.po b/addons/project_scrum/i18n/sv.po
index b2dc90d725e..c53dc9d4631 100644
--- a/addons/project_scrum/i18n/sv.po
+++ b/addons/project_scrum/i18n/sv.po
@@ -7,7 +7,7 @@ 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-04-10 09:37+0000\n"
+"PO-Revision-Date: 2010-07-19 19:07:52+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/project_scrum/i18n/tlh.po b/addons/project_scrum/i18n/tlh.po
index 495757da589..3d290132742 100644
--- a/addons/project_scrum/i18n/tlh.po
+++ b/addons/project_scrum/i18n/tlh.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-02-03 06:26+0000\n"
+"PO-Revision-Date: 2010-07-19 19:07:52+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/project_scrum/i18n/tr.po b/addons/project_scrum/i18n/tr.po
index faadb247517..9bd32c5def9 100644
--- a/addons/project_scrum/i18n/tr.po
+++ b/addons/project_scrum/i18n/tr.po
@@ -7,7 +7,7 @@ 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: 2010-02-14 21:39+0000\n"
+"PO-Revision-Date: 2010-07-19 19:07:52+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/project_scrum/i18n/uk.po b/addons/project_scrum/i18n/uk.po
index 1248e913a85..96358c65246 100644
--- a/addons/project_scrum/i18n/uk.po
+++ b/addons/project_scrum/i18n/uk.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-02-04 06:32+0000\n"
+"PO-Revision-Date: 2010-07-19 19:07:52+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/project_scrum/i18n/vi.po b/addons/project_scrum/i18n/vi.po
index aeac69360c2..80f94c820c1 100644
--- a/addons/project_scrum/i18n/vi.po
+++ b/addons/project_scrum/i18n/vi.po
@@ -8,7 +8,7 @@ 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:00:38+0000\n"
-"PO-Revision-Date: 2009-08-28 16:00:38+0000\n"
+"PO-Revision-Date: 2010-07-19 19:07:52+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/project_scrum/i18n/zh_CN.po b/addons/project_scrum/i18n/zh_CN.po
index 9ef5a0f1b49..f34a67b3e42 100644
--- a/addons/project_scrum/i18n/zh_CN.po
+++ b/addons/project_scrum/i18n/zh_CN.po
@@ -7,7 +7,7 @@ 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: 2010-03-20 10:28+0000\n"
+"PO-Revision-Date: 2010-07-19 19:07:52+0000\n"
 "Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/project_scrum/i18n/zh_TW.po b/addons/project_scrum/i18n/zh_TW.po
index c3f8246cf04..be75acd60f9 100644
--- a/addons/project_scrum/i18n/zh_TW.po
+++ b/addons/project_scrum/i18n/zh_TW.po
@@ -7,7 +7,7 @@ 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-01-30 13:29+0000\n"
+"PO-Revision-Date: 2010-07-19 19:07:52+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"