Merge lp:~openerp-dev/openobject-addons/trunk-bug-844354-bde into lp:openobject-addons

[Bharat Devnani (Open ERP)]

Hello Sir,

I have added Amount Currency field in Journal Items Tree view through account/data/account_data.xml file.

Thanks & Regards,
Devnani Bharat R.

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

I have replied on bug, we consider bug as wishlist for now.

Thanks for your work,
Mustufa

Unmerged revisions

5290. By Bharat Devnani (Open ERP) on 2011-10-03

account : Secondary currency not displaying

=== modified file 'account/data/account_data.xml'
--- account/data/account_data.xml	2011-10-01 09:40:46 +0000
+++ account/data/account_data.xml	2011-10-03 09:10:30 +0000
@@ -62,9 +62,11 @@
         <!--
         Account Journal View
         -->
+
         <record id="account_journal_bank_view" model="account.journal.view">
             <field name="name">Bank/Cash Journal View</field>
         </record>
+
         <record id="bank_col1" model="account.journal.column">
             <field name="view_id" ref="account_journal_bank_view"/>
             <field name="name">Date</field>
@@ -72,6 +74,7 @@
             <field eval="True" name="required"/>
             <field eval="3" name="sequence"/>
         </record>
+
         <record id="bank_col2" model="account.journal.column">
             <field name="view_id" ref="account_journal_bank_view"/>
             <field name="name">Journal Entry</field>
@@ -79,6 +82,7 @@
             <field eval="False" name="required"/>
             <field eval="1" name="sequence"/>
         </record>
+
         <record id="bank_col7" model="account.journal.column">
             <field name="view_id" ref="account_journal_bank_view"/>
             <field name="name">Name</field>
@@ -86,18 +90,21 @@
             <field eval="7" name="sequence"/>
             <field eval="True" name="required"/>
         </record>
+
         <record id="bank_col4" model="account.journal.column">
             <field name="view_id" ref="account_journal_bank_view"/>
             <field name="name">Statement</field>
             <field name="field">statement_id</field>
             <field eval="4" name="sequence"/>
         </record>
+
         <record id="bank_col6" model="account.journal.column">
             <field name="view_id" ref="account_journal_bank_view"/>
             <field name="name">Partner</field>
             <field name="field">partner_id</field>
             <field eval="5" name="sequence"/>
         </record>
+
         <record id="bank_col5" model="account.journal.column">
             <field name="view_id" ref="account_journal_bank_view"/>
             <field name="name">Account</field>
@@ -105,30 +112,35 @@
             <field eval="True" name="required"/>
             <field eval="6" name="sequence"/>
         </record>
+
         <record id="bank_col9" model="account.journal.column">
             <field name="view_id" ref="account_journal_bank_view"/>
             <field name="name">Debit</field>
             <field name="field">debit</field>
             <field eval="11" name="sequence"/>
         </record>
+
         <record id="bank_col10" model="account.journal.column">
             <field name="view_id" ref="account_journal_bank_view"/>
             <field name="name">Credit</field>
             <field name="field">credit</field>
             <field eval="12" name="sequence"/>
         </record>
+
         <record id="bank_col3" model="account.journal.column">
             <field name="view_id" ref="account_journal_bank_view"/>
             <field name="name">Ref</field>
             <field name="field">ref</field>
             <field eval="2" name="sequence"/>
         </record>
+
         <record id="bank_col23" model="account.journal.column">
             <field name="view_id" ref="account_journal_bank_view"/>
             <field name="name">State</field>
             <field name="field">state</field>
             <field eval="19" name="sequence"/>
         </record>
+
         <record id="bank_col20" model="account.journal.column">
             <field name="view_id" ref="account_journal_bank_view"/>
             <field name="name">Reconcile</field>
@@ -136,10 +148,17 @@
             <field eval="20" name="sequence"/>
         </record>
 
+        <record id="bank_col_21" model="account.journal.column">
+            <field name="view_id" ref="account_journal_bank_view"/>
+            <field name="name">Currency Amt.</field>
+            <field name="field">amount_currency</field>
+            <field eval="9" name="sequence"/>
+        </record>
 
         <record id="account_journal_bank_view_multi" model="account.journal.view">
             <field name="name">Bank/Cash Journal (Multi-Currency) View</field>
         </record>
+
         <record id="bank_col1_multi" model="account.journal.column">
             <field name="view_id" ref="account_journal_bank_view_multi"/>
             <field name="name">Date</field>
@@ -147,6 +166,7 @@
             <field eval="True" name="required"/>
             <field eval="3" name="sequence"/>
         </record>
+
         <record id="bank_col2_multi" model="account.journal.column">
             <field name="view_id" ref="account_journal_bank_view_multi"/>
             <field name="name">Journal Entry</field>
@@ -154,6 +174,7 @@
             <field eval="False" name="required"/>
             <field eval="1" name="sequence"/>
         </record>
+
         <record id="bank_col7_multi" model="account.journal.column">
             <field name="view_id" ref="account_journal_bank_view_multi"/>
             <field name="name">Name</field>
@@ -161,18 +182,21 @@
             <field eval="7" name="sequence"/>
             <field eval="True" name="required"/>
         </record>
+
         <record id="bank_col4_multi" model="account.journal.column">
             <field name="view_id" ref="account_journal_bank_view_multi"/>
             <field name="name">Statement</field>
             <field name="field">statement_id</field>
             <field eval="4" name="sequence"/>
         </record>
+
         <record id="bank_col6_multi" model="account.journal.column">
             <field name="view_id" ref="account_journal_bank_view_multi"/>
             <field name="name">Partner</field>
             <field name="field">partner_id</field>
             <field eval="5" name="sequence"/>
         </record>
+
         <record id="bank_col5_multi" model="account.journal.column">
             <field name="view_id" ref="account_journal_bank_view_multi"/>
             <field name="name">Account</field>
@@ -180,42 +204,49 @@
             <field eval="True" name="required"/>
             <field eval="6" name="sequence"/>
         </record>
+
         <record id="bank_col17_multi" model="account.journal.column">
             <field name="view_id" ref="account_journal_bank_view_multi"/>
             <field name="name">Currency Amt.</field>
             <field name="field">amount_currency</field>
             <field eval="9" name="sequence"/>
         </record>
+
         <record id="bank_col18_multi" model="account.journal.column">
             <field name="view_id" ref="account_journal_bank_view_multi"/>
             <field name="name">Currency</field>
             <field name="field">currency_id</field>
             <field eval="10" name="sequence"/>
         </record>
+
         <record id="bank_col9_multi" model="account.journal.column">
             <field name="view_id" ref="account_journal_bank_view_multi"/>
             <field name="name">Debit</field>
             <field name="field">debit</field>
             <field eval="11" name="sequence"/>
         </record>
+
         <record id="bank_col10_multi" model="account.journal.column">
             <field name="view_id" ref="account_journal_bank_view_multi"/>
             <field name="name">Credit</field>
             <field name="field">credit</field>
             <field eval="12" name="sequence"/>
         </record>
+
         <record id="bank_col3_multi" model="account.journal.column">
             <field name="view_id" ref="account_journal_bank_view_multi"/>
             <field name="name">Ref</field>
             <field name="field">ref</field>
             <field eval="2" name="sequence"/>
         </record>
+
         <record id="bank_col23_multi" model="account.journal.column">
             <field name="view_id" ref="account_journal_bank_view_multi"/>
             <field name="name">State</field>
             <field name="field">state</field>
             <field eval="19" name="sequence"/>
         </record>
+
         <record id="bank_col20_multi" model="account.journal.column">
             <field name="view_id" ref="account_journal_bank_view_multi"/>
             <field name="name">Reconcile</field>
@@ -223,10 +254,10 @@
             <field eval="20" name="sequence"/>
         </record>
 
-
         <record id="account_journal_view" model="account.journal.view">
             <field name="name">Journal View</field>
         </record>
+
         <record id="journal_col1" model="account.journal.column">
             <field name="view_id" ref="account_journal_view"/>
             <field name="name">Date</field>
@@ -234,6 +265,7 @@
             <field eval="True" name="required"/>
             <field eval="3" name="sequence"/>
         </record>
+
         <record id="journal_col2" model="account.journal.column">
             <field name="view_id" ref="account_journal_view"/>
             <field name="name">Journal Entry</field>
@@ -241,18 +273,21 @@
             <field eval="False" name="required"/>
             <field eval="1" name="sequence"/>
         </record>
+
         <record id="journal_col3" model="account.journal.column">
             <field name="view_id" ref="account_journal_view"/>
             <field name="name">Ref</field>
             <field name="field">ref</field>
             <field eval="2" name="sequence"/>
         </record>
+
         <record id="journal_col5" model="account.journal.column">
             <field name="view_id" ref="account_journal_view"/>
             <field name="name">Partner</field>
             <field name="field">partner_id</field>
             <field eval="5" name="sequence"/>
         </record>
+
         <record id="journal_col4" model="account.journal.column">
             <field name="view_id" ref="account_journal_view"/>
             <field name="name">Account</field>
@@ -260,6 +295,7 @@
             <field eval="True" name="required"/>
             <field eval="6" name="sequence"/>
         </record>
+
         <record id="journal_col6" model="account.journal.column">
             <field name="view_id" ref="account_journal_view"/>
             <field name="name">Name</field>
@@ -267,24 +303,28 @@
             <field eval="7" name="sequence"/>
             <field eval="True" name="required"/>
         </record>
+
         <record id="journal_col8" model="account.journal.column">
             <field name="view_id" ref="account_journal_view"/>
             <field name="name">Debit</field>
             <field name="field">debit</field>
             <field eval="11" name="sequence"/>
         </record>
+
         <record id="journal_col9" model="account.journal.column">
             <field name="view_id" ref="account_journal_view"/>
             <field name="name">Credit</field>
             <field name="field">credit</field>
             <field eval="12" name="sequence"/>
         </record>
+
         <record id="journal_col11" model="account.journal.column">
             <field name="view_id" ref="account_journal_view"/>
             <field name="name">Analytic Account</field>
             <field name="field">analytic_account_id</field>
             <field eval="14" name="sequence"/>
         </record>
+
         <record id="journal_col24" model="account.journal.column">
             <field name="view_id" ref="account_journal_view"/>
             <field name="name">State</field>
@@ -292,10 +332,17 @@
             <field eval="19" name="sequence"/>
         </record>
 
+        <record id="journal_col21" model="account.journal.column">
+            <field name="view_id" ref="account_journal_view"/>
+            <field name="name">Currency Amt.</field>
+            <field name="field">amount_currency</field>
+            <field eval="9" name="sequence"/>
+        </record>
 
         <record id="account_sp_journal_view" model="account.journal.view">
             <field name="name">Sale/Purchase Journal View</field>
         </record>
+
         <record id="sp_journal_col1" model="account.journal.column">
             <field name="view_id" ref="account_sp_journal_view"/>
             <field name="name">Date</field>
@@ -303,6 +350,7 @@
             <field eval="True" name="required"/>
             <field eval="3" name="sequence"/>
         </record>
+
         <record id="sp_journal_col2" model="account.journal.column">
             <field name="view_id" ref="account_sp_journal_view"/>
             <field name="name">Journal Entry</field>
@@ -310,12 +358,14 @@
             <field eval="False" name="required"/>
             <field eval="1" name="sequence"/>
         </record>
+
         <record id="sp_journal_col3" model="account.journal.column">
             <field name="view_id" ref="account_sp_journal_view"/>
             <field name="name">Ref</field>
             <field name="field">ref</field>
             <field eval="2" name="sequence"/>
         </record>
+
         <record id="sp_journal_col4" model="account.journal.column">
             <field name="view_id" ref="account_sp_journal_view"/>
             <field name="name">Account</field>
@@ -323,12 +373,14 @@
             <field eval="True" name="required"/>
             <field eval="6" name="sequence"/>
         </record>
+
         <record id="sp_journal_col5" model="account.journal.column">
             <field name="view_id" ref="account_sp_journal_view"/>
             <field name="name">Partner</field>
             <field name="field">partner_id</field>
             <field eval="5" name="sequence"/>
         </record>
+
         <record id="sp_journal_col6" model="account.journal.column">
             <field name="view_id" ref="account_sp_journal_view"/>
             <field name="name">Name</field>
@@ -336,42 +388,49 @@
             <field eval="7" name="sequence"/>
             <field eval="True" name="required"/>
         </record>
+
         <record id="sp_journal_col7" model="account.journal.column">
             <field name="view_id" ref="account_sp_journal_view"/>
             <field name="name">Due Date</field>
             <field name="field">date_maturity</field>
             <field eval="8" name="sequence"/>
         </record>
+
         <record id="sp_journal_col8" model="account.journal.column">
             <field name="view_id" ref="account_sp_journal_view"/>
             <field name="name">Debit</field>
             <field name="field">debit</field>
             <field eval="11" name="sequence"/>
         </record>
+
         <record id="sp_journal_col9" model="account.journal.column">
             <field name="view_id" ref="account_sp_journal_view"/>
             <field name="name">Credit</field>
             <field name="field">credit</field>
             <field eval="12" name="sequence"/>
         </record>
+
         <record id="sp_journal_col10" model="account.journal.column">
             <field name="view_id" ref="account_sp_journal_view"/>
             <field name="name">Tax</field>
             <field name="field">account_tax_id</field>
             <field eval="13" name="sequence"/>
         </record>
+
         <record id="sp_journal_col11" model="account.journal.column">
             <field name="view_id" ref="account_sp_journal_view"/>
             <field name="name">Analytic Account</field>
             <field name="field">analytic_account_id</field>
             <field eval="14" name="sequence"/>
         </record>
+
         <record id="sp_journal_col24" model="account.journal.column">
             <field name="view_id" ref="account_sp_journal_view"/>
             <field name="name">State</field>
             <field name="field">state</field>
             <field eval="19" name="sequence"/>
         </record>
+
         <record id="sp_journal_col20" model="account.journal.column">
             <field name="view_id" ref="account_sp_journal_view"/>
             <field name="name">Reconcile</field>
@@ -379,9 +438,17 @@
             <field eval="20" name="sequence"/>
         </record>
 
+        <record id="sp_journal_col21" model="account.journal.column">
+            <field name="view_id" ref="account_sp_journal_view"/>
+            <field name="name">Currency Amt.</field>
+            <field name="field">amount_currency</field>
+            <field eval="9" name="sequence"/>
+        </record>
+
         <record id="account_sp_refund_journal_view" model="account.journal.view">
             <field name="name">Sale/Purchase Refund Journal View</field>
         </record>
+
         <record id="sp_refund_journal_col1" model="account.journal.column">
             <field name="view_id" ref="account_sp_refund_journal_view"/>
             <field name="name">Date</field>
@@ -389,6 +456,7 @@
             <field eval="True" name="required"/>
             <field eval="3" name="sequence"/>
         </record>
+
         <record id="sp_refund_journal_col2" model="account.journal.column">
             <field name="view_id" ref="account_sp_refund_journal_view"/>
             <field name="name">Journal Entry</field>
@@ -396,12 +464,14 @@
             <field eval="False" name="required"/>
             <field eval="1" name="sequence"/>
         </record>
+
         <record id="sp_refund_journal_col3" model="account.journal.column">
             <field name="view_id" ref="account_sp_refund_journal_view"/>
             <field name="name">Ref</field>
             <field name="field">ref</field>
             <field eval="2" name="sequence"/>
         </record>
+
         <record id="sp_refund_journal_col4" model="account.journal.column">
             <field name="view_id" ref="account_sp_refund_journal_view"/>
             <field name="name">Account</field>
@@ -409,12 +479,14 @@
             <field eval="True" name="required"/>
             <field eval="6" name="sequence"/>
         </record>
+
         <record id="sp_refund_journal_col5" model="account.journal.column">
             <field name="view_id" ref="account_sp_refund_journal_view"/>
             <field name="name">Partner</field>
             <field name="field">partner_id</field>
             <field eval="5" name="sequence"/>
         </record>
+
         <record id="sp_refund_journal_col6" model="account.journal.column">
             <field name="view_id" ref="account_sp_refund_journal_view"/>
             <field name="name">Name</field>
@@ -422,42 +494,49 @@
             <field eval="7" name="sequence"/>
             <field eval="True" name="required"/>
         </record>
+
         <record id="sp_refund_journal_col7" model="account.journal.column">
             <field name="view_id" ref="account_sp_refund_journal_view"/>
             <field name="name">Due Date</field>
             <field name="field">date_maturity</field>
             <field eval="8" name="sequence"/>
         </record>
+
         <record id="sp_refund_journal_col8" model="account.journal.column">
             <field name="view_id" ref="account_sp_refund_journal_view"/>
             <field name="name">Debit</field>
             <field name="field">debit</field>
             <field eval="11" name="sequence"/>
         </record>
+
         <record id="sp_refund_journal_col9" model="account.journal.column">
             <field name="view_id" ref="account_sp_refund_journal_view"/>
             <field name="name">Credit</field>
             <field name="field">credit</field>
             <field eval="12" name="sequence"/>
         </record>
+
         <record id="sp_refund_journal_col10" model="account.journal.column">
             <field name="view_id" ref="account_sp_refund_journal_view"/>
             <field name="name">Tax</field>
             <field name="field">account_tax_id</field>
             <field eval="13" name="sequence"/>
         </record>
+
         <record id="sp_refund_journal_col11" model="account.journal.column">
             <field name="view_id" ref="account_sp_refund_journal_view"/>
             <field name="name">Analytic Account</field>
             <field name="field">analytic_account_id</field>
             <field eval="14" name="sequence"/>
         </record>
+
         <record id="sp_refund_journal_col24" model="account.journal.column">
             <field name="view_id" ref="account_sp_refund_journal_view"/>
             <field name="name">State</field>
             <field name="field">state</field>
             <field eval="19" name="sequence"/>
         </record>
+
         <record id="sp_refund_journal_col20" model="account.journal.column">
             <field name="view_id" ref="account_sp_refund_journal_view"/>
             <field name="name">Reconcile</field>
@@ -465,6 +544,13 @@
             <field eval="20" name="sequence"/>
         </record>
 
+        <record id="sp_refund_journal_col21" model="account.journal.column">
+            <field name="view_id" ref="account_sp_refund_journal_view"/>
+            <field name="name">Currency Amt.</field>
+            <field name="field">amount_currency</field>
+            <field eval="9" name="sequence"/>
+        </record>
+
         <!--
         Account Journal Sequences
         -->
@@ -555,8 +641,8 @@
             <field eval="1" name="number_increment"/>
         </record>
 
-        <!-- 
-        Sequence for analytic account 
+        <!--
+        Sequence for analytic account
         -->
         <record id="seq_type_analytic_account" model="ir.sequence.type">
             <field name="name">Analytic account</field>