[ADD, IMP] account: changes in my last commite as per merge suggetion(New Opening and Miscellaneous journal)

bzr revid: psi@tinyerp.co.in-20110203101630-rvzgahp15111jf8s

addons/account/account.py

@@ -2459,8 +2459,8 @@ class account_chart_template(osv.osv):
         'property_account_expense': fields.many2one('account.account.template','Expense Account on Product Template'),
         'property_account_income': fields.many2one('account.account.template','Income Account on Product Template'),
         'property_reserve_and_surplus_account': fields.many2one('account.account.template', 'Reserve and Profit/Loss Account', domain=[('type', '=', 'payable')], help='This Account is used for transferring Profit/Loss(If It is Profit: Amount will be added, Loss: Amount will be deducted.), Which is calculated from Profilt & Loss Report'),
-        'property_account_income_opening': fields.many2one('account.account.template','Opening Entries Income Account'),
-        'property_account_expense_opening': fields.many2one('account.account.template','Opening Entries Expense Account'),
+        'property_account_income_opening': fields.many2one('account.account.template','Opening Entries Income Account', help='This Account is used for income opening entries'),
+        'property_account_expense_opening': fields.many2one('account.account.template','Opening Entries Expense Account', help='This Account is used for expense opening entires'),
     }
 
 account_chart_template()
@@ -2913,6 +2913,13 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         obj_journal.create(cr, uid, vals_journal, context=context)
 
         # Miscellaneous Journal
+        data_id = obj_data.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_journal_view')])
+        data = obj_data.browse(cr, uid, data_id[0], context=context)
+        view_id = data.res_id
+
+        analitical_miscellaneous_ids = analytic_journal_obj.search(cr, uid, [('type', '=', 'situation')], context=context)
+        analitical_journal_miscellaneous = analitical_miscellaneous_ids and analitical_miscellaneous_ids[0] or False
+
         vals_journal = {
             'view_id': view_id,
             'name': _('Miscellaneous Journal'),
@@ -2920,7 +2927,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
             'refund_journal': True,
             'code': _('MISC'),
             'sequence_id': seq_id_miscellaneous,
-            'analytic_journal_id': analitical_journal_purchase,
+            'analytic_journal_id': analitical_journal_miscellaneous,
             'company_id': company_id
         }
 
@@ -2934,7 +2941,6 @@ class wizard_multi_charts_accounts(osv.osv_memory):
                 'type': 'situation',
                 'code': _('TOEJ'),
                 '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],

addons/account/configurable_account_chart.xml

@@ -195,7 +195,7 @@
 			            <field name="code">1106</field>
 			            <field name="name">Opening Income Account</field>
 			            <field ref="conf_cas" name="parent_id"/>
-			            <field name="type">closed</field>
+			            <field name="type">other</field>
 			            <field name="user_type" ref="conf_account_type_income"/>
 			        </record>
 
@@ -237,7 +237,7 @@
 			            <field name="code">1114</field>
 			            <field name="name">Opening Expense Account</field>
 			            <field ref="conf_cli" name="parent_id"/>
-			            <field name="type">closed</field>
+			            <field name="type">other</field>
 			            <field name="user_type" ref="conf_account_type_expense"/>
 			        </record>
 

addons/account/data/account_data2.xml

@@ -483,6 +483,19 @@
             <field eval="3" name="padding"/>
             <field name="prefix">CSH/%(year)s/</field>
         </record>
+        <record id="sequence_opening_journal" model="ir.sequence">
+            <field name="name">Opening Entries Journal</field>
+            <field name="code">account.journal</field>
+            <field eval="3" name="padding"/>
+            <field name="prefix">OPEJ/%(year)s/</field>
+        </record>
+        <record id="sequence_miscellaneous_journal" model="ir.sequence">
+            <field name="name">Miscellaneous Journal</field>
+            <field name="code">account.journal</field>
+            <field eval="3" name="padding"/>
+            <field name="prefix">MISJ/%(year)s/</field>
+        </record>
+
         <!--
         Account Statement Sequences
         -->

addons/account/demo/account_minimal.xml

@@ -167,7 +167,7 @@
             <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="type">other</field>
             <field name="user_type" ref="account_type_income"/>
         </record>
 
@@ -217,7 +217,7 @@
             <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="type">other</field>
             <field name="user_type" ref="account_type_expense"/>
         </record>
 
@@ -441,8 +441,8 @@
             <field name="name">Miscellaneous Journal - (test)</field>
             <field name="code">TMIS</field>
             <field name="type">general</field>
-            <field name="view_id" ref="account_journal_bank_view"/>
-            <field name="sequence_id" ref="sequence_journal"/>
+            <field name="view_id" ref="account_journal_view"/>
+            <field name="sequence_id" ref="sequence_miscellaneous_journal"/>
             <field name="analytic_journal_id" ref="sit"/>
             <field name="user_id" ref="base.user_root"/>
         </record>
@@ -450,12 +450,11 @@
             <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 name="view_id" ref="account_journal_view"/>
+            <field name="sequence_id" ref="sequence_opening_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>
         <!--

addons/account/installer.py

@@ -382,7 +382,6 @@ class account_installer(osv.osv_memory):
         data = mod_obj.browse(cr, uid, data_id[0], context=context)
         view_id = data.res_id
         seq_id = obj_sequence.search(cr,uid,[('name', '=', 'Account Journal')], context=context)[0]
-
         if seq_journal:
             seq_sale = {
                 'name': 'Sale Journal',
@@ -419,7 +418,7 @@ class account_installer(osv.osv_memory):
             seq_opening_journal = {
                 'name': 'Opening Entries Journal',
                 'code': 'account.journal',
-                'prefix': 'TOEJ/%(year)s/',
+                'prefix': 'OPEJ/%(year)s/',
                 'padding': 3,
                 'company_id': company_id.id
             }
@@ -427,11 +426,11 @@ class account_installer(osv.osv_memory):
             seq_miscellaneous_journal = {
                 'name': 'Miscellaneous Journal',
                 'code': 'account.journal',
-                'prefix': 'MISC/%(year)s/',
+                'prefix': 'MISJ/%(year)s/',
                 'padding': 3,
                 'company_id': company_id.id
             }
-            seq_id_miscellaneous = obj_sequence.create(cr, uid, seq_opening_journal, context=context)
+            seq_id_miscellaneous = obj_sequence.create(cr, uid, seq_miscellaneous_journal, context=context)
         else:
             seq_id_sale = seq_id
             seq_id_purchase = seq_id
@@ -526,14 +525,20 @@ class account_installer(osv.osv_memory):
         obj_journal.create(cr, uid, vals_journal, context=context)
 
         # Miscellaneous Journal
+        data_id = mod_obj.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_journal_view')], context=context)
+        data = mod_obj.browse(cr, uid, data_id[0], context=context)
+        view_id_misc = data.res_id
+
+        analitical_miscellaneous_ids = analytic_journal_obj.search(cr, uid, [('type', '=', 'situation')], context=context)
+        analitical_journal_miscellaneous = analitical_miscellaneous_ids and analitical_miscellaneous_ids[0] or False
+
         vals_journal = {
-            'view_id': view_id,
+            'view_id': view_id_misc,
             'name': _('Miscellaneous Journal'),
             'type': 'general',
-            'refund_journal': True,
             'code': _('MISC'),
             'sequence_id': seq_id_miscellaneous,
-            'analytic_journal_id': analitical_journal_purchase,
+            'analytic_journal_id': analitical_journal_miscellaneous,
             'company_id': company_id.id
         }
 
@@ -547,7 +552,6 @@ class account_installer(osv.osv_memory):
                 'type': 'situation',
                 '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],