From 84d0f1ff53ff51ebba9e955490d4a682922feebb Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 4 Jun 2012 12:43:01 +0530
Subject: [PATCH 01/23] [IMP] account : Added groups to Journal.

bzr revid: mdi@tinyerp.com-20120604071301-xt518arvb3sdlrcj
---
 addons/account/account_invoice_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 8254d5183be..832cdbd250d 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -276,7 +276,7 @@
                 </div>
                 <sheet string="Invoice" layout="auto">
                     <group colspan="4" col="8" class="oe_form_header">
-                    <field name="journal_id" groups="base.group_user" on_change="onchange_journal_id(journal_id, context)" widget="selection"/>
+                    <field name="journal_id" groups="account.group_account_user" on_change="onchange_journal_id(journal_id, context)" widget="selection"/>
                     <field name="number"/>
                     <field name="type" invisible="1"/>
                     <field name="currency_id" width="50"/>

From 21498e1caf29adb979eec771a3578f1d26d08297 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 4 Jun 2012 15:54:38 +0530
Subject: [PATCH 02/23] [IMP] account : Added groups to unit of measure.

bzr revid: mdi@tinyerp.com-20120604102438-pbf9mjmgp3gbhlso
---
 addons/account/account_invoice_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 832cdbd250d..97218719812 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -37,7 +37,7 @@
                     <field name="name"/>
                     <field name="account_id" groups="account.group_account_user"/>
                     <field name="quantity"/>
-                    <field name="uos_id"/>
+                    <field name="uos_id" groups="product.group_uom"/>
                     <field name="price_unit"/>
                     <field name="discount"/>
                     <field name="price_subtotal"/>
@@ -56,7 +56,7 @@
                     <label string="Quantity" for="quantity" align="1.0"/>
                     <group colspan="1" col="2">
                         <field name="quantity" nolabel="1"/>
-                        <field name="uos_id" on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)" nolabel="1"/>
+                        <field name="uos_id" on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)" nolabel="1" groups="product.group_uom"/>
                     </group>
                     <field name="price_unit"/>
                     <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(product_id, parent.partner_id, parent.type, parent.fiscal_position,account_id)"/>

From ddae91b2a0299e99b201f045621496a067fca7fd Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 4 Jun 2012 16:09:28 +0530
Subject: [PATCH 03/23] [IMP] account : Added groups to some fields.

bzr revid: mdi@tinyerp.com-20120604103928-y47zukxms2vd5h49
---
 addons/account/account_invoice_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 97218719812..a06405f7227 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -300,7 +300,7 @@
                                 <field name="tax_line" nolabel="1">
                                     <tree editable="bottom" string="Taxes">
                                         <field name="name"/>
-                                        <field name="account_id" groups="account.group_account_invoice"/>
+                                        <field name="account_id" groups="account.group_account_user"/>
                                         <field name="base" on_change="base_change(base,parent.currency_id,parent.company_id,parent.date_invoice)" readonly="1"/>
                                         <field name="amount" on_change="amount_change(amount,parent.currency_id,parent.company_id,parent.date_invoice)"/>
                                         <field invisible="True" name="base_amount"/>
@@ -319,7 +319,7 @@
                                 <field name="amount_tax"/>
                                 <field name="reconciled"/>
                                 <field name="amount_total"/>
-                                <field name="residual"/>
+                                <field name="residual" groups="account.group_account_user"/>
                             </group>
                         </page>
                         <page string="Other Info">

From 4f96a9d0a55ba01370c653dc0699970a1e4d340c Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 4 Jun 2012 16:21:28 +0530
Subject: [PATCH 04/23] [IMP] account : Highlighted the buttons.

bzr revid: mdi@tinyerp.com-20120604105128-en20tnlo7rigs0f9
---
 addons/account/account_invoice_view.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index a06405f7227..b3d51f9bb4b 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -260,9 +260,10 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                	<button name="action_invoice_sent" type="object" string="Send by Email" states="open" attrs="{'invisible':['|',('sent','=',True), ('state', '=', 'draft')]}"/>
-                	<button name="invoice_print" string="Print Invoice" type="object" states="open" attrs="{'invisible':['|',('sent','=',True), ('state', '=', 'draft')]}"/>
-                    <button name="invoice_open" states="draft,proforma2" string="Validate"/>
+                    <button name="action_invoice_sent" type="object" string="Send by Email" states="open" attrs="{'invisible':['|',('sent','=',True), ('state', '=', 'draft')]}" class="oe_form_button_hi"/>
+                    <button name="invoice_print" string="Print Invoice" type="object" states="open" attrs="{'invisible':['|',('sent','=',True), ('state', '=', 'draft')]}" class="oe_form_button_hi"/>
+                    <button name="invoice_open" states="draft" string="Validate" class="oe_form_button_hi"/>
+                    <button name="invoice_open" states="proforma2" string="Validate"/>
                     <button name="invoice_proforma2" states="draft" string="PRO-FORMA" groups="account.group_proforma_invoices"/>
                     <button name="%(action_account_invoice_refund)d" type='action' string='Refund Invoice' states='paid'/>
                     <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" groups="base.group_no_one"/>

From 72fb823d0aa409435eb96b628d69f3acd194fc2c Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 4 Jun 2012 16:39:26 +0530
Subject: [PATCH 05/23] [IMP] account_voucher : Highlighted the buttons and
 remove the icon.

bzr revid: mdi@tinyerp.com-20120604110926-m9evr4auxw9tfzrs
---
 addons/account_voucher/account_voucher_pay_invoice.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account_voucher/account_voucher_pay_invoice.xml b/addons/account_voucher/account_voucher_pay_invoice.xml
index da669ad04ee..8703abad9e2 100644
--- a/addons/account_voucher/account_voucher_pay_invoice.xml
+++ b/addons/account_voucher/account_voucher_pay_invoice.xml
@@ -8,7 +8,7 @@
            <field name="inherit_id" ref="account.invoice_form"/>
            <field name="arch" type="xml">
            <button name="invoice_open" position="after">
-               <button name="invoice_pay_customer" type="object" string="Register Payment" states="open" icon="gtk-go-forward"/>
+               <button name="invoice_pay_customer" type="object" string="Register Payment" states="open" attrs="{'invisible':[('sent','=',True)]}" class="oe_form_button_hi"/>
            </button>
            </field>
         </record>

From 25332dbe1d34ac9263c792d8fe611edc5aa43485 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 4 Jun 2012 16:45:19 +0530
Subject: [PATCH 06/23] [IMP] account_voucher : revert the changes.

bzr revid: mdi@tinyerp.com-20120604111519-1rp90h30yrf5uvvh
---
 addons/account_voucher/account_voucher_pay_invoice.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account_voucher/account_voucher_pay_invoice.xml b/addons/account_voucher/account_voucher_pay_invoice.xml
index 8703abad9e2..41d21c4bf38 100644
--- a/addons/account_voucher/account_voucher_pay_invoice.xml
+++ b/addons/account_voucher/account_voucher_pay_invoice.xml
@@ -8,7 +8,7 @@
            <field name="inherit_id" ref="account.invoice_form"/>
            <field name="arch" type="xml">
            <button name="invoice_open" position="after">
-               <button name="invoice_pay_customer" type="object" string="Register Payment" states="open" attrs="{'invisible':[('sent','=',True)]}" class="oe_form_button_hi"/>
+               <button name="invoice_pay_customer" type="object" string="Register Payment"/>
            </button>
            </field>
         </record>

From 3800d8fd6ec28e3edcfb067ad2aa75727f2b3641 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 4 Jun 2012 17:01:38 +0530
Subject: [PATCH 07/23] [IMP] account : Improved the menutips of customer
 invoice.

bzr revid: mdi@tinyerp.com-20120604113138-19f5fphbnla93756
---
 addons/account/account_invoice_view.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index b3d51f9bb4b..f01cc6fd0d6 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -444,7 +444,11 @@
             <field name="domain">[('type','=','out_invoice')]</field>
             <field name="context">{'default_type':'out_invoice', 'type':'out_invoice', 'journal_type': 'sale'}</field>
             <field name="search_view_id" ref="view_account_invoice_filter"/>
-            <field name="help">With Customer Invoices you can create and manage sales invoices issued to your customers. OpenERP can also generate draft invoices automatically from sales orders or deliveries. You should only confirm them before sending them to your customers.</field>
+            <field name="help">
+                Click here to create a new Invoice.
+                &lt;p&gt;
+                The Invoice can be generated automatically from a sale order or a delivery order. The invoice can be send by email.
+            </field>
         </record>
 
 

From 015459f045b046e7a9d001b9e5c9bcc4ac0e1f87 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 5 Jun 2012 11:20:13 +0530
Subject: [PATCH 08/23] [IMP] account_voucher : Improved the menu tips for
 customer payment.

bzr revid: mdi@tinyerp.com-20120605055013-t0fjym92knocj4gy
---
 addons/account_voucher/voucher_payment_receipt_view.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 5ceee46b2cd..9e71977a510 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -431,7 +431,11 @@
             <field name="search_view_id" ref="view_voucher_filter_customer_pay"/>
             <field name="view_id" eval="False"/>
             <field name="target">current</field>
-            <field name="help">Sales payment allows you to register the payments you receive from your customers. In order to record a payment, you must enter the customer, the payment method (=the journal) and the payment amount. OpenERP will propose to you automatically the reconciliation of this payment with the open invoices or sales receipts.</field>
+            <field name="help">
+                Click on create to register a payment.
+                &lt;p&gt;
+                Enter the customer and the payment method and then, either create manually a payment record or OpenERP will propose to you automatically the reconciliation of this payment with the open invoices or sales receipts.
+            </field>
         </record>
         <record id="action_vendor_receipt_tree" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>

From 3db7d5f66c36da11a8d5ddb7ec6ec606f1450dcb Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 5 Jun 2012 11:26:44 +0530
Subject: [PATCH 09/23] [IMP] account_voucher : Addedd a groups to some fields.

bzr revid: mdi@tinyerp.com-20120605055644-o63hq3757qcbkzps
---
 addons/account_voucher/voucher_payment_receipt_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 9e71977a510..f1013e1a9c3 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -345,8 +345,8 @@
                                     <field name="date_original" readonly="1"/>
                                     <field name="date_due" readonly="1"/>
                                     <field name="amount_original" readonly="1"/>
-                                    <field name="amount_unreconciled" readonly="1"/>
-                                    <field name="reconcile" on_change="onchange_reconcile(reconcile, amount, amount_unreconciled, context)"/>
+                                    <field name="amount_unreconciled" readonly="1" groups="account.group_account_user"/>
+                                    <field name="reconcile" on_change="onchange_reconcile(reconcile, amount, amount_unreconciled, context)" groups="account.group_account_user"/>
                                     <field name="amount" sum="Total Allocation" on_change="onchange_amount(amount, amount_unreconciled, context)" string="Allocation"/>
                                 </tree>
                             </field>

From c7f98142d573aa394d40e3172d1b1468d8990e38 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 5 Jun 2012 17:54:57 +0530
Subject: [PATCH 10/23] [IMP] account_voucher : Added OpenChatter Notification
 and highlighted the button.

bzr revid: mdi@tinyerp.com-20120605122457-pkbwld5kr04z9wl4
---
 addons/account_voucher/account_voucher.py     | 61 ++++++++++++++++++-
 .../account_voucher/account_voucher_view.xml  |  3 +
 .../voucher_payment_receipt_view.xml          |  8 ++-
 .../voucher_sales_purchase_view.xml           |  6 ++
 4 files changed, 76 insertions(+), 2 deletions(-)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 9ca30aed099..f361a1ac494 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -248,10 +248,41 @@ class account_voucher(osv.osv):
             res[voucher.id] =  voucher.amount / rate
         return res
 
+    # -----------------------------------------
+    # OpenChatter notifications and need_action
+    # -----------------------------------------
+
+    def _get_document_type(self, type):
+        type_dict = {
+            'sale': 'Sales Receipt',
+            'purchase': 'Purchase Receipt',
+            'payment': 'Supplier Payment',
+            'receipt': 'Customer Payment',
+        }
+        return type_dict.get(type, 'Voucher')
+
+    def create(self, cr, uid, vals, context=None):
+        res = super(account_voucher, self).create(cr, uid, vals, context)
+        self.create_send_note(cr, uid, [res], context=context)
+        return res
+
+    def create_send_note(self, cr, uid, ids, context=None):
+        for obj in self.browse(cr, uid, ids, context=context):
+            self.message_append_note(cr, uid, [obj.id],body=_("%s <b>created</b>.") % (self._get_document_type(obj.type)), context=context)
+
+    def posted_send_note(self, cr, uid, ids, context=None):
+        for obj in self.browse(cr, uid, ids, context=context):
+            self.message_append_note(cr, uid, [obj.id], body=_("%s <b>is posted</b>.") % (self._get_document_type(obj.type)), context=context)
+
+    def reconcile_send_note(self, cr, uid, ids, context=None):
+        for obj in self.browse(cr, uid, ids, context=context):
+            self.message_append_note(cr, uid, [obj.id], body=_("%s <b>is reconciled</b>.") % (self._get_document_type(obj.type)), context=context)
+
     _name = 'account.voucher'
     _description = 'Accounting Voucher'
     _order = "date desc, id desc"
 #    _rec_name = 'number'
+    _inherit = ['mail.thread']
     _columns = {
         'type':fields.selection([
             ('sale','Sale'),
@@ -556,7 +587,7 @@ class account_voucher(osv.osv):
         @return: Returns a dict which contains new values, and context
         """
         def _remove_noise_in_o2m():
-            """if the line is partially reconciled, then we must pay attention to display it only once and 
+            """if the line is partially reconciled, then we must pay attention to display it only once and
                 in the good o2m.
                 This function returns True if the line is considered as noise and should not be displayed
             """
@@ -780,6 +811,7 @@ class account_voucher(osv.osv):
 
     def proforma_voucher(self, cr, uid, ids, context=None):
         self.action_move_line_create(cr, uid, ids, context=context)
+        self.posted_send_note(cr, uid, ids, context=context)
         return {'type': 'ir.actions.act_window_close'}
 
     def action_cancel_draft(self, cr, uid, ids, context=None):
@@ -1521,4 +1553,31 @@ def resolve_o2m_operations(cr, uid, target_osv, operations, fields, context):
     return results
 
 
+class account_move_line(osv.osv):
+    _inherit = 'account.move.line'
+
+    def get_voucher_ids(self, cr, uid, ids, context=None):
+        voucher_obj = self.pool.get('account.voucher')
+        move_lines = self.browse(cr, uid, ids, context=context)
+        moves = []
+        for move in move_lines:
+            moves.append(move.move_id.id)
+
+        voucher_ids = voucher_obj.search(cr, uid, [('move_id', 'in', moves)], context=context)
+        return voucher_ids
+
+    def reconcile(self, cr, uid, ids, type='auto', writeoff_acc_id=False, writeoff_period_id=False, writeoff_journal_id=False, context=None):
+        voucher_obj = self.pool.get('account.voucher')
+        res = super(account_move_line, self).reconcile(cr, uid, ids, type=type, writeoff_acc_id=writeoff_acc_id, writeoff_period_id=writeoff_period_id, writeoff_journal_id=writeoff_journal_id, context=context)
+        voucher_ids = self.get_voucher_ids(cr, uid, ids, context=context)
+        voucher_obj.reconcile_send_note(cr, uid, voucher_ids, context=context)
+        return res
+
+    def reconcile_partial(self, cr, uid, ids, type='auto', context=None, writeoff_acc_id=False, writeoff_period_id=False, writeoff_journal_id=False):
+        voucher_obj = self.pool.get('account.voucher')
+        res = super(account_move_line, self).reconcile_partial(cr, uid, ids, type=type, context=context, writeoff_acc_id=writeoff_acc_id, writeoff_period_id=writeoff_period_id, writeoff_journal_id=writeoff_journal_id)
+        voucher_ids = self.get_voucher_ids(cr, uid, ids, context=context)
+        return res
+
+account_move_line()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index a1ff581006b..45dc77d6f65 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -112,6 +112,9 @@
                         </page>
                     </notebook>
                    </sheet>
+                   <div class="oe_form_sheet_width">
+                        <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
+                    </div>
                 </form>
             </field>
         </record>
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index f1013e1a9c3..1eb2a62133e 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -261,6 +261,9 @@
                         </page>
                     </notebook>
                     </sheet>
+                    <div class="oe_form_sheet_width">
+                        <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
+                    </div>
                 </form>
             </field>
         </record>
@@ -299,7 +302,7 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="proforma_voucher" string="Validate" states="draft" invisible="context.get('line_type', False)"/>
+                    <button name="proforma_voucher" string="Validate" states="draft" invisible="context.get('line_type', False)" class="oe_form_button_hi"/>
                     <button name="cancel_voucher" string="Cancel" states="draft,proforma"  invisible="context.get('line_type', False)"/>
                     <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" invisible="context.get('line_type', False)" confirm="Are you sure to unreconcile and cancel this record ?"/>
                     <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" invisible="context.get('line_type', False)"/>
@@ -418,6 +421,9 @@
                         </page>
                     </notebook>
                     </sheet>
+                    <div class="oe_form_sheet_width">
+                        <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
+                    </div>
                 </form>
             </field>
         </record>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index b3ba7c99cab..013dd50c91a 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -161,6 +161,9 @@
                         </page>
                     </notebook>
                     </sheet>
+                    <div class="oe_form_sheet_width">
+                        <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
+                    </div>
                 </form>
             </field>
         </record>
@@ -285,6 +288,9 @@
                         </page>
                     </notebook>
                     </sheet>
+                    <div class="oe_form_sheet_width">
+                        <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
+                    </div>
                 </form>
             </field>
         </record>

From 6aad1e0bbefe1c49ce6dbaf2e7365d6f36df6e32 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Wed, 6 Jun 2012 11:54:51 +0530
Subject: [PATCH 11/23] [IMP] account : Improved menu-tips of customer refund.

bzr revid: mdi@tinyerp.com-20120606062451-n96rju3rh976x1lx
---
 addons/account/account_invoice_view.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index f01cc6fd0d6..a8f728eeb33 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -489,7 +489,11 @@
             <field name="domain">[('type','=','out_refund')]</field>
             <field name="context">{'default_type':'out_refund', 'type':'out_refund', 'journal_type': 'sale_refund'}</field>
             <field name="search_view_id" ref="view_account_invoice_filter"/>
-            <field name="help">With Customer Refunds you can manage the credit notes for your customers. A refund is a document that credits an invoice completely or partially. You can easily generate refunds and reconcile them directly from the invoice form.</field>
+            <field name="help">
+                Click here to create a new customer refund.
+                &lt;p&gt;
+                A refund is a document that credits an invoice completely or partially. You can also generate refunds and reconcile them directly from the invoice form.
+            </field>
         </record>
 
         <record id="action_invoice_tree3_view1" model="ir.actions.act_window.view">

From c442f82a056fd511037f27aed94cfefc5957a1b1 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Wed, 6 Jun 2012 12:13:08 +0530
Subject: [PATCH 12/23] [IMP] account : Added group discount.

bzr revid: mdi@tinyerp.com-20120606064308-ah4n6sds11ctms05
---
 addons/account/account_invoice_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index a8f728eeb33..2172092583f 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -39,7 +39,7 @@
                     <field name="quantity"/>
                     <field name="uos_id" groups="product.group_uom"/>
                     <field name="price_unit"/>
-                    <field name="discount"/>
+                    <field name="discount" groups="sale.group_discount_per_so_line"/>
                     <field name="price_subtotal"/>
                 </tree>
             </field>
@@ -60,7 +60,7 @@
                     </group>
                     <field name="price_unit"/>
                     <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(product_id, parent.partner_id, parent.type, parent.fiscal_position,account_id)"/>
-                    <field name="discount"/>
+                    <field name="discount" groups="sale.group_discount_per_so_line"/>
                     <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
                     <field name="company_id" groups="base.group_multi_company" readonly="1"/>
                     <separator string="Notes" colspan="4"/>

From 74b251a733ce4710e10109aa49f2e66d1060f018 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Wed, 6 Jun 2012 12:33:31 +0530
Subject: [PATCH 13/23] [IMP] account : Added many2many tag on tax lines.

bzr revid: mdi@tinyerp.com-20120606070331-132s8sivnei67t41
---
 addons/account/account_invoice_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 2172092583f..03f85b0ca3e 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -298,7 +298,7 @@
                         <page string="Invoice">
                             <field colspan="4" name="invoice_line" nolabel="1" widget="one2many_list" context="{'type': type}"/>
                             <group col="1" colspan="2">
-                                <field name="tax_line" nolabel="1">
+                                <field name="tax_line" nolabel="1" widget="many2many_tags">
                                     <tree editable="bottom" string="Taxes">
                                         <field name="name"/>
                                         <field name="account_id" groups="account.group_account_user"/>

From 446647a785b408819eda20ce69e35b5a0b45f6a4 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Wed, 6 Jun 2012 14:37:29 +0530
Subject: [PATCH 14/23] [IMP] account : Improved menu-tips of sales receipt and
 highlighted the button.

bzr revid: mdi@tinyerp.com-20120606090729-unzey3c9qiocjtf1
---
 addons/account_voucher/account_voucher_pay_invoice.xml | 8 +++++---
 addons/account_voucher/voucher_sales_purchase_view.xml | 6 +++++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/addons/account_voucher/account_voucher_pay_invoice.xml b/addons/account_voucher/account_voucher_pay_invoice.xml
index 41d21c4bf38..bd7654b2277 100644
--- a/addons/account_voucher/account_voucher_pay_invoice.xml
+++ b/addons/account_voucher/account_voucher_pay_invoice.xml
@@ -7,9 +7,11 @@
            <field name="type">form</field>
            <field name="inherit_id" ref="account.invoice_form"/>
            <field name="arch" type="xml">
-           <button name="invoice_open" position="after">
-               <button name="invoice_pay_customer" type="object" string="Register Payment"/>
-           </button>
+           <xpath expr="//button[@name='invoice_open']" position="after">
+               <div>
+               <button name="invoice_pay_customer" type="object" string="Register Payment" states="open" icon="gtk-go-forward" class="oe_form_button_hi"/>
+               </div>
+           </xpath>
            </field>
         </record>
         <record id="view_invoice_supplier" model="ir.ui.view">
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 013dd50c91a..776b6f55097 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -178,7 +178,11 @@
             <field name="view_id" eval="False"/>
             <field name="search_view_id" ref="view_voucher_filter_sale"/>
             <field name="target">current</field>
-            <field name="help">When you sell products to a customer, you can give him a sales receipt or an invoice. When the sales receipt is confirmed, it creates journal items automatically and you can record the customer payment related to this sales receipt.</field>
+            <field name="help">
+                Click here to create a sale receipt.
+                &lt;p&gt;
+                When the sales receipt is confirmed, you can record the customer payment related to this sales receipt.
+            </field>
         </record>
         <record id="action_sale_receipt_tree" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>

From 2c8df77f1f0875505f1ec33c78c9dd3442cc0c00 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Wed, 6 Jun 2012 14:39:26 +0530
Subject: [PATCH 15/23] [IMP] account_voucher : removed the icon from a button.

bzr revid: mdi@tinyerp.com-20120606090926-s6wupsqyobp2wfff
---
 addons/account_voucher/account_voucher_pay_invoice.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account_voucher/account_voucher_pay_invoice.xml b/addons/account_voucher/account_voucher_pay_invoice.xml
index bd7654b2277..f289ab5ae41 100644
--- a/addons/account_voucher/account_voucher_pay_invoice.xml
+++ b/addons/account_voucher/account_voucher_pay_invoice.xml
@@ -9,7 +9,7 @@
            <field name="arch" type="xml">
            <xpath expr="//button[@name='invoice_open']" position="after">
                <div>
-               <button name="invoice_pay_customer" type="object" string="Register Payment" states="open" icon="gtk-go-forward" class="oe_form_button_hi"/>
+               <button name="invoice_pay_customer" type="object" string="Register Payment" states="open" class="oe_form_button_hi"/>
                </div>
            </xpath>
            </field>

From b5b392274c6329637348f4ad4e54b8e7625214d5 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Wed, 6 Jun 2012 15:08:47 +0530
Subject: [PATCH 16/23] [IMP] account_voucher : Added a group and highlighted
 the buttons.

bzr revid: mdi@tinyerp.com-20120606093847-zv2jvmvla2uemuyi
---
 addons/account_voucher/account_voucher.py              | 2 +-
 addons/account_voucher/voucher_sales_purchase_view.xml | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index f361a1ac494..1f5a4f29653 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -354,7 +354,7 @@ class account_voucher(osv.osv):
         'amount': _get_amount,
         'type':_get_type,
         'state': 'draft',
-        'pay_now': 'pay_later',
+        'pay_now': 'pay_now',
         'name': '',
         'date': lambda *a: time.strftime('%Y-%m-%d'),
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.voucher',context=c),
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 776b6f55097..e4d51bb7a7e 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -82,8 +82,8 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="proforma_voucher" string="Validate" states="draft"/>
-                    <button name="%(act_pay_voucher)d" context="{'narration':narration, 'title':'Customer Payment', 'type':'receipt', 'partner_id':partner_id, 'reference':reference, 'amount':amount}" type="action" string="Pay" attrs="{'invisible':['|',('pay_now','=','pay_now'),'|',('state','=','draft'), ('paid','=',True)]}"/>
+                    <button name="proforma_voucher" string="Validate" states="draft" class="oe_form_button_hi"/>
+                    <button name="%(act_pay_voucher)d" context="{'narration':narration, 'title':'Customer Payment', 'type':'receipt', 'partner_id':partner_id, 'reference':reference, 'amount':amount}" type="action" string="Pay" attrs="{'invisible':['|',('pay_now','=','pay_now'),'|',('state','=','draft'), ('paid','=',True)]}" class="oe_form_button_hi"/>
                     <button name="cancel_voucher" string="Cancel" states="draft,proforma" />
                     <button name="cancel_voucher" string="Cancel" type="object" states="posted" confirm="Are you sure to confirm this record ?"/>
                     <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft"/>
@@ -96,7 +96,7 @@
                     <group col="6" colspan="4" class="oe_form_header">
                         <field name="partner_id" domain="[('customer','=',True)]" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Customer" context="{'search_default_customer': 1}"/>
                         <field name="date" on_change="onchange_date(date, currency_id, currency_id, amount, company_id, context)"/>
-                        <field name="journal_id" domain="[('type','in',['sale','sale_refund'])]" widget="selection" on_change="onchange_journal(journal_id, line_cr_ids, tax_id, partner_id, date, amount, type, company_id, context)"/>
+                        <field name="journal_id" domain="[('type','in',['sale','sale_refund'])]" widget="selection" on_change="onchange_journal(journal_id, line_cr_ids, tax_id, partner_id, date, amount, type, company_id, context)" groups="account.group_account_user"/>
                         <field name="number"/>
                         <field name="name" colspan="2"/>
                         <field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
@@ -107,7 +107,7 @@
                         <page string="Sales Information">
                             <field name="line_cr_ids" on_change="onchange_price(line_cr_ids, tax_id, partner_id)" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" colspan="4" nolabel="1" height="180">
                                 <tree string="Sales Lines" editable="bottom">
-                                    <field name="account_id" domain="[('user_type.report_type','=','income'),('type','!=','view')]" widget="selection"/>
+                                    <field name="account_id" domain="[('user_type.report_type','=','income'),('type','!=','view')]" widget="selection" groups="account.group_account_user"/>
                                     <field name="name"/>
                                     <field name="amount" sum="Total"/>
                                     <field name="account_analytic_id" groups="analytic.group_analytic_accounting"/>

From 4a25363d5ffbccf4ba6dbdcefa0f310414c6af2a Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Wed, 6 Jun 2012 18:23:45 +0530
Subject: [PATCH 17/23] [IMP] account_voucher : Improved OpenChatter
 Notification.

bzr revid: mdi@tinyerp.com-20120606125345-ctvo174ffkiqpoy2
---
 addons/account_voucher/account_voucher.py | 40 ++++-------------------
 1 file changed, 7 insertions(+), 33 deletions(-)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 1f5a4f29653..3fa83c5eec6 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -270,13 +270,9 @@ class account_voucher(osv.osv):
         for obj in self.browse(cr, uid, ids, context=context):
             self.message_append_note(cr, uid, [obj.id],body=_("%s <b>created</b>.") % (self._get_document_type(obj.type)), context=context)
 
-    def posted_send_note(self, cr, uid, ids, context=None):
-        for obj in self.browse(cr, uid, ids, context=context):
-            self.message_append_note(cr, uid, [obj.id], body=_("%s <b>is posted</b>.") % (self._get_document_type(obj.type)), context=context)
-
     def reconcile_send_note(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
-            self.message_append_note(cr, uid, [obj.id], body=_("%s <b>is reconciled</b>.") % (self._get_document_type(obj.type)), context=context)
+            self.message_append_note(cr, uid, [obj.id], body=_("%s is <b>reconciled</b>.") % (self._get_document_type(obj.type)), context=context)
 
     _name = 'account.voucher'
     _description = 'Accounting Voucher'
@@ -1281,12 +1277,17 @@ class account_voucher(osv.osv):
                 'state': 'posted',
                 'number': name,
             })
+            message = _("%s '%s' is <b>posted</b>.") % (self._get_document_type(voucher.type), name)
+            self.message_append_note(cr, uid, [voucher.id], body=message, context=context)
             if voucher.journal_id.entry_posted:
                 move_pool.post(cr, uid, [move_id], context={})
             # We automatically reconcile the account move lines.
+            reconcile = False
             for rec_ids in rec_list_ids:
                 if len(rec_ids) >= 2:
-                    move_line_pool.reconcile_partial(cr, uid, rec_ids, writeoff_acc_id=voucher.writeoff_acc_id.id, writeoff_period_id=voucher.period_id.id, writeoff_journal_id=voucher.journal_id.id)
+                    reconcile = move_line_pool.reconcile_partial(cr, uid, rec_ids, writeoff_acc_id=voucher.writeoff_acc_id.id, writeoff_period_id=voucher.period_id.id, writeoff_journal_id=voucher.journal_id.id)
+                if reconcile:
+                    self.reconcile_send_note(cr, uid, [voucher.id], context=context)
         return True
 
     def copy(self, cr, uid, id, default={}, context=None):
@@ -1553,31 +1554,4 @@ def resolve_o2m_operations(cr, uid, target_osv, operations, fields, context):
     return results
 
 
-class account_move_line(osv.osv):
-    _inherit = 'account.move.line'
-
-    def get_voucher_ids(self, cr, uid, ids, context=None):
-        voucher_obj = self.pool.get('account.voucher')
-        move_lines = self.browse(cr, uid, ids, context=context)
-        moves = []
-        for move in move_lines:
-            moves.append(move.move_id.id)
-
-        voucher_ids = voucher_obj.search(cr, uid, [('move_id', 'in', moves)], context=context)
-        return voucher_ids
-
-    def reconcile(self, cr, uid, ids, type='auto', writeoff_acc_id=False, writeoff_period_id=False, writeoff_journal_id=False, context=None):
-        voucher_obj = self.pool.get('account.voucher')
-        res = super(account_move_line, self).reconcile(cr, uid, ids, type=type, writeoff_acc_id=writeoff_acc_id, writeoff_period_id=writeoff_period_id, writeoff_journal_id=writeoff_journal_id, context=context)
-        voucher_ids = self.get_voucher_ids(cr, uid, ids, context=context)
-        voucher_obj.reconcile_send_note(cr, uid, voucher_ids, context=context)
-        return res
-
-    def reconcile_partial(self, cr, uid, ids, type='auto', context=None, writeoff_acc_id=False, writeoff_period_id=False, writeoff_journal_id=False):
-        voucher_obj = self.pool.get('account.voucher')
-        res = super(account_move_line, self).reconcile_partial(cr, uid, ids, type=type, context=context, writeoff_acc_id=writeoff_acc_id, writeoff_period_id=writeoff_period_id, writeoff_journal_id=writeoff_journal_id)
-        voucher_ids = self.get_voucher_ids(cr, uid, ids, context=context)
-        return res
-
-account_move_line()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 3c7740fd4bd51c50ce39d4ead90bc07eb62f0950 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Thu, 7 Jun 2012 10:28:19 +0530
Subject: [PATCH 18/23] [IMP] account_voucher : Improved the code.

bzr revid: mdi@tinyerp.com-20120607045819-aj6y5ps6tq7khkvf
---
 addons/account_voucher/account_voucher.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 3fa83c5eec6..11842c91296 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -262,13 +262,13 @@ class account_voucher(osv.osv):
         return type_dict.get(type, 'Voucher')
 
     def create(self, cr, uid, vals, context=None):
-        res = super(account_voucher, self).create(cr, uid, vals, context)
+        res = super(account_voucher, self).create(cr, uid, vals, context=context)
         self.create_send_note(cr, uid, [res], context=context)
         return res
 
     def create_send_note(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
-            self.message_append_note(cr, uid, [obj.id],body=_("%s <b>created</b>.") % (self._get_document_type(obj.type)), context=context)
+            self.message_append_note(cr, uid, [obj.id], body=_("%s <b>created</b>.") % (self._get_document_type(obj.type)), context=context)
 
     def reconcile_send_note(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
@@ -807,7 +807,6 @@ class account_voucher(osv.osv):
 
     def proforma_voucher(self, cr, uid, ids, context=None):
         self.action_move_line_create(cr, uid, ids, context=context)
-        self.posted_send_note(cr, uid, ids, context=context)
         return {'type': 'ir.actions.act_window_close'}
 
     def action_cancel_draft(self, cr, uid, ids, context=None):

From 31d1cd4587131107454dc1c409a3d631c9d70fbe Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Thu, 7 Jun 2012 11:18:26 +0530
Subject: [PATCH 19/23] [IMP] account_voucher : Register payment should be red 
 when invoice is sent.

bzr revid: mdi@tinyerp.com-20120607054826-b001z50izgskxkty
---
 addons/account_voucher/account_voucher_pay_invoice.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/account_voucher/account_voucher_pay_invoice.xml b/addons/account_voucher/account_voucher_pay_invoice.xml
index f289ab5ae41..49fbc444a91 100644
--- a/addons/account_voucher/account_voucher_pay_invoice.xml
+++ b/addons/account_voucher/account_voucher_pay_invoice.xml
@@ -9,7 +9,8 @@
            <field name="arch" type="xml">
            <xpath expr="//button[@name='invoice_open']" position="after">
                <div>
-               <button name="invoice_pay_customer" type="object" string="Register Payment" states="open" class="oe_form_button_hi"/>
+               <button name="invoice_pay_customer" type="object" string="Register Payment" attrs="{'invisible':['|',('sent','=',True), ('state', '!=', 'open')]}"/>
+               <button name="invoice_pay_customer" type="object" string="Register Payment" attrs="{'invisible':['|',('sent','=',False), ('state', '!=', 'open')]}" class="oe_form_button_hi"/>
                </div>
            </xpath>
            </field>

From d639e9e7fb8e4721f3a9c094758105ec92165efa Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Thu, 7 Jun 2012 17:09:34 +0530
Subject: [PATCH 20/23] [IMP] account_voucher : Improved the code.

bzr revid: mdi@tinyerp.com-20120607113934-jllzdcjjg53f4f05
---
 addons/account_voucher/account_voucher.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 11842c91296..e30819ef322 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -259,7 +259,7 @@ class account_voucher(osv.osv):
             'payment': 'Supplier Payment',
             'receipt': 'Customer Payment',
         }
-        return type_dict.get(type, 'Voucher')
+        return type_dict.get(type, 'Payment')
 
     def create(self, cr, uid, vals, context=None):
         res = super(account_voucher, self).create(cr, uid, vals, context=context)

From c2858548bc52860228bd2e3bf647b4514538c3fb Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 11 Jun 2012 16:45:06 +0530
Subject: [PATCH 21/23] [IMP] account : Added m2m tag to tax field.

bzr revid: mdi@tinyerp.com-20120611111506-2g6kb7x2vka142dg
---
 addons/account/account_invoice_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 41b4bc6f2a6..1092d2950a8 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -292,7 +292,7 @@
                         <page string="Invoice">
                             <field colspan="4" name="invoice_line" nolabel="1" widget="one2many_list" context="{'type': type}"/>
                             <group col="1" colspan="2">
-                                <field name="tax_line" nolabel="1" widget="many2many_tags">
+                                <field name="tax_line" nolabel="1">
                                     <tree editable="bottom" string="Taxes">
                                         <field name="name"/>
                                         <field name="account_id" groups="account.group_account_user"/>
@@ -311,7 +311,7 @@
                                 </group>
                                 <field name="amount_untaxed"/>
                                 <label string="" colspan="2"/>
-                                <field name="amount_tax"/>
+                                <field name="amount_tax" widget="many2many_tags"/>
                                 <field name="reconciled" groups="base.group_no_one"/>
                                 <field name="amount_total"/>
                                 <field name="residual" groups="account.group_account_user"/>

From 79a37f3932bf893c0ddef2d924f8049474438af1 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 11 Jun 2012 16:52:54 +0530
Subject: [PATCH 22/23] [IMP] account : Added a group to account field.

bzr revid: mdi@tinyerp.com-20120611112254-migg5aojfv6tgcfh
---
 addons/account/account_invoice_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 1092d2950a8..d98c99873ae 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -95,7 +95,7 @@
                 <form string="Manual Invoice Taxes">
                     <field name="name"/>
                     <field name="sequence"/>
-                    <field name="account_id"/>
+                    <field name="account_id" groups="account.group_account_user"/>
                     <field name="manual"/>
                     <field name="amount"/>
                     <field name="base" readonly="0"/>

From 53db6d3822b1e1f70cea07a762f47261d056fa3d Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 12 Jun 2012 18:26:38 +0530
Subject: [PATCH 23/23] [IMP] account_voucher : Removed OpenChatter
 Notification.

bzr revid: mdi@tinyerp.com-20120612125638-4bw5ymq3ptgz9z8u
---
 addons/account_voucher/account_voucher.py | 34 +----------------------
 1 file changed, 1 insertion(+), 33 deletions(-)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index e30819ef322..2cbae6d4b3d 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -248,37 +248,10 @@ class account_voucher(osv.osv):
             res[voucher.id] =  voucher.amount / rate
         return res
 
-    # -----------------------------------------
-    # OpenChatter notifications and need_action
-    # -----------------------------------------
-
-    def _get_document_type(self, type):
-        type_dict = {
-            'sale': 'Sales Receipt',
-            'purchase': 'Purchase Receipt',
-            'payment': 'Supplier Payment',
-            'receipt': 'Customer Payment',
-        }
-        return type_dict.get(type, 'Payment')
-
-    def create(self, cr, uid, vals, context=None):
-        res = super(account_voucher, self).create(cr, uid, vals, context=context)
-        self.create_send_note(cr, uid, [res], context=context)
-        return res
-
-    def create_send_note(self, cr, uid, ids, context=None):
-        for obj in self.browse(cr, uid, ids, context=context):
-            self.message_append_note(cr, uid, [obj.id], body=_("%s <b>created</b>.") % (self._get_document_type(obj.type)), context=context)
-
-    def reconcile_send_note(self, cr, uid, ids, context=None):
-        for obj in self.browse(cr, uid, ids, context=context):
-            self.message_append_note(cr, uid, [obj.id], body=_("%s is <b>reconciled</b>.") % (self._get_document_type(obj.type)), context=context)
-
     _name = 'account.voucher'
     _description = 'Accounting Voucher'
     _order = "date desc, id desc"
 #    _rec_name = 'number'
-    _inherit = ['mail.thread']
     _columns = {
         'type':fields.selection([
             ('sale','Sale'),
@@ -1276,17 +1249,12 @@ class account_voucher(osv.osv):
                 'state': 'posted',
                 'number': name,
             })
-            message = _("%s '%s' is <b>posted</b>.") % (self._get_document_type(voucher.type), name)
-            self.message_append_note(cr, uid, [voucher.id], body=message, context=context)
             if voucher.journal_id.entry_posted:
                 move_pool.post(cr, uid, [move_id], context={})
             # We automatically reconcile the account move lines.
-            reconcile = False
             for rec_ids in rec_list_ids:
                 if len(rec_ids) >= 2:
-                    reconcile = move_line_pool.reconcile_partial(cr, uid, rec_ids, writeoff_acc_id=voucher.writeoff_acc_id.id, writeoff_period_id=voucher.period_id.id, writeoff_journal_id=voucher.journal_id.id)
-                if reconcile:
-                    self.reconcile_send_note(cr, uid, [voucher.id], context=context)
+                    move_line_pool.reconcile_partial(cr, uid, rec_ids, writeoff_acc_id=voucher.writeoff_acc_id.id, writeoff_period_id=voucher.period_id.id, writeoff_journal_id=voucher.journal_id.id)
         return True
 
     def copy(self, cr, uid, id, default={}, context=None):