From 9263c6b2bf220405fd694715f99dce9f694e9fbb Mon Sep 17 00:00:00 2001
From: "ACH(OpenERP)" <>
Date: Tue, 30 Jun 2009 17:36:54 +0530
Subject: [PATCH] [FIX] Account :'note' field on Fiscal position,added on
 invoice report

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

bzr revid: jvo@tinyerp.com-20090630120654-6a6y3pd1yalgsj96
---
 addons/account/partner.py         |  3 ++-
 addons/account/partner_view.xml   |  5 +++--
 addons/account/report/invoice.rml | 14 ++++++++++++++
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/addons/account/partner.py b/addons/account/partner.py
index ecc8c7facb2..9c1f13f6e81 100644
--- a/addons/account/partner.py
+++ b/addons/account/partner.py
@@ -30,7 +30,8 @@ class account_fiscal_position(osv.osv):
         'name': fields.char('Fiscal Position', size=64, translate=True, required=True),
         'company_id': fields.many2one('res.company', 'Company'),
         'account_ids': fields.one2many('account.fiscal.position.account', 'position_id', 'Account Mapping'),
-        'tax_ids': fields.one2many('account.fiscal.position.tax', 'position_id', 'Tax Mapping')
+        'tax_ids': fields.one2many('account.fiscal.position.tax', 'position_id', 'Tax Mapping'),
+        'note': fields.text('Notes', translate=True),
     }
 
     def map_tax(self, cr, uid, fposition_id, taxes, context={}):
diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index 33aeda3640b..d93349d9f62 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -11,7 +11,8 @@
                     <field name="name" select="1"/>
                     <field name="company_id"/>
                     <newline/>
-                    <field name="tax_ids" colspan="4">
+                    <field name="note" colspan="4"/>
+                    <field name="tax_ids" colspan="4" widget="one2many_list">
                         <tree string="Tax Mapping" editable="bottom">
                             <field name="tax_src_id" domain="[('parent_id','=',False)]"/>
                             <field name="tax_dest_id" domain="[('parent_id','=',False)]"/>
@@ -21,7 +22,7 @@
                             <field name="tax_dest_id" domain="[('parent_id','=',False)]"/>
                         </form>
                     </field>
-                    <field name="account_ids" colspan="4">
+                    <field name="account_ids" colspan="4" widget="one2many_list">
                         <tree string="Account Mapping" editable="bottom">
                             <field name="account_src_id"/>
                             <field name="account_dest_id"/>
diff --git a/addons/account/report/invoice.rml b/addons/account/report/invoice.rml
index 876b6bc4813..10d50610720 100644
--- a/addons/account/report/invoice.rml
+++ b/addons/account/report/invoice.rml
@@ -404,5 +404,19 @@
     <para style="terp_default_2">
       <font color="white"> </font>
     </para>
+    <blockTable colWidths="128.0,402.0" style="Table1">
+      <tr>
+        <td>
+          <para style="terp_default_Bold_9">Fiscal Position Remark :</para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[ o.fiscal_position and format(o.fiscal_position.note) or removeParentNode('blockTable') ]]</para>
+        </td>
+       </tr>
+     </blockTable>
+     <para style="terp_default_2">
+       <font color="white"> </font>
+     </para>
+    
   </story>
 </document>