From aab48f93a5142e59391d51feda83eae1a5505532 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Fri, 21 Sep 2012 11:46:43 +0530
Subject: [PATCH 01/18] [FIX]l10n_ch:solved configuration wizard traceback

bzr revid: kbh@tinyerp.com-20120921061643-5p25uqu3yidpppf5
---
 addons/l10n_ch/account_wizard.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/l10n_ch/account_wizard.py b/addons/l10n_ch/account_wizard.py
index 7b80e3697ee..306207c612d 100644
--- a/addons/l10n_ch/account_wizard.py
+++ b/addons/l10n_ch/account_wizard.py
@@ -36,8 +36,9 @@ class WizardMultiChartsAccounts(osv.osv_memory):
     def execute(self, cr, uid, ids, context=None):
         """Override of code in order to be able to link journal with account in XML"""
         res = super(WizardMultiChartsAccounts, self).execute(cr, uid, ids, context)
-        path = addons.get_module_resource(os.path.join('l10n_ch','sterchi_chart','account_journal_rel.xml'))
+        path = addons.get_module_resource('l10n_ch','sterchi_chart','account_journal_rel.xml')
         tools.convert_xml_import(cr, 'l10n_ch', path, idref=None, mode='init', noupdate=True, report=None)
+        res.update({'type': 'ir.actions.act_window_close'})
         return res
 
 WizardMultiChartsAccounts()

From 0591d0599dbc9dfb1cbf9c8892495afe89e6aa9b Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Fri, 21 Sep 2012 12:08:52 +0530
Subject: [PATCH 02/18] [FIX]l10n_ch:duplicate bank field

bzr revid: kbh@tinyerp.com-20120921063852-gmcz8b0mxvdcm0ul
---
 addons/l10n_ch/bank_view.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/addons/l10n_ch/bank_view.xml b/addons/l10n_ch/bank_view.xml
index da1badd7fe8..9cd6e2445f8 100644
--- a/addons/l10n_ch/bank_view.xml
+++ b/addons/l10n_ch/bank_view.xml
@@ -92,8 +92,6 @@
                             <newline/>
                         </group>
                     </group>
-                    <newline/>
-                    <field name="bank" />
                 </field>
             </field>
         </record>        

From 27efa96a51e433742ee826d2ea75f872013609b0 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Fri, 21 Sep 2012 14:18:23 +0530
Subject: [PATCH 03/18] [FIX]purchase:access right to purchase.order

bzr revid: kbh@tinyerp.com-20120921084823-fedhgkqmsdh9ubdd
---
 addons/purchase/security/ir.model.access.csv | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/purchase/security/ir.model.access.csv b/addons/purchase/security/ir.model.access.csv
index 3c8d072c536..04b6ff86e51 100644
--- a/addons/purchase/security/ir.model.access.csv
+++ b/addons/purchase/security/ir.model.access.csv
@@ -65,3 +65,4 @@ access_stock_tracking_purchase_user,stock.tracking purchase.user,stock.model_sto
 access_stock_location_purchase_manager,stock.location purchase manager,stock.model_stock_location,purchase.group_purchase_manager,1,0,0,0
 access_stock_warehouse_orderpoint_manager,stock.warehouse.orderpoint,procurement.model_stock_warehouse_orderpoint,purchase.group_purchase_manager,1,0,0,0
 access_stock_warehouse_orderpoint_manager,stock.warehouse.orderpoint,procurement.model_stock_warehouse_orderpoint,group_purchase_user,1,0,0,0
+access_purchase_order,purchase.order,model_purchase_order,base.group_partner_manager,1,0,0,0
\ No newline at end of file

From b69c65939ccea4bd51c279a72a828d3ae944c906 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Fri, 21 Sep 2012 17:06:51 +0530
Subject: [PATCH 04/18] [FIX]purchase:fixes request for quotation report
 problems

bzr revid: kbh@tinyerp.com-20120921113651-lc8a7ilb8747j440
---
 addons/purchase/report/request_quotation.rml | 79 ++++++++++++--------
 1 file changed, 47 insertions(+), 32 deletions(-)

diff --git a/addons/purchase/report/request_quotation.rml b/addons/purchase/report/request_quotation.rml
index 9d23e97b385..bff23f5ccc0 100644
--- a/addons/purchase/report/request_quotation.rml
+++ b/addons/purchase/report/request_quotation.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<document filename="Request for Quotation.pdf">
-  <template title="Request for Quotation" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
+<document filename="test.pdf">
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="23.0" y1="43.0" width="530" height="799"/>
     </pageTemplate>
@@ -10,7 +10,11 @@
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
-    <blockTableStyle id="Table_Address_Detail">
+    <blockTableStyle id="Tableau1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau2">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
@@ -30,9 +34,16 @@
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
     </blockTableStyle>
+    <blockTableStyle id="Table_Outer_Notes">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
+    <paraStyle name="P1" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
+    <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P3" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
@@ -69,30 +80,29 @@
     <images/>
   </stylesheet>
   <story>
-  <pto>
-  <pto_header>
-    <blockTable colWidths="371.0,98.0,61.0" repeatRows="1" style="Table_Product_Header_Title">
-      <tr>
-        <td>
-          <para style="terp_tblheader_Details">Description</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Centre">Expected Date</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Centre">Qty</para>
-        </td>
-      </tr>
-    </blockTable>
-  </pto_header>
     <para style="terp_default_9">[[repeatIn(objects,'order')]]</para>
     <para style="terp_default_9">[[ setLang(order.partner_id.lang) ]]</para>
-    <blockTable colWidths="250.0,59.0,221.0" style="Table_Address_Detail">
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="250.0,59.0,221.0" style="Tableau1">
       <tr>
         <td>
-          <para style="terp_default_Bold_9">Expected Delivery address:</para>
-          <para style="terp_default_9">[[ (order.dest_address_id and order.dest_address_id.name) or (order.warehouse_id and order.warehouse_id.name) or '']]</para>
-          <para style="terp_default_9">[[ order.dest_address_id and display_address(order.dest_address_id) ]] </para>
+          <blockTable colWidths="250.0" style="Tableau2">
+            <tr>
+              <td>
+                <para style="terp_default_Bold_9">Expected Delivery address:</para>
+                <para style="terp_default_9">[[ (order.dest_address_id and order.dest_address_id.name) or (order.warehouse_id and order.warehouse_id.name) or '']]</para>
+                <para style="P3">[[ order.dest_address_id and display_address(order.dest_address_id) ]]</para>
+              </td>
+            </tr>
+          </blockTable>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
         </td>
         <td>
           <para style="terp_default_9">
@@ -100,18 +110,18 @@
           </para>
         </td>
         <td>
-          <para style="terp_default_9">[[ (order.partner_id.title and order.partner_id.title.name) or '' ]] [[ order.partner_id.name ]]</para>
-          <para style="terp_default_9">[[ display_address(order.partner_id) ]] </para>
+          <para style="terp_default_9">[[ (order .partner_id and order.partner_id.title and order.partner_id.title.name) or '' ]] [[ (order .partner_id and order.partner_id.name) or '' ]] </para>
+          <para style="terp_default_9">[[ order.partner_id and display_address(order .partner_id) ]] </para>
           <para style="terp_default_9">
             <font color="white"> </font>
           </para>
-          <para style="terp_default_9">Tel.: [[ (order.partner_id.phone) or removeParentNode('para') ]]</para>
-          <para style="terp_default_9">Fax: [[ (order.partner_id.fax) or removeParentNode('para') ]]</para>
-          <para style="terp_default_9">TVA: [[ (order.partner_id.vat) or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">Tel.: [[ (order.partner_id and order.partner_id.phone) or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">Fax: [[ (order.partner_id and order.partner_id.fax) or removeParentNode('para') ]]</para>
+          <para style="P3">TVA: [[ (order.partner_id and order.partner_id.vat) or removeParentNode('para') ]]</para>
         </td>
       </tr>
     </blockTable>
-    <para style="terp_default_8">
+    <para style="Standard">
       <font color="white"> </font>
     </para>
     <para style="terp_header">Request for Quotation : [[order.name]]</para>
@@ -132,7 +142,7 @@
       </tr>
     </blockTable>
     <section>
-      <para style="terp_default_2">[[repeatIn(order.order_line,'order_line')]]</para>
+      <para style="terp_default_9">[[ repeatIn(order.order_line,'order_line') ]]</para>
       <blockTable colWidths="370.0,100.0,39.0,20.0" style="Table_Product_Line">
         <tr>
           <td>
@@ -153,7 +163,13 @@
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_9">[[ format(order.notes or '') ]]</para>
+    <blockTable colWidths="535.0" style="Table_Outer_Notes">
+      <tr>
+        <td>
+          <para style="terp_default_9">[[ format(order.notes or removeParentNode('blockTable')) ]]</para>
+        </td>
+      </tr>
+    </blockTable>
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
@@ -165,6 +181,5 @@
       <font color="white"> </font>
     </para>
     <para style="terp_default_9">[[ user.signature or '' ]]</para>
-  </pto>
   </story>
 </document>

From 48b069dd1c473b9f93f29e93e0d799e3be220476 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Fri, 21 Sep 2012 17:52:46 +0530
Subject: [PATCH 05/18] [FIX]sale:switch from list view to graph view in 
 Sales/Invoicing/Order Lines to Invoice

bzr revid: kbh@tinyerp.com-20120921122246-3yp1okodn3dxhaw2
---
 addons/sale/sale.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 067f842165e..e8bdf76e56a 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -1100,6 +1100,12 @@ class sale_order_line(osv.osv):
         except Exception, ex:
             return False
 
+    def _get_order(self, cr, uid, ids, context=None):
+        result = {}
+        for line in self.pool.get('sale.order.line').browse(cr, uid, ids, context=context):
+            result[line.order_id.id] = True
+        return result.keys()
+
     _name = 'sale.order.line'
     _description = 'Sales Order Line'
     _columns = {
@@ -1112,7 +1118,10 @@ class sale_order_line(osv.osv):
         'invoiced': fields.boolean('Invoiced', readonly=True),
         'procurement_id': fields.many2one('procurement.order', 'Procurement'),
         'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Product Price'), readonly=True, states={'draft': [('readonly', False)]}),
-        'price_subtotal': fields.function(_amount_line, string='Subtotal', digits_compute= dp.get_precision('Account')),
+        'price_subtotal': fields.function(_amount_line, string='Subtotal', digits_compute= dp.get_precision('Account'),
+                    store={
+                           'purchase.order.line': (_get_order, None, 10),
+                           }, multi="sums"),
         'tax_id': fields.many2many('account.tax', 'sale_order_tax', 'order_line_id', 'tax_id', 'Taxes', readonly=True, states={'draft': [('readonly', False)]}),
         'type': fields.selection([('make_to_stock', 'from stock'), ('make_to_order', 'on order')], 'Procurement Method', required=True, readonly=True, states={'draft': [('readonly', False)]},
             help="If 'on order', it triggers a procurement when the sale order is confirmed to create a task, purchase order or manufacturing order linked to this sale order line."),

From 9edab6704ea9ea65822f67b020739f2ebdddc573 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Fri, 21 Sep 2012 18:41:44 +0530
Subject: [PATCH 06/18] [FIX]membership:field renamed

bzr revid: kbh@tinyerp.com-20120921131144-4nhxw1dm8rnhvh1y
---
 addons/membership/membership.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/membership/membership.py b/addons/membership/membership.py
index 2a006814629..87af723f2f9 100644
--- a/addons/membership/membership.py
+++ b/addons/membership/membership.py
@@ -338,7 +338,7 @@ class Partner(osv.osv):
                     -Paid Member: A member who has paid the membership amount."""),
         'membership_start': fields.function(
                     _membership_date, multi = 'membeship_start',
-                    string = 'Start Membership Date', type = 'date',
+                    string = 'Membership Start Date', type = 'date',
                     store = {
                         'account.invoice': (_get_invoice_partner, ['state'], 10),
                         'membership.membership_line': (_get_partner_id, ['state'], 10, ),
@@ -346,7 +346,7 @@ class Partner(osv.osv):
                     }, help="Date from which membership becomes active."),
         'membership_stop': fields.function(
                     _membership_date,
-                    string = 'Stop Membership Date', type='date', multi='membership_stop',
+                    string = 'Membership End Date', type='date', multi='membership_stop',
                     store = {
                         'account.invoice': (_get_invoice_partner, ['state'], 10),
                         'membership.membership_line': (_get_partner_id, ['state'], 10),

From beb501e764da8fb70cd98edb92bad6a9f13346c6 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Fri, 21 Sep 2012 18:55:35 +0530
Subject: [PATCH 07/18] [FIX]Typo in partner history tab for O2M fields

bzr revid: kbh@tinyerp.com-20120921132535-93yh1ifpwbwqjkmq
---
 addons/crm_claim/crm_claim_view.xml            | 2 +-
 addons/event/res_partner_view.xml              | 2 +-
 addons/marketing_campaign/res_partner_view.xml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 820fb38e58a..9643a56bfe2 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -241,7 +241,7 @@
                     <attribute name="invisible">False</attribute>
                 </xpath>
                 <xpath expr="//page[@name='page_history']" position="inside">
-                    <group name="grp_claim" string="Claim">
+                    <group name="grp_claim" string="Claims">
                         <field name="claims_ids" colspan="4" nolabel="1">
                             <tree string="Partners Claim" editable="bottom">
                                 <field name="name"/>
diff --git a/addons/event/res_partner_view.xml b/addons/event/res_partner_view.xml
index 8e5ff480c2c..abeed0eca9b 100644
--- a/addons/event/res_partner_view.xml
+++ b/addons/event/res_partner_view.xml
@@ -16,7 +16,7 @@
                     <attribute name="invisible">False</attribute>
                 </xpath>
                 <xpath expr="//page[@name='page_history']" position="inside">
-                    <group name="grp_event" string="Event">
+                    <group name="grp_event" string="Events">
                         <field name="event_ids" colspan="4" nolabel="1">
                             <tree string="Events">
                                 <field name="name" string="Event"/>
diff --git a/addons/marketing_campaign/res_partner_view.xml b/addons/marketing_campaign/res_partner_view.xml
index 5b959625086..63c65ccd97f 100644
--- a/addons/marketing_campaign/res_partner_view.xml
+++ b/addons/marketing_campaign/res_partner_view.xml
@@ -12,7 +12,7 @@
                    <attribute name="invisible">False</attribute>
                 </xpath>
                 <xpath expr="//page[@name='page_history']" position="inside">
-                    <group name="grp_campaign" string="Campaign">
+                    <group name="grp_campaign" string="Campaigns">
                         <field name="workitem_ids" colspan="4" nolabel="1"/>
                     </group>
                 </xpath>

From 6470c39017997d2b17be8e70654406e3d189e8e9 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Mon, 24 Sep 2012 11:38:24 +0530
Subject: [PATCH 08/18] [FIX]sale:fixed keyerrorfor price_subtotal

bzr revid: kbh@tinyerp.com-20120924060824-udq6uivwpf7tqs9o
---
 addons/sale/sale.py | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index e8bdf76e56a..b950fb1075e 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -1100,12 +1100,6 @@ class sale_order_line(osv.osv):
         except Exception, ex:
             return False
 
-    def _get_order(self, cr, uid, ids, context=None):
-        result = {}
-        for line in self.pool.get('sale.order.line').browse(cr, uid, ids, context=context):
-            result[line.order_id.id] = True
-        return result.keys()
-
     _name = 'sale.order.line'
     _description = 'Sales Order Line'
     _columns = {
@@ -1118,10 +1112,7 @@ class sale_order_line(osv.osv):
         'invoiced': fields.boolean('Invoiced', readonly=True),
         'procurement_id': fields.many2one('procurement.order', 'Procurement'),
         'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Product Price'), readonly=True, states={'draft': [('readonly', False)]}),
-        'price_subtotal': fields.function(_amount_line, string='Subtotal', digits_compute= dp.get_precision('Account'),
-                    store={
-                           'purchase.order.line': (_get_order, None, 10),
-                           }, multi="sums"),
+        'price_subtotal': fields.function(_amount_line, string='Subtotal', digits_compute= dp.get_precision('Account'), store=True),
         'tax_id': fields.many2many('account.tax', 'sale_order_tax', 'order_line_id', 'tax_id', 'Taxes', readonly=True, states={'draft': [('readonly', False)]}),
         'type': fields.selection([('make_to_stock', 'from stock'), ('make_to_order', 'on order')], 'Procurement Method', required=True, readonly=True, states={'draft': [('readonly', False)]},
             help="If 'on order', it triggers a procurement when the sale order is confirmed to create a task, purchase order or manufacturing order linked to this sale order line."),

From 31a2aafddafa4f8ae5df7121c22ce91c295f206e Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Tue, 25 Sep 2012 12:35:45 +0530
Subject: [PATCH 09/18] [IMP] add the access right in sale security

bzr revid: rma@tinyerp.com-20120925070545-d5pcyzq8dv6rdz70
---
 addons/sale/security/ir.model.access.csv | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/sale/security/ir.model.access.csv b/addons/sale/security/ir.model.access.csv
index d0d14fc76a1..69a639b4723 100644
--- a/addons/sale/security/ir.model.access.csv
+++ b/addons/sale/security/ir.model.access.csv
@@ -38,6 +38,7 @@ access_product_category_sale_manager,product.category salemanager,product.model_
 access_product_supplierinfo_user,product.supplierinfo.user,product.model_product_supplierinfo,base.group_sale_salesman,1,0,0,0
 access_product_supplierinfo_sale_manager,product.supplierinfo salemanager,product.model_product_supplierinfo,base.group_sale_manager,1,1,1,1
 access_pricelist_partnerinfo_sale_manager,pricelist.partnerinfo salemanager,product.model_pricelist_partnerinfo,base.group_sale_manager,1,1,1,1
+access_sale_order,sale.order,model_sale_order,base.group_partner_manager,1,1,1,1
 access_product_price_type_sale_manager,product.price.type salemanager,product.model_product_price_type,base.group_sale_manager,1,1,1,1
 access_product_pricelist_type_sale_manager,product.pricelist.type salemanager,product.model_product_pricelist_type,base.group_sale_manager,1,1,1,1
 access_product_pricelist_sale_manager,product.pricelist salemanager,product.model_product_pricelist,base.group_sale_manager,1,1,1,1

From 51b035f2a73fbe284120e6da69e99b46388718c9 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Tue, 25 Sep 2012 12:38:52 +0530
Subject: [PATCH 10/18] [FIX]account:label for bank_ids and set default partner
 on bank

bzr revid: kbh@tinyerp.com-20120925070852-q136gtxzmm2vnxrp
---
 addons/account/partner_view.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index 7ac1efd4f9f..74382ab1745 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -92,7 +92,8 @@
                             <field name="debit"/>
                         </group>
                     </group>
-                    <field name="bank_ids">
+                    <label for="bank_ids" string="Bank Details"/>
+                    <field name="bank_ids" context="{'default_partner_id': active_id}">
                         <form string="Bank account" version="7.0">
                             <group col="4">
                                 <field name="state"/>

From 4c1f5af881e4aa93dcb3fb5e932ac41f87561a33 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Tue, 25 Sep 2012 15:10:28 +0530
Subject: [PATCH 11/18] [FIX]l10n_ch:placehoder added for acc_number

bzr revid: kbh@tinyerp.com-20120925094028-7e4f6f960cj87h6l
---
 addons/account/partner_view.xml | 1 -
 addons/l10n_ch/bank_view.xml    | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index 74382ab1745..57009cd974e 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -92,7 +92,6 @@
                             <field name="debit"/>
                         </group>
                     </group>
-                    <label for="bank_ids" string="Bank Details"/>
                     <field name="bank_ids" context="{'default_partner_id': active_id}">
                         <form string="Bank account" version="7.0">
                             <group col="4">
diff --git a/addons/l10n_ch/bank_view.xml b/addons/l10n_ch/bank_view.xml
index 9cd6e2445f8..da6c7738ae9 100644
--- a/addons/l10n_ch/bank_view.xml
+++ b/addons/l10n_ch/bank_view.xml
@@ -41,7 +41,7 @@
                     <newline/>
                     <separator colspan="4" string="Account Infos"/>
                     <group string="Bank account info" colspan="4" attrs="{'invisible': [('state','in', ['bvpost','bvrpost'])]}" >
-                        <field name="acc_number" string="Account/IBAN Number" attrs="{'required': [('state','not in',['bvpost','bvrpost'])]}"/>
+                        <field name="acc_number" placeholder="Account Number" string="Account/IBAN Number" attrs="{'required': [('state','not in',['bvpost','bvrpost'])]}"/>
                         <field name="dta_code"/>
                         <newline/>
                     </group>
@@ -72,7 +72,7 @@
                     <separator colspan="4" string="Account Infos"/>
                         <newline/>
                     <group string="Bank account info" colspan="4" attrs="{'invisible': [('state','in', ['bvpost','bvrpost'])]}" >
-                            <field name="acc_number" string="Account/IBAN Number" attrs="{'required': [('state','not in',['bvpost','bvrpost'])]}"/>
+                            <field name="acc_number" placeholder="Account Number" string="Account/IBAN Number" attrs="{'required': [('state','not in',['bvpost','bvrpost'])]}"/>
                             <field name="dta_code"/>
                         <newline/>
                     </group>

From b428e22bf9f4c75a218fdaba0ef3236d27fa38d0 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Tue, 25 Sep 2012 15:23:01 +0530
Subject: [PATCH 12/18] [FIX]event:typo

bzr revid: kbh@tinyerp.com-20120925095301-8g3qcnvxo75caybx
---
 addons/event/res_partner_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/event/res_partner_view.xml b/addons/event/res_partner_view.xml
index abeed0eca9b..c3e8073a7ae 100644
--- a/addons/event/res_partner_view.xml
+++ b/addons/event/res_partner_view.xml
@@ -24,7 +24,7 @@
                             </tree>
                         </field>
                     </group>
-                    <group name="grp_registration" string="Registration">
+                    <group name="grp_registration" string="Registrations">
                         <field name="event_registration_ids" colspan="4" nolabel="1">
                             <tree string="Events Registration">
                                 <field name="event_begin_date" string="Date"/>

From b70daaef8280524f2dc0f76dc5fcb729fc08672d Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Tue, 25 Sep 2012 15:45:47 +0530
Subject: [PATCH 13/18] [FIX]sale:sale configuration

bzr revid: kbh@tinyerp.com-20120925101547-yxwhta5rpbkantp6
---
 addons/sale/res_config_view.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/addons/sale/res_config_view.xml b/addons/sale/res_config_view.xml
index 9ebbc36f8de..6150d4ce1a3 100644
--- a/addons/sale/res_config_view.xml
+++ b/addons/sale/res_config_view.xml
@@ -12,10 +12,6 @@
                     <group>
                         <label for="id" string="Invoicing Process"/>
                         <div>
-                            <div>
-                                <field name="group_invoice_so_lines" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)" class="oe_inline"/>
-                                <label for="group_invoice_so_lines"/>
-                            </div>
                             <div name="timesheet">
                                 <field name="timesheet" class="oe_inline" on_change="onchange_timesheet(timesheet)"/>
                                 <label for="timesheet"/>

From 695be66de39f44674ee768fa1404f28e0c1e65e9 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Tue, 25 Sep 2012 16:08:30 +0530
Subject: [PATCH 14/18] [FIX]purchase:reverted the changes of quatation report

bzr revid: kbh@tinyerp.com-20120925103830-ho8cmzph5n8djthd
---
 addons/purchase/report/request_quotation.rml | 97 +++++++++-----------
 1 file changed, 41 insertions(+), 56 deletions(-)

diff --git a/addons/purchase/report/request_quotation.rml b/addons/purchase/report/request_quotation.rml
index bff23f5ccc0..9994dd713b8 100644
--- a/addons/purchase/report/request_quotation.rml
+++ b/addons/purchase/report/request_quotation.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+<document filename="Request for Quotation.pdf">
+  <template title="Request for Quotation" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="23.0" y1="43.0" width="530" height="799"/>
     </pageTemplate>
@@ -10,11 +10,7 @@
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
-    <blockTableStyle id="Tableau1">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Tableau2">
+    <blockTableStyle id="Table_Address_Detail">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
@@ -34,16 +30,9 @@
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table_Outer_Notes">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="P1" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
-    <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P3" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
@@ -80,48 +69,49 @@
     <images/>
   </stylesheet>
   <story>
-    <para style="terp_default_9">[[repeatIn(objects,'order')]]</para>
-    <para style="terp_default_9">[[ setLang(order.partner_id.lang) ]]</para>
-    <para style="terp_default_9">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_default_9">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="250.0,59.0,221.0" style="Tableau1">
+  <pto>
+  <pto_header>
+    <blockTable colWidths="371.0,98.0,61.0" repeatRows="1" style="Table_Product_Header_Title">
       <tr>
         <td>
-          <blockTable colWidths="250.0" style="Tableau2">
-            <tr>
-              <td>
-                <para style="terp_default_Bold_9">Expected Delivery address:</para>
-                <para style="terp_default_9">[[ (order.dest_address_id and order.dest_address_id.name) or (order.warehouse_id and order.warehouse_id.name) or '']]</para>
-                <para style="P3">[[ order.dest_address_id and display_address(order.dest_address_id) ]]</para>
-              </td>
-            </tr>
-          </blockTable>
-          <para style="terp_default_9">
-            <font color="white"> </font>
-          </para>
+          <para style="terp_tblheader_Details">Description</para>
         </td>
         <td>
-          <para style="terp_default_9">
-            <font color="white"> </font>
-          </para>
+          <para style="terp_tblheader_Details_Centre">Expected Date</para>
         </td>
         <td>
-          <para style="terp_default_9">[[ (order .partner_id and order.partner_id.title and order.partner_id.title.name) or '' ]] [[ (order .partner_id and order.partner_id.name) or '' ]] </para>
-          <para style="terp_default_9">[[ order.partner_id and display_address(order .partner_id) ]] </para>
-          <para style="terp_default_9">
-            <font color="white"> </font>
-          </para>
-          <para style="terp_default_9">Tel.: [[ (order.partner_id and order.partner_id.phone) or removeParentNode('para') ]]</para>
-          <para style="terp_default_9">Fax: [[ (order.partner_id and order.partner_id.fax) or removeParentNode('para') ]]</para>
-          <para style="P3">TVA: [[ (order.partner_id and order.partner_id.vat) or removeParentNode('para') ]]</para>
+          <para style="terp_tblheader_Details_Centre">Qty</para>
         </td>
       </tr>
     </blockTable>
-    <para style="Standard">
+  </pto_header>
+    <para style="terp_default_9">[[repeatIn(objects,'order')]]</para>
+    <para style="terp_default_9">[[ setLang(order.partner_id.lang) ]]</para>
+    <blockTable colWidths="250.0,59.0,221.0" style="Table_Address_Detail">
+      <tr>
+        <td>
+          <para style="terp_default_Bold_9">Expected Delivery address:</para>
+          <para style="terp_default_9">[[ (order.dest_address_id and order.dest_address_id.name) or (order.warehouse_id and order.warehouse_id.name) or '']]</para>
+          <para style="terp_default_9">[[ order.dest_address_id and display_address(order.dest_address_id) ]] </para>
+        </td>
+        <td>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[ (order.partner_id.title and order.partner_id.title.name) or '' ]] [[ order.partner_id.name ]]</para>
+          <para style="terp_default_9">[[ display_address(order.partner_id) ]] </para>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+          <para style="terp_default_9">Tel.: [[ (order.partner_id.phone) or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">Fax: [[ (order.partner_id.fax) or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">TVA: [[ (order.partner_id.vat) or removeParentNode('para') ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_8">
       <font color="white"> </font>
     </para>
     <para style="terp_header">Request for Quotation : [[order.name]]</para>
@@ -142,7 +132,7 @@
       </tr>
     </blockTable>
     <section>
-      <para style="terp_default_9">[[ repeatIn(order.order_line,'order_line') ]]</para>
+      <para style="terp_default_2">[[repeatIn(order.order_line,'order_line')]]</para>
       <blockTable colWidths="370.0,100.0,39.0,20.0" style="Table_Product_Line">
         <tr>
           <td>
@@ -163,13 +153,7 @@
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="535.0" style="Table_Outer_Notes">
-      <tr>
-        <td>
-          <para style="terp_default_9">[[ format(order.notes or removeParentNode('blockTable')) ]]</para>
-        </td>
-      </tr>
-    </blockTable>
+    <para style="terp_default_9">[[ format(order.notes or '') ]]</para>
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
@@ -181,5 +165,6 @@
       <font color="white"> </font>
     </para>
     <para style="terp_default_9">[[ user.signature or '' ]]</para>
+  </pto>
   </story>
-</document>
+</document>
\ No newline at end of file

From b775ee79abed2ab0ee6b8b3a337fb968deeb6fa6 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Tue, 25 Sep 2012 16:31:15 +0530
Subject: [PATCH 15/18] [FIX]sale:quatation report updated

bzr revid: kbh@tinyerp.com-20120925110115-ljcf93q17fzeergk
---
 addons/sale/report/sale_order.rml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/addons/sale/report/sale_order.rml b/addons/sale/report/sale_order.rml
index 9f7ba06db95..32926cc0626 100644
--- a/addons/sale/report/sale_order.rml
+++ b/addons/sale/report/sale_order.rml
@@ -153,6 +153,12 @@
   </pto_header>
     <para style="terp_default_8">[[repeatIn(objects,'o')]]</para>
     <para style="terp_default_8">[[ setLang(o.partner_id.lang) ]]</para>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
     <blockTable colWidths="265.0,51.0,225.0" style="Table1">
       <tr>
         <td>

From 8e7b998db807a4a6af8518d2c872504d1f96b2c0 Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Tue, 25 Sep 2012 18:18:56 +0530
Subject: [PATCH 16/18] [IMP] edit the security code for the purchase

bzr revid: rma@tinyerp.com-20120925124856-frowt7rg6trnp242
---
 addons/purchase/purchase_view.xml        | 2 +-
 addons/sale/security/ir.model.access.csv | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 759c0561631..278e11599f3 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -79,7 +79,7 @@
     <!--Supplier menu-->
     <menuitem id="base.menu_procurement_management_supplier_name" name="Suppliers"
         parent="menu_procurement_management"
-        action="base.action_partner_supplier_form" sequence="15"/>
+        action="base.action_partner_supplier_form" sequence="15" groups="base.group_user"/>/>
 
       <!--Inventory control-->
       <menuitem id="menu_procurement_management_inventory" name="Receive Products"
diff --git a/addons/sale/security/ir.model.access.csv b/addons/sale/security/ir.model.access.csv
index 69a639b4723..a71b0eaa335 100644
--- a/addons/sale/security/ir.model.access.csv
+++ b/addons/sale/security/ir.model.access.csv
@@ -38,7 +38,7 @@ access_product_category_sale_manager,product.category salemanager,product.model_
 access_product_supplierinfo_user,product.supplierinfo.user,product.model_product_supplierinfo,base.group_sale_salesman,1,0,0,0
 access_product_supplierinfo_sale_manager,product.supplierinfo salemanager,product.model_product_supplierinfo,base.group_sale_manager,1,1,1,1
 access_pricelist_partnerinfo_sale_manager,pricelist.partnerinfo salemanager,product.model_pricelist_partnerinfo,base.group_sale_manager,1,1,1,1
-access_sale_order,sale.order,model_sale_order,base.group_partner_manager,1,1,1,1
+access_sale_order,sale.order,model_sale_order,base.group_user,1,0,0,0
 access_product_price_type_sale_manager,product.price.type salemanager,product.model_product_price_type,base.group_sale_manager,1,1,1,1
 access_product_pricelist_type_sale_manager,product.pricelist.type salemanager,product.model_product_pricelist_type,base.group_sale_manager,1,1,1,1
 access_product_pricelist_sale_manager,product.pricelist salemanager,product.model_product_pricelist,base.group_sale_manager,1,1,1,1

From 5f9f5c5f49ced085613664940e3536d3d08ff17f Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Tue, 25 Sep 2012 18:22:57 +0530
Subject: [PATCH 17/18] [FIX]access rights for customers

bzr revid: kbh@tinyerp.com-20120925125257-a1wigenaxa8zup35
---
 addons/account/account_menuitem.xml          | 2 +-
 addons/purchase/security/ir.model.access.csv | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml
index a2fbf11963b..13b5d6b0aa1 100644
--- a/addons/account/account_menuitem.xml
+++ b/addons/account/account_menuitem.xml
@@ -8,7 +8,7 @@
             groups="group_account_user,group_account_manager,group_account_invoice"
             sequence="100"/>
 
-        <menuitem id="menu_finance_receivables" name="Customers" parent="menu_finance" sequence="2"/>
+        <menuitem id="menu_finance_receivables" name="Customers" groups="base.group_user" parent="menu_finance" sequence="2"/>
         <menuitem id="menu_finance_payables" name="Suppliers" parent="menu_finance" sequence="3"/>
         <menuitem id="menu_finance_bank_and_cash" name="Bank and Cash" parent="menu_finance" sequence="4"
             groups="group_account_user,group_account_manager"/>
diff --git a/addons/purchase/security/ir.model.access.csv b/addons/purchase/security/ir.model.access.csv
index 04b6ff86e51..e161654fd2e 100644
--- a/addons/purchase/security/ir.model.access.csv
+++ b/addons/purchase/security/ir.model.access.csv
@@ -65,4 +65,4 @@ access_stock_tracking_purchase_user,stock.tracking purchase.user,stock.model_sto
 access_stock_location_purchase_manager,stock.location purchase manager,stock.model_stock_location,purchase.group_purchase_manager,1,0,0,0
 access_stock_warehouse_orderpoint_manager,stock.warehouse.orderpoint,procurement.model_stock_warehouse_orderpoint,purchase.group_purchase_manager,1,0,0,0
 access_stock_warehouse_orderpoint_manager,stock.warehouse.orderpoint,procurement.model_stock_warehouse_orderpoint,group_purchase_user,1,0,0,0
-access_purchase_order,purchase.order,model_purchase_order,base.group_partner_manager,1,0,0,0
\ No newline at end of file
+access_purchase_order,purchase.order,model_purchase_order,base.group_user,1,0,0,0
\ No newline at end of file

From 0f21ab835e0c1dbaeb4bbed3d0f7ffc457df38eb Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Wed, 26 Sep 2012 15:39:01 +0530
Subject: [PATCH 18/18] [IMP] account, l10n_ch: improve partner bank view

bzr revid: hmo@tinyerp.com-20120926100901-z9xxdstf75s9zzke
---
 addons/account/partner_view.xml | 29 +-------------
 addons/l10n_ch/bank_view.xml    | 68 +++++++--------------------------
 2 files changed, 15 insertions(+), 82 deletions(-)

diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index 57009cd974e..d21c1c532ed 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -92,34 +92,7 @@
                             <field name="debit"/>
                         </group>
                     </group>
-                    <field name="bank_ids" context="{'default_partner_id': active_id}">
-                        <form string="Bank account" version="7.0">
-                            <group col="4">
-                                <field name="state"/>
-                                <field name="acc_number"/>
-                            </group>
-                            <group>
-                                <group name="owner" string="Bank Account Owner">
-                                    <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
-                                    <field name="owner_name"/>
-                                    <label for="street" string="Address"/>
-                                    <div>
-                                        <field name="street" placeholder="Street..."/>
-                                        <div>
-                                            <field name="zip" class="oe_inline" placeholder="ZIP"/>
-                                            <field name="city" class="oe_inline" placeholder="City"/>
-                                        </div>
-                                        <field name="state_id" placeholder="State" options='{"no_open": true}'/>
-                                        <field name="country_id" placeholder="Country" options='{"no_open": true}'/>
-                                    </div>
-                                </group>
-                                <group name="bank" string="Information About the Bank">
-                                    <field name="bank" on_change="onchange_bank_id(bank)"/>
-                                    <field name="bank_name"/>
-                                    <field name="bank_bic" placeholder="e.g. GEBABEBB"/>
-                                </group>
-                            </group>
-                        </form>
+                    <field name="bank_ids" context="{'default_partner_id': active_id, 'form_view_ref': 'base.view_partner_bank_form'}">
                         <tree string="Bank Details">
                             <field name="sequence" invisible="1"/>
                             <field name="acc_number"/>
diff --git a/addons/l10n_ch/bank_view.xml b/addons/l10n_ch/bank_view.xml
index da6c7738ae9..017f9bd1f9b 100644
--- a/addons/l10n_ch/bank_view.xml
+++ b/addons/l10n_ch/bank_view.xml
@@ -28,34 +28,6 @@
                 </field>
             </field>
         </record>
-        
-        <!-- res.partner.bank in res partner form-->
-        <!-- Partner -> Bank Details -->
-        
-        <record model="ir.ui.view" id="l10nch_view_res_partner_bank_add_groups">
-            <field name="name">res.partner_bank.form.hide.f2</field>
-            <field name="model">res.partner</field>
-            <field name="inherit_id" ref="account.view_partner_property_form"/>
-            <field name="arch" type="xml">
-                <field name="state" position="after">
-                    <newline/>
-                    <separator colspan="4" string="Account Infos"/>
-                    <group string="Bank account info" colspan="4" attrs="{'invisible': [('state','in', ['bvpost','bvrpost'])]}" >
-                        <field name="acc_number" placeholder="Account Number" string="Account/IBAN Number" attrs="{'required': [('state','not in',['bvpost','bvrpost'])]}"/>
-                        <field name="dta_code"/>
-                        <newline/>
-                    </group>
-                    <newline/>
-                    <group string="Postal account info" colspan="4"  attrs="{'invisible': [('state','not in', ['bvpost','bvrpost','bvbank','bvrbank'])]}" >
-                        <field name="post_number" attrs="{'required': [('state','in',['bvpost','bvrpost','bvrbank'])]}"/>
-                        <newline/>
-                    </group>
-                    <separator colspan="4" string="Financial Institute Infos"/>
-                    <field name="bank" />
-                </field>
-            </field>
-        </record>
-
 
         <!-- res.partner.bank base form-->
         <!-- Sales -> Configuration -> Address Book -> Bank accounts -->
@@ -66,33 +38,21 @@
             <field name="model">res.partner.bank</field>
             <field name="inherit_id" ref="base.view_partner_bank_form"/>
             <field name="arch" type="xml">
-                <field name="state" position="after">
-                    <newline/>
-                    
-                    <separator colspan="4" string="Account Infos"/>
-                        <newline/>
-                    <group string="Bank account info" colspan="4" attrs="{'invisible': [('state','in', ['bvpost','bvrpost'])]}" >
-                            <field name="acc_number" placeholder="Account Number" string="Account/IBAN Number" attrs="{'required': [('state','not in',['bvpost','bvrpost'])]}"/>
-                            <field name="dta_code"/>
-                        <newline/>
+                <xpath expr="//field[@name='acc_number']" position="attributes">
+                    <attribute name="attrs">{'required': [('state','not in',['bvpost','bvrpost'])]}</attribute>
+                </xpath>
+                <xpath expr="//field[@name='acc_number']" position="after">
+                    <field name="post_number" attrs="{'required': [('state','in',['bvpost','bvrpost','bvrbank'])], 'invisible': [('state','not in', ['bvpost','bvrpost','bvbank','bvrbank'])]}"/>
+                    <field name="dta_code" attrs="{'invisible': [('state','in', ['bvpost','bvrpost'])]}"/>
+                    <field name="my_bank"  attrs="{'invisible': ['|', ('state', 'not in', ['bvrpost','bvrbank']), ('company_id', '=', False)]}" />
+                </xpath>
+                <xpath expr="//group[@name='bank']" position="after">
+                    <group string="BVR print options" attrs="{'invisible': [('my_bank', '!=', True)]}" >
+                        <field name="bvr_adherent_num" attrs="{'invisible': [('state','!=','bvrbank')]}"/>
+                        <field name="print_bank"/>
+                        <field name="print_account"/>
                     </group>
-                    <newline/>
-                    <group string="Postal account info" colspan="4"  attrs="{'invisible': [('state','not in', ['bvpost','bvrpost','bvbank','bvrbank'])]}" >
-                        <field name="post_number" attrs="{'required': [('state','in',['bvpost','bvrpost','bvrbank'])]}"/>
-                        <newline/>
-                    </group>
-                    <separator colspan="4" string="Financial Institute Infos"/>
-                    <newline/>
-                    <group attrs="{'invisible': ['|', ('state', 'not in', ['bvrpost','bvrbank']), ('company_id', '=', False)]}" colspan="4">
-                        <field name="my_bank"  attrs="{'invisible': [('company_id', '=', False)]}" />
-                        <group string="BVR print options" colspan="4"  attrs="{'invisible': [('my_bank', '!=', True)]}" >
-                            <field name="bvr_adherent_num" attrs="{'invisible': [('state','!=','bvrbank')]}"/>
-                            <field name="print_bank"/>
-                            <field name="print_account"/>
-                            <newline/>
-                        </group>
-                    </group>
-                </field>
+                </xpath>
             </field>
         </record>