From bcefce701e8c1edd32de5268798838f89f757f72 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Tue, 9 Oct 2012 11:21:29 +0200
Subject: [PATCH 1/3] [IMP] account: monetary widget for bank statements

bzr revid: qdp-launchpad@openerp.com-20121009092129-w4pjhhuhxpabdjqg
---
 addons/account/account_bank_statement.py | 5 +++--
 addons/account/account_view.xml          | 9 +++------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 8b2a9aff257..549363ce269 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -461,9 +461,10 @@ class account_bank_statement(osv.osv):
             return {}
         balance_start = self._compute_balance_end_real(cr, uid, journal_id, context=context)
 
-        journal_data = self.pool.get('account.journal').read(cr, uid, journal_id, ['company_id'], context=context)
+        journal_data = self.pool.get('account.journal').read(cr, uid, journal_id, ['company_id', 'currency'], context=context)
         company_id = journal_data['company_id']
-        return {'value': {'balance_start': balance_start, 'company_id': company_id}}
+        currency_id = journal_data['currency'] or self.pool.get('res.company').browse(cr, uid, company_id[0], context=context).currency_id.id
+        return {'value': {'balance_start': balance_start, 'company_id': company_id, 'currency': currency_id}}
 
     def unlink(self, cr, uid, ids, context=None):
         stat = self.read(cr, uid, ids, ['state'], context=context)
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 1c40bebba52..3391158696a 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -633,13 +633,10 @@
                                 <field name="period_id" class="oe_inline"/>
                             </div>
                             <field name='company_id' widget="selection" groups="base.group_multi_company" />
+                            <field name="currency" invisible="1"/>
                         </group><group>
-                            <label for="balance_start"/>
-                            <div>
-                                <field name="balance_start" class="oe_inline"/>
-                                <field name="currency" class="oe_inline"/>
-                            </div>
-                            <field name="balance_end_real"/>
+                            <field name="balance_start" widget="monetary" options='{"currency_field" : "currency"}'/>
+                            <field name="balance_end_real" widget="monetary" options='{"currency_field" : "currency"}'/>
                         </group>
                     </group>
 

From fbbc0bad19c57bfbf5df9351373c8edd0ead3ded Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Tue, 9 Oct 2012 16:34:33 +0200
Subject: [PATCH 2/3] [IMP] all: replaced 'true' by 'True' in 'options'
 attribute in views, because now the syntax of these options must be expressed
 in python instead of json

bzr revid: qdp-launchpad@openerp.com-20121009143433-s4y6isbewqdn2fu2
---
 addons/account/account_invoice_view.xml              |  2 +-
 addons/account/account_view.xml                      |  2 +-
 .../account_voucher/voucher_sales_purchase_view.xml  |  2 +-
 addons/crm/crm_lead_view.xml                         | 12 ++++++------
 addons/document_page/document_page_view.xml          |  2 +-
 .../wizard/document_page_show_diff_view.xml          |  2 +-
 .../wizard/email_template_preview_view.xml           |  2 +-
 addons/event/event_view.xml                          |  4 ++--
 addons/hr/hr_view.xml                                |  8 ++++----
 addons/portal_crm/wizard/contact_view.xml            |  4 ++--
 addons/project/project_view.xml                      |  6 +++---
 addons/project_gtd/project_gtd_view.xml              |  4 ++--
 addons/project_gtd/wizard/project_gtd_fill_view.xml  |  2 +-
 addons/sale/sale_view.xml                            |  4 ++--
 14 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 26e18271dc2..48737bd5fef 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -322,7 +322,7 @@
                             <field string="Customer" name="partner_id"
                                 on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)"
                                 groups="base.group_user" context="{'search_default_customer':1, 'show_address': 1}"
-                                options='{"always_reload": true}'/>
+                                options='{"always_reload": True}'/>
                             <field name="fiscal_position" widget="selection" />
                         </group>
                         <group>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 3391158696a..d2680a8456f 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -635,7 +635,7 @@
                             <field name='company_id' widget="selection" groups="base.group_multi_company" />
                             <field name="currency" invisible="1"/>
                         </group><group>
-                            <field name="balance_start" widget="monetary" options='{"currency_field" : "currency"}'/>
+                            <field name="balance_start" widget="monetary" options="{'currency_field' : 'currency'}"/>
                             <field name="balance_end_real" widget="monetary" options='{"currency_field" : "currency"}'/>
                         </group>
                     </group>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 4c388730644..a362c553ccd 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -73,7 +73,7 @@
                     <group>
                         <group>
                             <field name="type" invisible="True"/>
-                            <field name="partner_id" domain="[('customer','=',True)]" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Customer" context="{'search_default_customer':1, 'show_address': 1}" options='{"always_reload": true}'/>
+                            <field name="partner_id" domain="[('customer','=',True)]" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Customer" context="{'search_default_customer':1, 'show_address': 1}" options='{"always_reload": True}'/>
                             <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                         </group>
                         <group>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index f91a8756598..f7acb6b557d 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -160,17 +160,17 @@
                                 <field name="street2"/>
                                 <div class="address_format">
                                     <field name="city" placeholder="City" style="width: 40%%"/>
-                                    <field name="state_id" options='{"no_open": true}' placeholder="State" style="width: 24%%"/>
+                                    <field name="state_id" options='{"no_open": True}' placeholder="State" style="width: 24%%"/>
                                     <field name="zip" placeholder="ZIP" style="width: 34%%"/>
                                 </div>
-                                <field name="country_id" placeholder="Country" options='{"no_open": true}'/>
+                                <field name="country_id" placeholder="Country" options='{"no_open": True}'/>
                             </div>
                         </group>
                         <group>
                             <label for="contact_name" />
                             <div>
                                 <field name="contact_name" class="oe_inline"/>,
-                                <field name="title" placeholder="Title" domain="[('domain', '=', 'contact')]" class="oe_inline" options='{"no_open": true}'/>
+                                <field name="title" placeholder="Title" domain="[('domain', '=', 'contact')]" class="oe_inline" options='{"no_open": True}'/>
                             </div>
                             <field name="email_from" widget="email"/>
                             <field name="function" />
@@ -477,10 +477,10 @@
                                         <field name="street2"/>
                                         <div class="address_format">
                                             <field name="city" placeholder="City" style="width: 40%%"/>
-                                            <field name="state_id" options='{"no_open": true}' placeholder="State" style="width: 24%%"/>
+                                            <field name="state_id" options='{"no_open": True}' placeholder="State" style="width: 24%%"/>
                                             <field name="zip" placeholder="ZIP" style="width: 34%%"/>
                                         </div>
-                                        <field name="country_id" placeholder="Country" options='{"no_open": true}'/>
+                                        <field name="country_id" placeholder="Country" options='{"no_open": True}'/>
                                     </div>
                                 </group>
 
@@ -488,7 +488,7 @@
                                     <label for="contact_name" />
                                     <div>
                                         <field name="contact_name" class="oe_inline"/>
-                                        <field name="title" placeholder="Title" domain="[('domain', '=', 'contact')]" options='{"no_open": true}' class="oe_inline"/>
+                                        <field name="title" placeholder="Title" domain="[('domain', '=', 'contact')]" options='{"no_open": True}' class="oe_inline"/>
                                     </div>
                                     <field name="function" />
                                     <field name="mobile"/>
diff --git a/addons/document_page/document_page_view.xml b/addons/document_page/document_page_view.xml
index 63f208c08a7..d8daaada967 100644
--- a/addons/document_page/document_page_view.xml
+++ b/addons/document_page/document_page_view.xml
@@ -55,7 +55,7 @@
                     </div>
                     <field name="content" placeholder="e.g. Once upon a time..." class="oe_edit_only"/>
                     <div class="oe_document_page">
-                        <field name="display_content" widget="html" class="oe_view_only" options='{"safe": true}'/>
+                        <field name="display_content" widget="html" class="oe_view_only" options='{"safe": True}'/>
                     </div>
                 </form>
             </field>
diff --git a/addons/document_page/wizard/document_page_show_diff_view.xml b/addons/document_page/wizard/document_page_show_diff_view.xml
index b1dfb536853..e2d5ef1af4b 100644
--- a/addons/document_page/wizard/document_page_show_diff_view.xml
+++ b/addons/document_page/wizard/document_page_show_diff_view.xml
@@ -8,7 +8,7 @@
             <field name="model">wizard.document.page.history.show_diff</field>
             <field name="arch" type="xml">
                 <form string="Difference" version="7.0">
-                    <field name="diff" widget="html" options='{"safe": true}'/>
+                    <field name="diff" widget="html" options='{"safe": True}'/>
                     <footer>
                         <button string="Cancel" class="oe_link" special="cancel" />
                     </footer>
diff --git a/addons/email_template/wizard/email_template_preview_view.xml b/addons/email_template/wizard/email_template_preview_view.xml
index 5e8eaa3a836..f91535a17a5 100644
--- a/addons/email_template/wizard/email_template_preview_view.xml
+++ b/addons/email_template/wizard/email_template_preview_view.xml
@@ -20,7 +20,7 @@
                       <field name="email_cc" readonly="1" attrs="{'invisible':[('email_cc','=',False)]}"/>
                       <field name="reply_to" readonly="1" attrs="{'invisible':[('reply_to','=',False)]}"/>
                       <field name="subject" readonly="1"/>
-                      <field name="body_html" widget="html" readonly="1" options='{"safe": true}'/>
+                      <field name="body_html" widget="html" readonly="1" options='{"safe": True}'/>
                     </group>
                 </form>
             </field>
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index b46fafe270f..cbfc670c9cf 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -126,10 +126,10 @@
                                         <field name="street2"/>
                                         <div class="address_format">
                                             <field name="city" placeholder="City" style="width: 40%%"/>
-                                            <field name="state_id" class="oe_no_button" placeholder="State" style="width: 37%%" options='{"no_open": true}'/>
+                                            <field name="state_id" class="oe_no_button" placeholder="State" style="width: 37%%" options='{"no_open": True}'/>
                                             <field name="zip" placeholder="ZIP" style="width: 20%%"/>
                                         </div>
-                                        <field name="country_id" placeholder="Country" class="oe_no_button" options='{"no_open": true}'/>
+                                        <field name="country_id" placeholder="Country" class="oe_no_button" options='{"no_open": True}'/>
                                     </div>
                                 </group>
                                 <group>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 69567902763..caa893aea6e 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -42,14 +42,14 @@
                                     </group>
                                     <group string="Position">
                                         <field name="department_id" on_change="onchange_department_id(department_id)"/>
-                                        <field name="job_id" options='{"no_open": true}' domain="[('state','!=','old')]" context="{'form_view_ref': 'hr.view_hr_job_employee_form'}"/>
+                                        <field name="job_id" options='{"no_open": True}' domain="[('state','!=','old')]" context="{'form_view_ref': 'hr.view_hr_job_employee_form'}"/>
                                         <field name="parent_id"/>
                                         <field name="coach_id"/>
                                     </group>
                                     <group>
                                         <field name="company_id" groups="base.group_multi_company" on_change="onchange_company(company_id)"/>
                                         <field name="user_id" on_change="onchange_user(user_id)" string="Related User"/>
-                                        <field name="address_id" on_change="onchange_address_id(address_id)" context="{'show_address': 1}" options='{"always_reload": true, "highlight_first_line": true}'/>
+                                        <field name="address_id" on_change="onchange_address_id(address_id)" context="{'show_address': 1}" options='{"always_reload": True, "highlight_first_line": True}'/>
                                     </group>
                                 </group>
                                 <field name="notes" placeholder="Other Information ..." colspan="4"/>
@@ -57,14 +57,14 @@
                             <page string="Personal Information" groups="base.group_hr_user">
                                 <group>
                                     <group string="Citizenship &amp; Other Info">
-                                        <field name="country_id" options='{"no_open": true}'/>
+                                        <field name="country_id" options='{"no_open": True}'/>
                                         <field name="identification_id" groups="base.group_hr_user"/>
                                         <field name="passport_id" groups="base.group_hr_user"/>
                                         <field name="bank_account_id"/>
                                         <field name="otherid" groups="base.group_hr_user"/>
                                     </group>
                                     <group string="Contact Information">
-                                        <field name="address_home_id" context="{'show_address': 1}" options='{"always_reload": true, "highlight_first_line": true}'/>
+                                        <field name="address_home_id" context="{'show_address': 1}" options='{"always_reload": True, "highlight_first_line": True}'/>
                                     </group>
                                     <group string="Status">
                                         <field name="gender"/>
diff --git a/addons/portal_crm/wizard/contact_view.xml b/addons/portal_crm/wizard/contact_view.xml
index 1776632d7ab..778e7f9562e 100644
--- a/addons/portal_crm/wizard/contact_view.xml
+++ b/addons/portal_crm/wizard/contact_view.xml
@@ -35,8 +35,8 @@
                                             <field name="street2"/>
                                             <field name="zip"/>
                                             <field name="city"/>
-                                            <field name="country_id" options='{"no_open": true}'/>
-                                            <field name="state_id" options='{"no_open": true}'/>
+                                            <field name="country_id" options='{"no_open": True}'/>
+                                            <field name="state_id" options='{"no_open": True}'/>
                                             <templates>
                                                 <t t-name="kanban-box">
                                                     <h4><field name="name"/></h4>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index bd63eec84c5..9d3b137f7c1 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -103,7 +103,7 @@
                     <notebook>
                         <page string="Team" name="team">
                             <field colspan="4" name="members" widget="many2many_kanban">
-                                <kanban quick_create="false" create="true">
+                                <kanban quick_create="false" create="True">
                                     <field name="name"/>
                                     <templates>
                                         <t t-name="kanban-box">
@@ -311,7 +311,7 @@
                         <field colspan="4" name="name"/>
                         <field name="hours" widget="float_time"/>
                         <field name="date"/>
-                        <field name="user_id" options='{"no_open": true}'/>
+                        <field name="user_id" options='{"no_open": True}'/>
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
                 </form>
@@ -401,7 +401,7 @@
                     <group>
                         <group>
                             <field name="project_id"  on_change="onchange_project(project_id)" context="{'default_use_tasks':1}"/>
-                            <field name="user_id" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}" options='{"no_open": true}'/>
+                            <field name="user_id" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}" options='{"no_open": True}'/>
                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                         </group>
                         <group>
diff --git a/addons/project_gtd/project_gtd_view.xml b/addons/project_gtd/project_gtd_view.xml
index fdb8ae8495c..a7026da8854 100644
--- a/addons/project_gtd/project_gtd_view.xml
+++ b/addons/project_gtd/project_gtd_view.xml
@@ -92,8 +92,8 @@
         <field name="inherit_id" ref="project.view_task_form2" />
         <field name="arch" type="xml">
             <field name="progress" position="after">
-                <field name="context_id" widget="selection" options='{"no_open": true}'/>
-                <field name="timebox_id" widget="selection" options='{"no_open": true}'/>
+                <field name="context_id" widget="selection" options='{"no_open": True}'/>
+                <field name="timebox_id" widget="selection" options='{"no_open": True}'/>
             </field>
         </field>
     </record>
diff --git a/addons/project_gtd/wizard/project_gtd_fill_view.xml b/addons/project_gtd/wizard/project_gtd_fill_view.xml
index 8807c00a76b..626dfb699b8 100644
--- a/addons/project_gtd/wizard/project_gtd_fill_view.xml
+++ b/addons/project_gtd/wizard/project_gtd_fill_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Plannify Timebox" version="7.0">
                       <group col="4">
-                          <field name="timebox_id" widget="selection" options='{"no_open": true}'/>
+                          <field name="timebox_id" widget="selection" options='{"no_open": True}'/>
                           <field name="timebox_to_id" widget="selection"/>
                       </group>
                       <field name="task_ids" domain="[('timebox_id','=',timebox_id),('state','=','open')]" />
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 5505a6a88b5..0055deb8d3d 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -214,7 +214,7 @@
                                             <label for="product_uos_qty" groups="product.group_uos"/>
                                             <div groups="product.group_uos">
                                                 <field name="product_uos_qty" class="oe_inline"/>
-                                                <field name="product_uos" options='{"no_open": true}' class="oe_inline"/>
+                                                <field name="product_uos" options='{"no_open": True}' class="oe_inline"/>
                                             </div>
                                             <field name="price_unit"/>
                                             <label for="discount" groups="sale.group_discount_per_so_line"/>
@@ -251,7 +251,7 @@
                                         on_change="product_id_change(parent.pricelist_id, product_id, product_uom_qty, product_uom, product_uos_qty, product_uos, name, parent.partner_id, False, False, parent.date_order, False, parent.fiscal_position, True, context)"/>
                                     <field name="product_uom"
                                         on_change="product_uom_change(parent.pricelist_id, product_id, product_uom_qty, product_uom, product_uos_qty, product_uos, name, parent.partner_id, False, False, parent.date_order, context)"
-                                        groups="product.group_uom" options='{"no_open": true}'/>
+                                        groups="product.group_uom" options='{"no_open": True}'/>
                                     <field name="product_uos_qty" groups="product.group_uos" invisible="1"/>
                                     <field name="product_uos" string="UoS" groups="product.group_uos" invisible="1"/>
                                     <field name="tax_id" widget="many2many_tags" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>

From 5f8c1b4907f7bf448fc37eda679398153c6a6772 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 10 Oct 2012 12:08:32 +0200
Subject: [PATCH 3/3] [REV] revert revision 7730 that will be pushed to trunk
 via another branch (a dedicated one)

bzr revid: qdp-launchpad@openerp.com-20121010100832-asu2rj6j7x5328f0
---
 addons/account/account_bank_statement.py | 5 ++---
 addons/account/account_view.xml          | 9 ++++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 549363ce269..8b2a9aff257 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -461,10 +461,9 @@ class account_bank_statement(osv.osv):
             return {}
         balance_start = self._compute_balance_end_real(cr, uid, journal_id, context=context)
 
-        journal_data = self.pool.get('account.journal').read(cr, uid, journal_id, ['company_id', 'currency'], context=context)
+        journal_data = self.pool.get('account.journal').read(cr, uid, journal_id, ['company_id'], context=context)
         company_id = journal_data['company_id']
-        currency_id = journal_data['currency'] or self.pool.get('res.company').browse(cr, uid, company_id[0], context=context).currency_id.id
-        return {'value': {'balance_start': balance_start, 'company_id': company_id, 'currency': currency_id}}
+        return {'value': {'balance_start': balance_start, 'company_id': company_id}}
 
     def unlink(self, cr, uid, ids, context=None):
         stat = self.read(cr, uid, ids, ['state'], context=context)
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index d2680a8456f..1c40bebba52 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -633,10 +633,13 @@
                                 <field name="period_id" class="oe_inline"/>
                             </div>
                             <field name='company_id' widget="selection" groups="base.group_multi_company" />
-                            <field name="currency" invisible="1"/>
                         </group><group>
-                            <field name="balance_start" widget="monetary" options="{'currency_field' : 'currency'}"/>
-                            <field name="balance_end_real" widget="monetary" options='{"currency_field" : "currency"}'/>
+                            <label for="balance_start"/>
+                            <div>
+                                <field name="balance_start" class="oe_inline"/>
+                                <field name="currency" class="oe_inline"/>
+                            </div>
+                            <field name="balance_end_real"/>
                         </group>
                     </group>