Account.move.line:Added analytic entries on manual entry of move line.Added analytic journal field on account journal.

bzr revid: jvo@tinyerp.com-20080819133112-qbzuy5z0kjl67jtk

addons/account/account_move_line.py

@@ -792,6 +792,7 @@ class account_move_line(osv.osv):
             raise osv.except_osv(_('Bad account !'), _('You can not use this general account in this journal !'))
 
         tax_go=False
+
         if 'account_tax_id' in vals and vals['account_tax_id']:
             tax_id=tax_obj.browse(cr,uid,vals['account_tax_id'])
 
@@ -804,6 +805,20 @@ class account_move_line(osv.osv):
             fields=[x for x in vals]
             tax_go=True
 
+        if 'analytic_account_id' in vals and vals['analytic_account_id']:
+
+            if journal.analytic_journal_id:
+                vals['analytic_lines'] = [(0,0, {
+                        'name': vals['name'],
+                        'date': vals['date'],
+                        'account_id': vals['analytic_account_id'],
+                        'unit_amount': vals['quantity'],
+                        'amount': vals['debit'] or vals['credit'],
+                        'general_account_id': vals['account_id'],
+                        'journal_id': journal.analytic_journal_id.id,
+                        'ref': vals['ref'],
+                    })]
+
         result = super(osv.osv, self).create(cr, uid, vals, context)
         if tax_go:
             context['tax_line']=True
@@ -823,7 +838,5 @@ class account_bank_statement_reconcile(osv.osv):
     }
 account_bank_statement_reconcile()
 
-
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

addons/account/project/project.py

@@ -237,6 +237,14 @@ class account_analytic_journal(osv.osv):
     }
 account_analytic_journal()
 
+class account_journal(osv.osv):
+    _inherit="account.journal"
+
+    _columns = {
+        'analytic_journal_id':fields.many2one('account.analytic.journal','Analytic Journal'),
+    }
+account_journal()
+
 
 # ---------------------------------------------------------
 # Budgets

addons/account/project/project_view.xml

@@ -331,5 +331,17 @@
 
         <act_window domain="[('account_id', '=', active_id)]" id="act_acc_analytic_acc_2_report_hr_timesheet_invoice_journal" name="Costs &amp; Revenues" res_model="report.hr.timesheet.invoice.journal" src_model="account.analytic.account" view_mode="graph,tree,form" view_type="form"/>
 
+        <record id="view_account_journal_1" model="ir.ui.view">
+            <field name="name">account.journal.form.1</field>
+            <field name="model">account.journal</field>
+            <field name="inherit_id" ref="account.view_account_journal_form"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <field name="currency" position="after">
+                    <field name="analytic_journal_id"/>
+                </field>
+            </field>
+        </record>
+
     </data>
 </terp>