[ADD]: add new views for journals

sales, purchase, refunds of sales and purchase

bzr revid: mga@tinyerp.com-20100708122029-gftnb7z0l5eldiog

1 files changed, 182 insertions, 29 deletions

diff --git a/addons/account/data/account_data2.xml b/addons/account/data/account_data2.xml
index fafbb52a171..10303dd8cbf 100644
--- a/addons/account/data/account_data2.xml
+++ b/addons/account/data/account_data2.xml
@@ -20,7 +20,7 @@
         Account Journal View
         -->
         <record id="account_journal_bank_view" model="account.journal.view">
-            <field name="name">Cash Journal View</field>
+            <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"/>
@@ -74,12 +74,6 @@
             <field name="field">credit</field>
             <field eval="11" name="sequence"/>
         </record>
-        <record id="bank_col11" model="account.journal.column">
-            <field name="view_id" ref="account_journal_bank_view"/>
-            <field name="name">Tax</field>
-            <field name="field">account_tax_id</field>
-            <field eval="12" name="sequence"/>
-        </record>
         <record id="bank_col12" model="account.journal.column">
             <field name="view_id" ref="account_journal_bank_view"/>
             <field name="name">Analytic Account</field>
@@ -100,7 +94,7 @@
         </record>
 
         <record id="account_journal_bank_view_multi" model="account.journal.view">
-            <field name="name">Multi-Currency Cash Journal View</field>
+            <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"/>
@@ -203,6 +197,12 @@
             <field name="field">ref</field>
             <field eval="3" 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="4" name="sequence"/>
+        </record>
         <record id="journal_col4" model="account.journal.column">
             <field name="view_id" ref="account_journal_view"/>
             <field name="name">Account</field>
@@ -210,69 +210,222 @@
             <field eval="True" name="required"/>
             <field eval="5" name="sequence"/>
         </record>
-        <record id="journal_col5" model="account.journal.column">
+        <record id="journal_col6" model="account.journal.column">
+            <field name="view_id" ref="account_journal_view"/>
+            <field name="name">Name</field>
+            <field name="field">name</field>
+            <field eval="6" 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="8" 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="9" 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="11" name="sequence"/>
+        </record>
+        <record id="journal_col24" model="account.journal.column">
             <field name="view_id" ref="account_journal_view"/>
+            <field name="name">State</field>
+            <field name="field">state</field>
+            <field eval="14" 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>
+            <field name="field">date</field>
+            <field eval="True" name="required"/>
+            <field eval="1" name="sequence"/>
+        </record>
+        <record id="sp_journal_col2" model="account.journal.column">
+            <field name="view_id" ref="account_sp_journal_view"/>
+            <field name="name">N. Piece</field>
+            <field name="field">move_id</field>
+            <field eval="False" name="required"/>
+            <field eval="2" 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="3" 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>
+            <field name="field">account_id</field>
+            <field eval="True" name="required"/>
+            <field eval="5" 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="4" name="sequence"/>
         </record>
-        <record id="journal_col6" model="account.journal.column">
-            <field name="view_id" ref="account_journal_view"/>
+        <record id="sp_journal_col6" model="account.journal.column">
+            <field name="view_id" ref="account_sp_journal_view"/>
             <field name="name">Name</field>
             <field name="field">name</field>
             <field eval="6" name="sequence"/>
             <field eval="True" name="required"/>
         </record>
-        <record id="journal_col7" model="account.journal.column">
-            <field name="view_id" ref="account_journal_view"/>
+        <record id="sp_journal_col7" model="account.journal.column">
+            <field name="view_id" ref="account_sp_journal_view"/>
             <field name="name">Maturity Date</field>
             <field name="field">date_maturity</field>
             <field eval="7" name="sequence"/>
         </record>
-        <record id="journal_col8" model="account.journal.column">
-            <field name="view_id" ref="account_journal_view"/>
+        <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="8" name="sequence"/>
         </record>
-        <record id="journal_col9" model="account.journal.column">
-            <field name="view_id" ref="account_journal_view"/>
+        <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="9" name="sequence"/>
         </record>
-        <record id="journal_col10" model="account.journal.column">
-            <field name="view_id" ref="account_journal_view"/>
+        <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="10" name="sequence"/>
         </record>
-        <record id="journal_col11" model="account.journal.column">
-            <field name="view_id" ref="account_journal_view"/>
+        <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="11" name="sequence"/>
         </record>
-        <record id="journal_col25" model="account.journal.column">
-            <field name="view_id" ref="account_journal_view"/>
+        <record id="sp_journal_col25" model="account.journal.column">
+            <field name="view_id" ref="account_sp_journal_view"/>
             <field name="name">Tax Acc.</field>
             <field name="field">tax_code_id</field>
             <field eval="12" name="sequence"/>
         </record>
-        <record id="journal_col26" model="account.journal.column">
-            <field name="view_id" ref="account_journal_view"/>
+        <record id="sp_journal_col26" model="account.journal.column">
+            <field name="view_id" ref="account_sp_journal_view"/>
             <field name="name">Tax</field>
             <field name="field">tax_amount</field>
             <field eval="13" name="sequence"/>
         </record>
-        <record id="journal_col24" model="account.journal.column">
-            <field name="view_id" ref="account_journal_view"/>
+        <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="14" 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>
+            <field name="field">date</field>
+            <field eval="True" name="required"/>
+            <field eval="1" 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">N. Piece</field>
+            <field name="field">move_id</field>
+            <field eval="False" name="required"/>
+            <field eval="2" 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="3" 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>
+            <field name="field">account_id</field>
+            <field eval="True" name="required"/>
+            <field eval="5" 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="4" 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>
+            <field name="field">name</field>
+            <field eval="6" 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">Maturity Date</field>
+            <field name="field">date_maturity</field>
+            <field eval="7" 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="8" 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="9" 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="10" 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="11" name="sequence"/>
+        </record>
+        <record id="sp_refund_journal_col25" model="account.journal.column">
+            <field name="view_id" ref="account_sp_refund_journal_view"/>
+            <field name="name">Tax Acc.</field>
+            <field name="field">tax_code_id</field>
+            <field eval="12" name="sequence"/>
+        </record>
+        <record id="sp_refund_journal_col26" model="account.journal.column">
+            <field name="view_id" ref="account_sp_refund_journal_view"/>
+            <field name="name">Tax</field>
+            <field name="field">tax_amount</field>
+            <field eval="13" 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="14" name="sequence"/>
         </record>
-
-
         <!--
         Account Journal Sequences
         -->