Merge lp:~koi-accounting-modules-maintainer/koi-accounting-modules/7.0-account_move_mail_thread into lp:~koi-accounting-modules-maintainer/koi-accounting-modules/7.0-accounting_query

[Andhitia Rama]

Ok

[Andhitia Rama (andhitia-r)]

review: Approve

=== modified file 'ar_account/__openerp__.py'
--- ar_account/__openerp__.py	2014-04-30 18:16:46 +0000
+++ ar_account/__openerp__.py	2014-05-24 10:39:37 +0000
@@ -63,6 +63,7 @@
                 'view/view_SupplierInvoices.xml',
                 'view/view_ResCompany.xml',
                 'view/view_Account.xml',
+                'view/view_AccountMove.xml',
                 'window_action/waction_VoucherType.xml',
                 'window_action/waction_BankPayment.xml',
                 'window_action/waction_BankReceipt.xml',

=== modified file 'ar_account/object_other/__init__.py'
--- ar_account/object_other/__init__.py	2014-05-06 02:26:15 +0000
+++ ar_account/object_other/__init__.py	2014-05-24 10:39:37 +0000
@@ -20,6 +20,7 @@
 ##############################################################################
 
 import account_journal
+import account_move
 import account_move_line
 import res_currency
 import res_currency_rate

=== added file 'ar_account/object_other/account_move.py'
--- ar_account/object_other/account_move.py	1970-01-01 00:00:00 +0000
+++ ar_account/object_other/account_move.py	2014-05-24 10:39:37 +0000
@@ -0,0 +1,35 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution   
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+
+from osv import fields, osv
+
+class account_move(osv.osv):
+    _name = 'account.move'
+    _inherit = ['account.move','mail.thread']
+
+
+account_move()
+
+
+
+

=== added file 'ar_account/view/view_AccountMove.xml'
--- ar_account/view/view_AccountMove.xml	1970-01-01 00:00:00 +0000
+++ ar_account/view/view_AccountMove.xml	2014-05-24 10:39:37 +0000
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+	<data>
+
+        <record id="form_account_accountMove" model="ir.ui.view">
+            <field name="name">Form Journal Entry - ar_account</field>
+            <field name="model">account.move</field>
+            <field name="inherit_id" ref="account.view_move_form"/>
+            <field name="arch" type="xml">
+                <data>
+                    <sheet string="Journal Entries" position="after">
+                        <div class="oe_chatter">
+                            <field name="message_follower_ids" widget="mail_followers"/>
+                            <field name="message_ids" widget="mail_thread"/>
+                        </div>	
+                    </sheet>
+                </data>
+            </field>
+        </record>	
+
+
+	</data>
+</openerp>