From e6bdb08b5a096a2642f9bd660d20ce2ecba3e557 Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Tue, 1 Feb 2011 18:06:52 +0530
Subject: [PATCH] [IMP, ADD] account: add Opening entry Journal, Miscellenous
 journal and respective accounts

bzr revid: psi@tinyerp.co.in-20110201123652-805x6523dq3lk4ix
---
 addons/account/account.py               | 30 ++++++++++++++++---------
 addons/account/demo/account_minimal.xml | 29 +++++++++++++++++++++++-
 addons/account/installer.py             | 27 ++++++++++++++++++++--
 3 files changed, 72 insertions(+), 14 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index c2d98c56bba..a17eff7a71f 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -2822,12 +2822,16 @@ class wizard_multi_charts_accounts(osv.osv_memory):
             seq_id_opening = obj_sequence.search(cr, uid, [('name','=','Opening Entries Journal')])
             if seq_id_opening:
                 seq_id_opening = seq_id_opening[0]
+            seq_id_miscellaneous = obj_sequence.search(cr, uid, [('name','=','Miscellaneous Journal')])
+            if seq_id_miscellaneous:
+                seq_id_miscellaneous = seq_id_miscellaneous[0]
         else:
             seq_id_sale = seq_id
             seq_id_purchase = seq_id
             seq_id_sale_refund = seq_id
             seq_id_purchase_refund = seq_id
             seq_id_opening = seq_id
+            seq_id_miscellaneous = seq_id
 
         vals_journal['view_id'] = view_id
 
@@ -2888,12 +2892,6 @@ class wizard_multi_charts_accounts(osv.osv_memory):
             vals_journal['default_credit_account_id'] = acc_template_ref[obj_multi.chart_template_id.property_account_income_categ.id]
             vals_journal['default_debit_account_id'] = acc_template_ref[obj_multi.chart_template_id.property_account_income_categ.id]
 
-
-#        if obj_multi.property_account_receivable:
-#            vals_journal.update({
-#                'default_credit_account_id': acc_template_ref[obj_multi.chart_template_id.property_account_income_categ.id],
-#                'default_debit_account_id': acc_template_ref[obj_multi.chart_template_id.property_account_income_categ.id]
-#            })
         obj_journal.create(cr, uid, vals_journal, context=context)
 
         # Purchase Refund Journal
@@ -2912,12 +2910,20 @@ class wizard_multi_charts_accounts(osv.osv_memory):
             vals_journal['default_credit_account_id'] = acc_template_ref[obj_multi.chart_template_id.property_account_expense_categ.id]
             vals_journal['default_debit_account_id'] = acc_template_ref[obj_multi.chart_template_id.property_account_expense_categ.id]
 
+        obj_journal.create(cr, uid, vals_journal, context=context)
+
+        # Miscellaneous Journal
+        vals_journal = {
+            'view_id': view_id,
+            'name': _('Miscellaneous Journal'),
+            'type': 'general',
+            'refund_journal': True,
+            'code': _('MISC'),
+            'sequence_id': seq_id_miscellaneous,
+            'analytic_journal_id': analitical_journal_purchase,
+            'company_id': company_id
+        }
 
-#        if obj_multi.property_account_payable:
-#            vals_journal.update({
-#                'default_credit_account_id': acc_template_ref[obj_multi.property_account_expense_categ.id],
-#                'default_debit_account_id': acc_template_ref[obj_multi.property_account_expense_categ.id]
-#            })
         obj_journal.create(cr, uid, vals_journal, context=context)
 
         # Opening Entries Journal
@@ -2930,11 +2936,13 @@ class wizard_multi_charts_accounts(osv.osv_memory):
                 'sequence_id': seq_id_opening,
                 'analytic_journal_id': analitical_journal_purchase,
                 'company_id': company_id,
+                'centralisation': True,
                 'default_credit_account_id': acc_template_ref[obj_multi.chart_template_id.property_account_income_opening.id],
                 'default_debit_account_id': acc_template_ref[obj_multi.chart_template_id.property_account_expense_opening.id]
                 }
             obj_journal.create(cr, uid, vals_journal, context=context)
 
+
         # Bank Journals
         data_id = obj_data.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_journal_bank_view')])
         data = obj_data.browse(cr, uid, data_id[0], context=context)
diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml
index 6ae6188ec62..61a580835ab 100644
--- a/addons/account/demo/account_minimal.xml
+++ b/addons/account/demo/account_minimal.xml
@@ -163,6 +163,14 @@
             <field name="user_type" ref="account_type_asset"/>
         </record>
 
+        <record id="o_income" model="account.account">
+            <field name="code">X11006</field>
+            <field name="name">Opening Income - (test)</field>
+            <field ref="cas" name="parent_id"/>
+            <field name="type">closed</field>
+            <field name="user_type" ref="account_type_income"/>
+        </record>
+
         <record model="account.account" id="liabilities_view">
             <field name="name">Liabilities - (test)</field>
             <field name="code">X11</field>
@@ -205,6 +213,14 @@
             <field name="user_type" ref="account_type_liability"/>
         </record>
 
+        <record id="o_expense" model="account.account">
+            <field name="code">X1114</field>
+            <field name="name">Opening Expense - (test)</field>
+            <field ref="cli" name="parent_id"/>
+            <field name="type">closed</field>
+            <field name="user_type" ref="account_type_expense"/>
+        </record>
+
         <!-- Profit and Loss -->
 
         <record id="gpf" model="account.account">
@@ -430,7 +446,18 @@
             <field name="analytic_journal_id" ref="sit"/>
             <field name="user_id" ref="base.user_root"/>
         </record>
-
+        <record id="opening_journal" model="account.journal">
+            <field name="name">Opening Entries Journal - (test)</field>
+            <field name="code">TOEJ</field>
+            <field name="type">situation</field>
+            <field name="view_id" ref="account_journal_bank_view"/>
+            <field name="sequence_id" ref="sequence_cash_journal"/>
+            <field model="account.account" name="default_debit_account_id" ref="o_income"/>
+            <field model="account.account" name="default_credit_account_id" ref="o_expense"/>
+            <field eval="True" name="centralisation"/>
+            <field name="analytic_journal_id" ref="sit"/>
+            <field name="user_id" ref="base.user_root"/>
+        </record>
         <!--
         Product income and expense accounts, default parameters
         -->
diff --git a/addons/account/installer.py b/addons/account/installer.py
index 4a4d945f72b..65d8d7fa99f 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -424,13 +424,21 @@ class account_installer(osv.osv_memory):
                 'company_id': company_id.id
             }
             seq_id_opening = obj_sequence.create(cr, uid, seq_opening_journal, context=context)
+            seq_miscellaneous_journal = {
+                'name': 'Miscellaneous Journal',
+                'code': 'account.journal',
+                'prefix': 'MISC/%(year)s/',
+                'padding': 3,
+                'company_id': company_id.id
+            }
+            seq_id_miscellaneous = obj_sequence.create(cr, uid, seq_opening_journal, context=context)
         else:
             seq_id_sale = seq_id
             seq_id_purchase = seq_id
             seq_id_sale_refund = seq_id
             seq_id_purchase_refund = seq_id
             seq_id_opening = seq_id
-
+            seq_id_miscellaneous = seq_id
         vals_journal['view_id'] = view_id
 
         #Sales Journal
@@ -517,16 +525,31 @@ class account_installer(osv.osv_memory):
             })
         obj_journal.create(cr, uid, vals_journal, context=context)
 
+        # Miscellaneous Journal
+        vals_journal = {
+            'view_id': view_id,
+            'name': _('Miscellaneous Journal'),
+            'type': 'general',
+            'refund_journal': True,
+            'code': _('MISC'),
+            'sequence_id': seq_id_miscellaneous,
+            'analytic_journal_id': analitical_journal_purchase,
+            'company_id': company_id.id
+        }
+
+        obj_journal.create(cr, uid, vals_journal, context=context)
+
         # Opening Entries Journal
         if obj_multi.property_account_income_opening and obj_multi.property_account_expense_opening:
             vals_journal = {
                 'view_id': view_id,
                 'name': _('Opening Entries Journal'),
                 'type': 'situation',
-                'code': _('TOEJ'),
+                'code': _('OPEJ'),
                 'sequence_id': seq_id_opening,
                 'analytic_journal_id': analitical_journal_purchase,
                 'company_id': company_id.id,
+                'centralisation': True,
                 'default_credit_account_id': acc_template_ref[obj_multi.property_account_income_opening.id],
                 'default_debit_account_id': acc_template_ref[obj_multi.property_account_expense_opening.id]
                 }