From af79a385b67fcdad356bff59149ed23183e5f776 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Mon, 10 Dec 2012 12:39:35 +0530
Subject: [PATCH 1/9] [IMP] Improved code for Notifications: move Notifications
 menuitem below Emails.

bzr revid: psa@tinyerp.com-20121210070935-iulu3a3yfh7000r7
---
 addons/mail/mail_followers_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/mail/mail_followers_view.xml b/addons/mail/mail_followers_view.xml
index a9d1d80240b..515be85132a 100644
--- a/addons/mail/mail_followers_view.xml
+++ b/addons/mail/mail_followers_view.xml
@@ -66,11 +66,11 @@
 
         <!-- Add followers related menu entries in Settings/Email -->
         <menuitem name="Followers" id="menu_email_followers" parent="base.menu_email"
-                    action="action_view_followers" sequence="30" groups="base.group_no_one"/> -->
+                    action="action_view_followers" sequence="30" groups="base.group_no_one"/>
         
         <!-- Add notifications related menu entry in Settings/Email -->
         <menuitem name="Notifications" id="menu_email_notifications" parent="base.menu_email"
-                    action="action_view_notifications" sequence="35" groups="base.group_no_one"/>
+                    action="action_view_notifications" sequence="13" groups="base.group_no_one"/>
 
     </data>
 </openerp>

From e9f3f51807bfae723925f937b6d9dbd6e2b36934 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Mon, 10 Dec 2012 17:18:05 +0530
Subject: [PATCH 2/9] [IMP] Improved code for Human Resources > Appraisal >
 Appraisals: when Appraisal is done, make employee/date/Appraisal Forms and
 plan fields readonly.

bzr revid: psa@tinyerp.com-20121210114805-3ba1ix0sta3bej6c
---
 addons/hr_evaluation/hr_evaluation_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 82ef2aa83f4..8c9823bad08 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -165,9 +165,9 @@
                 </header>
                 <sheet>
                     <label for="employee_id" class="oe_edit_only"/>
-                    <h1><field name="employee_id" on_change="onchange_employee_id(employee_id)" class="oe_inline"/>, <field name="date" class="oe_inline"/></h1>
+                    <h1><field name="employee_id" attrs="{'readonly': [('state', '=', 'done')]}" on_change="onchange_employee_id(employee_id)" class="oe_inline"/>, <field name="date" class="oe_inline"/></h1>
                     <label for="plan_id" class="oe_edit_only"/>
-                    <h2><field name="plan_id"/></h2>
+                    <h2><field name="plan_id" attrs="{'readonly': [('state', '=', 'done')]}"/></h2>
                     <group>
                         <group colspan="4" attrs="{'invisible':['|', ('state','=','draft'), ('state', '=', 'wait')]}">
                             <field name="rating" attrs="{'readonly':[('state','&lt;&gt;','progress')]}"/>
@@ -175,7 +175,7 @@
                         </group>
                     </group>
                     <group string="Appraisal Forms" attrs="{'invisible':[('state','=','draft')]}">
-                        <field nolabel="1" name="survey_request_ids">
+                        <field nolabel="1" name="survey_request_ids" attrs="{'readonly': [('state', '=', 'done')]}">
                             <form string="Interview Appraisal" version="7.0">
                                 <div class="oe_right oe_button_box">
                                     <button name="%(survey.action_view_survey_question_message)d" string="Answer Survey" type="action" states="waiting_answer" icon="gtk-execute" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response,'request' : True, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}" attrs="{'readonly':[('survey_id','=',False)]}"/>

From 5e143056c25fc317c14ea57064101c0398098a82 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Mon, 10 Dec 2012 17:29:55 +0530
Subject: [PATCH 3/9] [IMP] Added attrs for DATE.

bzr revid: psa@tinyerp.com-20121210115955-cqgqf86thn5135g4
---
 addons/hr_evaluation/hr_evaluation_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 8c9823bad08..902be8e911f 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -165,7 +165,7 @@
                 </header>
                 <sheet>
                     <label for="employee_id" class="oe_edit_only"/>
-                    <h1><field name="employee_id" attrs="{'readonly': [('state', '=', 'done')]}" on_change="onchange_employee_id(employee_id)" class="oe_inline"/>, <field name="date" class="oe_inline"/></h1>
+                    <h1><field name="employee_id" attrs="{'readonly': [('state', '=', 'done')]}" on_change="onchange_employee_id(employee_id)" class="oe_inline"/>, <field name="date" class="oe_inline" attrs="{'readonly': [('state', '=', 'done')]}"/></h1>
                     <label for="plan_id" class="oe_edit_only"/>
                     <h2><field name="plan_id" attrs="{'readonly': [('state', '=', 'done')]}"/></h2>
                     <group>

From d81701a93d8a7dcb829d0fe156047aec02c12c6f Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Mon, 10 Dec 2012 17:43:02 +0530
Subject: [PATCH 4/9] [IMP] Improved for Notifications : Add a Date column to
 the left of Contact field.

bzr revid: psa@tinyerp.com-20121210121302-qngfi4ozi3btummz
---
 addons/mail/mail_followers.py       | 2 ++
 addons/mail/mail_followers_view.xml | 1 +
 2 files changed, 3 insertions(+)

diff --git a/addons/mail/mail_followers.py b/addons/mail/mail_followers.py
index 8d3876ec91f..a40e96ad78f 100644
--- a/addons/mail/mail_followers.py
+++ b/addons/mail/mail_followers.py
@@ -63,12 +63,14 @@ class mail_notification(osv.Model):
         'partner_id': fields.many2one('res.partner', string='Contact',
                         ondelete='cascade', required=True, select=1),
         'read': fields.boolean('Read', select=1),
+        'date': fields.date('Date'),
         'message_id': fields.many2one('mail.message', string='Message',
                         ondelete='cascade', required=True, select=1),
     }
 
     _defaults = {
         'read': False,
+        'date': lambda *a: fields.datetime.now(),
     }
 
     def init(self, cr):
diff --git a/addons/mail/mail_followers_view.xml b/addons/mail/mail_followers_view.xml
index 515be85132a..ff4a3fa649d 100644
--- a/addons/mail/mail_followers_view.xml
+++ b/addons/mail/mail_followers_view.xml
@@ -44,6 +44,7 @@
             <field name="priority">10</field>
             <field name="arch" type="xml">
                 <tree string="Notifications">
+                    <field name="date"/>
                     <field name="partner_id"/>
                     <field name="message_id"/>
                 </tree>

From 7d90b73d5274a13616935739cb7757907fcf23c7 Mon Sep 17 00:00:00 2001
From: Vishmita <vja@tinyerp.com>
Date: Tue, 11 Dec 2012 10:45:31 +0530
Subject: [PATCH 5/9] [FIX]Change tooltip sentence

bzr revid: vja@tinyerp.com-20121211051531-6luv78i10sp50x2v
---
 addons/sale/sale.py                             | 2 +-
 addons/sale/wizard/sale_make_invoice_advance.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 8bab265ae3b..7f48901eba4 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -716,7 +716,7 @@ class sale_order_line(osv.osv):
         'order_id': fields.many2one('sale.order', 'Order Reference', required=True, ondelete='cascade', select=True, readonly=True, states={'draft':[('readonly',False)]}),
         'name': fields.text('Description', size=256, required=True, select=True, readonly=True, states={'draft': [('readonly', False)]}),
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of sales order lines."),
-        'product_id': fields.many2one('product.product', 'Product', domain=[('sale_ok', '=', True)], change_default=True),
+        'product_id': fields.many2one('product.product', 'Product', domain=[('sale_ok', '=', True)], change_default=True, readonly=True, states={'draft': [('readonly', False)]}),
         'invoice_lines': fields.many2many('account.invoice.line', 'sale_order_line_invoice_rel', 'order_line_id', 'invoice_id', 'Invoice Lines', readonly=True),
         'invoiced': fields.function(_fnct_line_invoiced, string='Invoiced', type='boolean',
             store={'account.invoice': (_order_lines_from_invoice, ['state'], 10)}),
diff --git a/addons/sale/wizard/sale_make_invoice_advance.py b/addons/sale/wizard/sale_make_invoice_advance.py
index 0fa4cd52cf2..55c6800ab07 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.py
+++ b/addons/sale/wizard/sale_make_invoice_advance.py
@@ -31,7 +31,7 @@ class sale_advance_payment_inv(osv.osv_memory):
             [('all', 'Invoice the whole sale order'), ('percentage','Percentage'), ('fixed','Fixed price (deposit)'),
                 ('lines', 'Some order lines')],
             'What do you want to invoice?', required=True,
-            help="""Use All to create the final invoice.
+            help="""Use Invoice the whole sale order to create the final invoice.
                 Use Percentage to invoice a percentage of the total amount.
                 Use Fixed Price to invoice a specific amound in advance.
                 Use Some Order Lines to invoice a selection of the sale order lines."""),

From 55d9f6851f6b3e4485a1fb3ddbbf10a29f1004a9 Mon Sep 17 00:00:00 2001
From: Vishmita <vja@tinyerp.com>
Date: Tue, 11 Dec 2012 12:30:17 +0530
Subject: [PATCH 6/9] [Fix]empty list message is not formatted correctly in
 reordering rules

bzr revid: vja@tinyerp.com-20121211070017-nk5eg2kllhdj9qel
---
 addons/procurement/procurement_view.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index a0d51c87713..6636aed0840 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -261,7 +261,12 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="view_warehouse_orderpoint_tree"/>
             <field name="search_view_id" ref="warehouse_orderpoint_search" />
-            <field name="help">You can define your minimum stock rules, so that OpenERP will automatically create draft manufacturing orders or purchase quotations according to the stock level. Once the virtual stock of a product (= stock on hand minus all confirmed orders and reservations) is below the minimum quantity, OpenERP will generate a procurement request to increase the stock up to the maximum quantity.</field>
+            <field name="help" type="html">
+              <p class="oe_view_nocontent_create">
+                You can define your minimum stock rules,so that OpenERP will automatically create draft manufacturing orders or purchase quotations according to the stock level. 
+                Once the virtual stock of a product (= stock on hand minus all confirmed orders and reservations) is below the minimum quantity,OpenERP will generate a procurement request to increase the stock up to the maximum quantity.
+              </p>
+            </field>
         </record>
 
         <act_window

From 59265a5f4a0c4705ca66cd2d48ec66e7b015c67a Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Tue, 11 Dec 2012 15:59:55 +0530
Subject: [PATCH 7/9] [IMP] Improved code for Invoice payment: after
 registering payment, the 'Customer Payment' takes as its name the 'amount'
 field. It should take the 'number' field instead (something similar to
 BNK2/2012/0001 if it's a bank payment) The same name should also appear in
 the breadcrumb.

bzr revid: psa@tinyerp.com-20121211102955-yx9eok9q6tdt7ne6
---
 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 ffc7cf1769d..d171dd27319 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -165,7 +165,7 @@ class account_voucher(osv.osv):
         if not ids:
             return []
         if context is None: context = {}
-        return [(r['id'], (str("%.2f" % r['amount']) or '')) for r in self.read(cr, uid, ids, ['amount'], context, load='_classic_write')]
+        return [(r['id'], (r['number']) or '') for r in self.read(cr, uid, ids, ['number'], context, load='_classic_write')]
 
     def fields_view_get(self, cr, uid, view_id=None, view_type=False, context=None, toolbar=False, submenu=False):
         mod_obj = self.pool.get('ir.model.data')

From 6fe6d919caa79782a708db310041d57b226fcae0 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Mon, 17 Dec 2012 19:10:04 +0530
Subject: [PATCH 8/9] [IMP] Improved code for the warehouse move for the
 component procurement ('internal picking') subtype returns 'False' in the
 header => 'False.  Internal picking has been created' the Reference field of
 the internal move is taking the 'False' value.

bzr revid: psa@tinyerp.com-20121217134004-c7fium8o26f6nisq
---
 addons/stock/stock_sequence.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/stock/stock_sequence.xml b/addons/stock/stock_sequence.xml
index c3569c48c3e..6c0b3e84cf2 100644
--- a/addons/stock/stock_sequence.xml
+++ b/addons/stock/stock_sequence.xml
@@ -17,7 +17,7 @@
         
         <record id="seq_type_picking_internal" model="ir.sequence.type">
             <field name="name">Picking INT</field>
-            <field name="code">stock.picking</field>
+            <field name="code">stock.picking.internal</field>
         </record>
 
         <!--
@@ -42,7 +42,7 @@
         
         <record id="seq_picking_internal" model="ir.sequence">
             <field name="name">Picking INT</field>
-            <field name="code">stock.picking</field>
+            <field name="code">stock.picking.internal</field>
             <field name="prefix">INT/</field>
             <field name="padding">5</field>
             <field name="company_id" eval="False"/>

From 201b811f835b7e4517202cd0b93b185b8697e555 Mon Sep 17 00:00:00 2001
From: "Jignesh Rathod (OpenERP)" <jir@tinyerp.com>
Date: Thu, 30 May 2013 15:43:54 +0530
Subject: [PATCH 9/9] [IMP] Change code as per suggestion.

bzr revid: jir@tinyerp.com-20130530101354-ph1mbhhsa2itmz51
---
 addons/account_voucher/account_voucher.py | 2 +-
 addons/stock/stock_sequence.xml           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index f711fa51982..850162ccf84 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -189,7 +189,7 @@ class account_voucher(osv.osv):
         if not ids:
             return []
         if context is None: context = {}
-        return [(r['id'], (r['number']) or '') for r in self.read(cr, uid, ids, ['number'], context, load='_classic_write')]
+        return [(r['id'], (str("%.2f" % r['amount']) or '')) for r in self.read(cr, uid, ids, ['amount'], context, load='_classic_write')]
 
     def fields_view_get(self, cr, uid, view_id=None, view_type=False, context=None, toolbar=False, submenu=False):
         mod_obj = self.pool.get('ir.model.data')
diff --git a/addons/stock/stock_sequence.xml b/addons/stock/stock_sequence.xml
index 6c0b3e84cf2..c3569c48c3e 100644
--- a/addons/stock/stock_sequence.xml
+++ b/addons/stock/stock_sequence.xml
@@ -17,7 +17,7 @@
         
         <record id="seq_type_picking_internal" model="ir.sequence.type">
             <field name="name">Picking INT</field>
-            <field name="code">stock.picking.internal</field>
+            <field name="code">stock.picking</field>
         </record>
 
         <!--
@@ -42,7 +42,7 @@
         
         <record id="seq_picking_internal" model="ir.sequence">
             <field name="name">Picking INT</field>
-            <field name="code">stock.picking.internal</field>
+            <field name="code">stock.picking</field>
             <field name="prefix">INT/</field>
             <field name="padding">5</field>
             <field name="company_id" eval="False"/>