From 42772171648f3788bd125fc34f6ca1376a77488e Mon Sep 17 00:00:00 2001
From: qdp <qdp-launchpad@tinyerp.com>
Date: Tue, 28 Oct 2008 17:32:38 +0100
Subject: [PATCH] *added company field on account_journal (fields.related) +
 added in the view *demo data for journals modified (added x before the name)
 *reverted the view of supplier invoice form into editable='top'

bzr revid: qdp-launchpad@tinyerp.com-20081028163238-udragaeftw0dbovq
---
 addons/account/account.py               | 2 ++
 addons/account/account_invoice_view.xml | 2 +-
 addons/account/account_view.xml         | 1 +
 addons/account/demo/account_minimal.xml | 6 +++---
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 5d4910b11ea..a7898ed25cc 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -456,7 +456,9 @@ class account_journal(osv.osv):
         'groups_id': fields.many2many('res.groups', 'account_journal_group_rel', 'journal_id', 'group_id', 'Groups'),
         'currency': fields.many2one('res.currency', 'Currency', help='The currency used to enter statement'),
         'entry_posted': fields.boolean('Skip \'Draft\' State for Created Entries', help='Check this box if you don\'t want that new account moves pass through the \'draft\' state and goes direclty to the \'posted state\' without any manual validation.'),
+        'company_id': fields.related('default_credit_account_id','company_id',type='many2one', relation="res.company", string="Company"),
     }
+
     _defaults = {
         'active': lambda *a: 1,
         'user_id': lambda self,cr,uid,context: uid,
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 1c4ef5546c7..bfe96d58157 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -150,7 +150,7 @@
                             <field name="check_total" required="2"/>
                             <field name="currency_id" on_change="onchange_currency_id(currency_id)" select="2"/>
                             <field colspan="4" default_get="{'check_total': check_total, 'invoice_line': invoice_line, 'address_invoice_id': address_invoice_id, 'partner_id': partner_id, 'price_type': 'price_type' in dir() and price_type or False}" name="invoice_line" nolabel="1">
-                                <tree string="Invoice lines">
+                                <tree string="Invoice lines" editable="top">
                                     <field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, price_unit, parent.address_invoice_id)"/>
                                     <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(parent.partner_id,account_id)"/>
                                     <field name="invoice_line_tax_id" view_mode="2"/>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index ed7967a2946..1e2a67b866f 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -236,6 +236,7 @@
                 <tree string="Account Journal">
                     <field name="code"/>
                     <field name="name"/>
+                    <field name="company_id"/>
                 </tree>
             </field>
         </record>
diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml
index 606440020d0..34b06e30f20 100644
--- a/addons/account/demo/account_minimal.xml
+++ b/addons/account/demo/account_minimal.xml
@@ -162,7 +162,7 @@ your own chart of account.
 		-->
 
         <record id="sales_journal" model="account.journal">
-            <field name="name">Sales Journal</field>
+            <field name="name">x Sales Journal</field>
             <field name="code">SAJ</field>
             <field name="type">sale</field>
             <field name="view_id" ref="account_journal_view"/>
@@ -172,7 +172,7 @@ your own chart of account.
             <field name="user_id" ref="base.user_root"/>
         </record>
         <record id="expenses_journal" model="account.journal">
-            <field name="name">Expenses Journal</field>
+            <field name="name">x Expenses Journal</field>
             <field name="code">EXJ</field>
             <field name="type">purchase</field>
             <field name="view_id" ref="account_journal_view"/>
@@ -183,7 +183,7 @@ your own chart of account.
         </record>
 
         <record id="bank_journal" model="account.journal">
-            <field name="name">Bank Journal</field>
+            <field name="name">x Bank Journal</field>
             <field name="code">BNK</field>
             <field name="type">cash</field>
             <field name="view_id" ref="account_journal_bank_view"/>