From ee941671d2c391d085f153f6496bc755a900813d Mon Sep 17 00:00:00 2001
From: "Amit Bhavsar (Open ERP)" <amb@tinyerp.com>
Date: Thu, 19 Jul 2012 14:15:42 +0530
Subject: [PATCH 01/94] [FIX] account : Improve the code.

lp bug: https://launchpad.net/bugs/1026434 fixed

bzr revid: amb@tinyerp.com-20120719084542-la8jx5qxiefwoojr
---
 addons/account/wizard/account_move_journal.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/wizard/account_move_journal.py b/addons/account/wizard/account_move_journal.py
index 66f634bd59f..a84c7f8eabb 100644
--- a/addons/account/wizard/account_move_journal.py
+++ b/addons/account/wizard/account_move_journal.py
@@ -99,7 +99,7 @@ class account_move_journal(osv.osv_memory):
     
             period = False
             if period_id:
-                period = period_pool.browse(cr, uid, [period_id], ['name'])[0]['name']
+                period = period_pool.browse(cr, uid, [period_id], context=None)[0]['name']
                 period_string = _("Period: %s") % tools.ustr(period)
     
             open_string = _("Open")

From 5c31f52c47c8205703a4da666a01916f9971b522 Mon Sep 17 00:00:00 2001
From: "Cristian Salamea (Gnuthink)" <>
Date: Thu, 19 Jul 2012 17:49:45 +0530
Subject: [PATCH 02/94] [FIX]l10n_ec: Change The name of Author

lp bug: https://launchpad.net/bugs/1026085 fixed

bzr revid: dsi@tinyerp.com-20120719121945-nmad9m98t3q77tet
---
 addons/l10n_ec/__openerp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/l10n_ec/__openerp__.py b/addons/l10n_ec/__openerp__.py
index 9dd81606036..13d11f03b9d 100644
--- a/addons/l10n_ec/__openerp__.py
+++ b/addons/l10n_ec/__openerp__.py
@@ -27,7 +27,7 @@ This is the base module to manage the accounting chart for Ecuador in OpenERP.
 
 Accounting chart and localization for Ecuador.
     """,
-    'author': 'OpenERP SA',
+    'author': 'Gnuthink Co.Ltd.',
     'depends': [
                 'account',
                 'base_vat',

From dd55d30961d370546267deafefc0ba614e728a0e Mon Sep 17 00:00:00 2001
From: "Amit Bhavsar (Open ERP)" <amb@tinyerp.com>
Date: Fri, 20 Jul 2012 11:35:06 +0530
Subject: [PATCH 03/94] [FIX] account : Improve the code

lp bug: https://launchpad.net/bugs/1026434 fixed

bzr revid: amb@tinyerp.com-20120720060506-clb6z56xa5tqzyy3
---
 addons/account/wizard/account_move_journal.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/wizard/account_move_journal.py b/addons/account/wizard/account_move_journal.py
index a84c7f8eabb..ea2244edb15 100644
--- a/addons/account/wizard/account_move_journal.py
+++ b/addons/account/wizard/account_move_journal.py
@@ -99,7 +99,7 @@ class account_move_journal(osv.osv_memory):
     
             period = False
             if period_id:
-                period = period_pool.browse(cr, uid, [period_id], context=None)[0]['name']
+                period = period_pool.browse(cr, uid, [period_id], context=context)[0]['name']
                 period_string = _("Period: %s") % tools.ustr(period)
     
             open_string = _("Open")

From 7488a675b4d9a8e99cf2b9b25c194e114babcafb Mon Sep 17 00:00:00 2001
From: "Ravish Murari (OpenERP)" <rmu@tinyerp.com>
Date: Mon, 23 Jul 2012 16:56:17 +0530
Subject: [PATCH 04/94] [FIX] removed rest of the base_group_extended group
 from addons

lp bug: https://launchpad.net/bugs/1027875 fixed

bzr revid: rmu@tinyerp.com-20120723112617-h7um6wkj22martms
---
 addons/account/account_view.xml                 | 2 +-
 addons/crm_fundraising/crm_fundraising_view.xml | 2 +-
 addons/point_of_sale/point_of_sale_view.xml     | 2 +-
 addons/purchase/report/purchase_report_view.xml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 1e1f7b91851..e117d31212a 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2593,7 +2593,7 @@ action = pool.get('res.config').next(cr, uid, [], context)
                 <header>
                     <button name="button_confirm_cash" states="open" string="Close CashBox" type="object" class="oe_highlight"/>
                     <button name="button_open" states="draft" string="Open CashBox" type="object" class="oe_highlight"/>
-                    <button name="button_cancel" states="confirm,open" string="Cancel" type="object" groups="base.group_extended"/>
+                    <button name="button_cancel" states="confirm,open" string="Cancel" type="object"/>
                     <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
                 </header>
                 <sheet string="Statement">
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 9e67a4001a7..961ba2d6d3e 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -66,7 +66,7 @@
                     <button name="case_close" string="Done" states="open,pending" type="object" class="oe_highlight"/>
                     <button name="case_open" string="Open" states="draft,pending" type="object" class="oe_highlight"/>
                     <button name="case_pending" string="Pending" states="draft,open" type="object" class="oe_highlight"/>
-                    <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" groups="base.group_extended" />
+                    <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object"/>
                     <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" />
                     <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" />
                     <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 6b1b9132344..e95c293344f 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -1043,7 +1043,7 @@
                     <field name="date_order"/>
                     <field name="session_id"/>
                     <newline/>
-                    <group expand="0" string="Group By..." groups="base.group_extended">
+                    <group expand="0" string="Group By...">
                         <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Session" icon="terp-personal" domain="[]" context="{'group_by':'session_id'}"/>
diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
index 4cf91053666..62b49cbeba0 100644
--- a/addons/purchase/report/purchase_report_view.xml
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -89,7 +89,7 @@
                     <filter string="Product" name="group_product_id" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
                     <filter string="Category" name="group_category_id" icon="terp-stock_symbol-selection" context="{'group_by':'category_id'}"/>
                     <filter string="Reference Unit of Measure" name="group_product_uom" icon="terp-mrp" context="{'group_by':'product_uom'}"/>
-                    <filter string="Warehouse" icon="terp-go-home" context="{'group_by':'warehouse_id'}" groups="base.group_extended"/>
+                    <filter string="Warehouse" icon="terp-go-home" context="{'group_by':'warehouse_id'}"/>
                     <filter string="Reference UOM" name="group_product_uom" icon="terp-mrp" context="{'group_by':'product_uom'}"/>
                     <filter string="Warehouse" icon="terp-go-home" context="{'group_by':'warehouse_id'}"/>
                     <filter string="Destination" icon="terp-gtk-jump-to-ltr" context="{'group_by':'location_id'}"/>

From f693a7d9003283e9da6e911562a60ef41047923d Mon Sep 17 00:00:00 2001
From: "Ravish Murari (OpenERP)" <rmu@tinyerp.com>
Date: Wed, 25 Jul 2012 18:47:51 +0530
Subject: [PATCH 05/94] [FIX] When duplication of event on calender The
 invitations are there but not shown on the calendar

lp bug: https://launchpad.net/bugs/1028825 fixed

bzr revid: rmu@tinyerp.com-20120725131751-26slqnee04irjt7m
---
 addons/base_calendar/crm_meeting.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/addons/base_calendar/crm_meeting.py b/addons/base_calendar/crm_meeting.py
index 239ab8d0f28..c34968a14a0 100644
--- a/addons/base_calendar/crm_meeting.py
+++ b/addons/base_calendar/crm_meeting.py
@@ -65,6 +65,11 @@ class crm_meeting(base_state, osv.Model):
     _defaults = {
         'state': 'draft',
     }
+    
+    def copy(self, cr, uid, id, default=None, context=None):
+        default = default or {}
+        default.update({'attendee_ids' : []})
+        return super(crm_meeting, self).copy(cr, uid, id, default, context)
 
     # ----------------------------------------
     # OpenChatter

From c92422b2ace39a0dde2cb1952da4a26159257377 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Thu, 9 Aug 2012 15:23:41 +0530
Subject: [PATCH 06/94] [ADD]: Add vote system in openchatter

bzr revid: atp@tinyerp.com-20120809095341-xn70i8beof20b07h
---
 addons/mail/__init__.py                  |   1 +
 addons/mail/mail_message.py              |  41 +++++++++++++++++++
 addons/mail/mail_thread.py               |  14 ++++++-
 addons/mail/mail_vote.py                 |  36 +++++++++++++++++
 addons/mail/security/ir.model.access.csv |   1 +
 addons/mail/static/src/css/mail.css      |  29 ++++++++++++++
 addons/mail/static/src/img/vote.gif      | Bin 0 -> 892 bytes
 addons/mail/static/src/js/mail.js        |  48 ++++++++++++++++++++++-
 addons/mail/static/src/xml/mail.xml      |  22 ++++++++++-
 9 files changed, 188 insertions(+), 4 deletions(-)
 create mode 100644 addons/mail/mail_vote.py
 create mode 100644 addons/mail/static/src/img/vote.gif

diff --git a/addons/mail/__init__.py b/addons/mail/__init__.py
index cbd477f55e6..4cf2caf8804 100644
--- a/addons/mail/__init__.py
+++ b/addons/mail/__init__.py
@@ -24,6 +24,7 @@ import mail_message
 import mail_thread
 import mail_group
 import mail_subscription
+import mail_vote
 import ir_needaction
 import res_users
 import res_partner
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index b96b6e3791e..1b5178e7271 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -230,6 +230,7 @@ class mail_message(osv.Model):
             select=True, ondelete='set null',
             help="Parent message, used for displaying as threads with hierarchy"),
         'child_ids': fields.one2many('mail.message', 'parent_id', 'Child Messages'),
+        'vote_ids': fields.one2many('mail.vote', 'msg_id', 'Votes'),
     }
         
     _defaults = {
@@ -237,6 +238,46 @@ class mail_message(osv.Model):
         'state': 'received',
     }
     
+    
+    #---------------------------------------------------
+    #Mail Vote system (Like or Unlike comments
+    #-----------------------------------------------------
+    
+    def get_vote_summary(self, cr, uid, ids, context=None):
+        '''
+        Return message ,count vote of message id given by .particular user with True or False.
+        '''
+        for message in self.browse(cr, uid, ids, context):
+            is_vote_liked = False
+            vote_count = len(message.vote_ids)
+            for vote in message.vote_ids:
+                if vote.user_id.id == uid:
+                    is_vote_liked = True
+                    break
+            res = {
+                'msg_id': message.id,
+                'vote_count': vote_count,
+                'is_vote_liked': is_vote_liked
+            }
+        return res
+    
+    def vote_toggle(self, cr, uid, ids, context=None):
+        '''
+        Toggles when Comment is liked or unlike.
+        Return the number of votes of particular message.
+        '''
+        vote_pool = self.pool.get('mail.vote')
+        vote_count = 0
+        for message in self.browse(cr, uid, ids, context):
+            voters_id = vote_pool.search(cr, uid, [('msg_id', '=', message.id), ('user_id', '=', uid)], context=context)
+            if not voters_id:
+                new_vote_id =  vote_pool.create(cr, uid, {'msg_id': message.id, 'user_id': uid}, context=context)
+            else:
+                vote_pool.unlink(cr, uid, voters_id, context=context)
+            if message.vote_ids:
+                vote_count = len(message.vote_ids)    
+        return vote_count 
+
     #------------------------------------------------------
     # Email api
     #------------------------------------------------------
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index f0dd023bf06..092050ff812 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -64,12 +64,14 @@ class mail_thread(osv.Model):
 
     def _get_message_ids(self, cr, uid, ids, name, args, context=None):
         res = {}
+        img_vote = "<img  class='oe_mail_vote_image'  src='/mail/static/src/img/vote.gif'/>"
         for id in ids:
             message_ids = self.message_search(cr, uid, [id], context=context)
             subscriber_ids = self.message_get_subscribers(cr, uid, [id], context=context)
+            vote_list = self.message_vote_ids(cr, uid, ids, context=context)
             res[id] = {
                 'message_ids': message_ids,
-                'message_summary': "<span><span class='oe_e'>9</span> %d</span> <span><span class='oe_e'>+</span> %d</span>" % (len(message_ids), len(subscriber_ids)),
+                'message_summary': "<span>Msg: %d</span> . <span>Fol: %d</span> . <span> %s  %d</span>" % (len(message_ids), len(subscriber_ids), img_vote, len(vote_list)),
             }
         return res
 
@@ -100,7 +102,15 @@ class mail_thread(osv.Model):
     #------------------------------------------------------
     # Automatic subscription when creating/reading
     #------------------------------------------------------
-
+    def message_vote_ids(self, cr, uid, ids, context=None):
+        message_pool = self.pool.get('mail.message')
+        vote_list = []
+        message_ids = self.message_search(cr, uid, [id], context=context)
+        for message in message_pool.browse(cr, uid, message_ids, context=context):
+            if message.vote_ids:
+                vote_list.append(message.vote_ids)
+        return vote_list
+    
     def create(self, cr, uid, vals, context=None):
         """Automatically subscribe the creator """
         thread_id = super(mail_thread, self).create(cr, uid, vals, context=context)
diff --git a/addons/mail/mail_vote.py b/addons/mail/mail_vote.py
new file mode 100644
index 00000000000..5d63de80864
--- /dev/null
+++ b/addons/mail/mail_vote.py
@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2012-Today OpenERP SA (<http://www.openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero 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 Affero General Public License for more details
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
+#
+##############################################################################
+
+from osv import osv, fields
+from tools.translate import _
+
+class mail_vote(osv.Model):
+    '''
+    Mail vote feature allow users to like and unlike particular  message or Document's message comment.
+    It counts the number of votes per document.
+    '''
+    _name = 'mail.vote'
+    _description = 'Mail Vote'
+    _columns = {
+            'msg_id': fields.many2one('mail.message', 'Message', required=True),
+            'user_id': fields.many2one('res.users', 'User', required=True),
+        }
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/mail/security/ir.model.access.csv b/addons/mail/security/ir.model.access.csv
index 3677d424c14..1941a41a259 100644
--- a/addons/mail/security/ir.model.access.csv
+++ b/addons/mail/security/ir.model.access.csv
@@ -7,3 +7,4 @@ access_mail_notification_all,mail.notification.all,model_mail_notification,,1,1,
 access_mail_group,mail.group,model_mail_group,base.group_user,1,1,1,1
 access_mail_alias_user,mail.alias,model_mail_alias,base.group_user,1,1,1,0
 access_mail_alias_system,mail.alias,model_mail_alias,base.group_system,1,1,1,1
+access_mail_vote,mail.vote,model_mail_vote,base.group_user,1,1,1,1
diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index c0317633aa7..ae934eeb4ff 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -275,6 +275,35 @@
     display: none;
 }
 
+/*--------------------------------------------------------------*/
+/* Mail Vote System (Like or Unlike Comment)
+/*--------------------------------------------------------------*/
+
+.oe_mail_vote_image{
+    height='12px';
+    width='16px';	
+}
+
+button.oe_mail_msg_vote_like{
+    height:21px;
+    width: 30px;
+    padding: 1px;
+    background: #8A89BA;
+    margin-top: -4px;
+}
+
+button.oe_mail_msg_vote_like:hover{
+    background: #8A89BA;
+}
+
+button.oe_mail_msg_vote_like span {
+    color: white;
+}
+
+span.oe_mail_vote_string{
+    color: #807FB4;
+}
+
 /* ------------------------------------------------------------ */
 /* mail.compose.message form view & OpenERP hacks
 /* ------------------------------------------------------------ */
diff --git a/addons/mail/static/src/img/vote.gif b/addons/mail/static/src/img/vote.gif
new file mode 100644
index 0000000000000000000000000000000000000000..0e6b874770e1122b3f08f01d26bae9f08b94cfe6
GIT binary patch
literal 892
zcmZ?wbhEHb<Y(Yz_|5<VqN1Ym^75*xs@mGx*4Ebc_Vy7G5m{MT-QC>_7cRVe_wN7y
z|G^4JiO~=kZXuxflZBCi;Xi{8$YY>9!N3v8@Sju0!k~eniGy7zp};`#5CadBg-XW)
zha;V=k}f;~2O1ohWSp~PDnG_IFtaO6lF_`F(#WJ0K8@#t(X&(2OcGCB>Da7xoQcbW
V?}tRu!6p_1OTLJPi-`^l)&OE6GJpU8

literal 0
HcmV?d00001

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index da6816d3441..8b60e96744c 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -559,6 +559,48 @@ openerp.mail = function(session) {
             return display_done && compose_done;
         },
 
+        //Mail vote Functionality...
+        add_vote_event: function(element){
+            vote_img = element.find('.oe_mail_msg_vote_like');
+            self = this;
+            if (vote_img)
+                vote_img.click(function(){
+                    self.subscribe_vote($(this).attr('data-id'));
+                });
+            return
+        },
+        
+        find_parent_element: function(name, message_id){
+            parent_element = false;
+            _.each($(name), function(element){
+                if ($(element).attr("data-id") == message_id){
+                    parent_element = element;
+                }
+            });
+            return parent_element;
+         },
+
+        render_vote: function(message_id){
+            var self = this;
+            this.mail_message = new session.web.DataSet(this, 'mail.message');
+            this.mail_message.call('get_vote_summary',[[parseInt(message_id)]]).then(function(result){
+                if (result){
+                    parent_element = self.find_parent_element(".oe_mail_msg_vote", message_id);
+                    vote_element = session.web.qweb.render('VoteDisplay', result);
+                    $(parent_element).html(vote_element);
+                    self.add_vote_event($(parent_element));
+                }
+            });
+        },
+        
+        subscribe_vote: function(message_id){
+            var self = this;
+            this.mail_message = new session.web.DataSet(this, 'mail.message');
+            return this.mail_message.call('vote_toggle', [[parseInt(message_id)]]).then(function(result){
+                    self.render_vote(message_id);
+            });
+        },
+         
         /**
          * Override-hack of do_action: automatically reload the chatter.
          * Normally it should be called only when clicking on 'Post/Send'
@@ -697,6 +739,10 @@ openerp.mail = function(session) {
         
         display_comments: function (records) {
             var self = this;
+            //Render Vote.
+            _.each(records, function(record){
+                self.render_vote(record.id);
+            });
             // sort the records
             mail.ChatterUtils.records_struct_add_records(this.comments_structure, records, this.params.parent_id);
             //build attachments download urls and compute time-relative from dates
@@ -1119,7 +1165,7 @@ openerp.mail = function(session) {
                 var records = self.comments_structure.tree_struct[root_id]['for_thread_msgs'];
                 var model_name = self.comments_structure.msgs[root_id]['model'];
                 var res_id = self.comments_structure.msgs[root_id]['res_id'];
-                var render_res = session.web.qweb.render('mail.wall_thread_container', {});
+                var render_res = session.web.qweb.render('mail.Wall_thread_container', {});
                 $('<li class="oe_mail_wall_thread">').html(render_res).appendTo(self.$element.find('ul.oe_mail_wall_threads'));
                 var thread = new mail.Thread(self, {
                     'res_model': model_name, 'res_id': res_id, 'uid': self.session.uid, 'records': records,
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 86d115f29c8..bd18d78e41d 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -45,7 +45,7 @@
         wall_thread_container template for the wall
         Each discussion thread is contained inside this template
         -->
-    <t t-name="mail.wall_thread_container">
+    <t t-name="mail.Wall_thread_container">
     </t>
 
     <!--
@@ -118,6 +118,25 @@
         </div>
     </ul>
 
+    <!-- Vote system (Like or Unlike -->
+    <t t-name="VoteDisplay">
+        <t t-if='vote_count'>
+             <span class="oe_left oe_mail_vote_string">Votes :<t t-esc="vote_count"/></span>
+        </t>
+        <li>
+        <t t-if="!is_vote_liked">
+            <button class="oe_mail_msg_vote_like" t-att-data-id="msg_id" title="Click to Vote.">
+                <span>+1</span>
+            </button>
+        </t>
+        <t t-if="is_vote_liked">
+            <button class="oe_mail_msg_vote_like" t-att-data-id="msg_id" title="Click to Unvote." style="background:#DC5F59; padding:2px">
+                <span>-1</span>
+            </button>
+        </t>
+        </li>
+    </t>
+
     <!-- default layout -->
     <li t-name="mail.thread.message" class="oe_mail oe_mail_thread_msg">
         <div t-attf-class="oe_mail_msg_#{record.type}">
@@ -155,6 +174,7 @@
                       <li t-if="record.subject &amp; params.thread_level > 0"><a t-attf-href="#model=#{params.res_model}&amp;id=#{params.res_id}"><t t-raw="record.record_name"/></a></li>
                       <li><a t-attf-href="#model=res.users&amp;id=#{record.user_id[0]}"><t t-raw="record.user_id[1]"/></a></li>
                       <li><span t-att-title="record.date"><t t-raw="record.timerelative"/></span></li>
+                      <li> <span t-att-data-id="record.id" class="oe_mail_msg_vote"></span> </li>
                       <li t-if="display['show_reply']"><a href="#" class="oe_mail_msg_reply">Reply</a></li>
                       <!-- uncomment when merging vote
                       <li><a href="#">Like</a></li>

From 9ef2d144be84664210c2a4997ee59944e8199ff3 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Thu, 9 Aug 2012 15:42:15 +0530
Subject: [PATCH 07/94] [FIX]: Fix for message_id search problem

bzr revid: atp@tinyerp.com-20120809101215-dcmt2o1l88rvy10d
---
 addons/mail/mail_thread.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 092050ff812..4ba58a029ea 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -68,7 +68,7 @@ class mail_thread(osv.Model):
         for id in ids:
             message_ids = self.message_search(cr, uid, [id], context=context)
             subscriber_ids = self.message_get_subscribers(cr, uid, [id], context=context)
-            vote_list = self.message_vote_ids(cr, uid, ids, context=context)
+            vote_list = self.message_vote_ids(cr, uid, message_ids, context=context)
             res[id] = {
                 'message_ids': message_ids,
                 'message_summary': "<span>Msg: %d</span> . <span>Fol: %d</span> . <span> %s  %d</span>" % (len(message_ids), len(subscriber_ids), img_vote, len(vote_list)),
@@ -105,8 +105,7 @@ class mail_thread(osv.Model):
     def message_vote_ids(self, cr, uid, ids, context=None):
         message_pool = self.pool.get('mail.message')
         vote_list = []
-        message_ids = self.message_search(cr, uid, [id], context=context)
-        for message in message_pool.browse(cr, uid, message_ids, context=context):
+        for message in message_pool.browse(cr, uid, ids, context=context):
             if message.vote_ids:
                 vote_list.append(message.vote_ids)
         return vote_list

From f2cb572602e3881a5699f0cb1754050488390d0e Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Thu, 9 Aug 2012 17:20:32 +0530
Subject: [PATCH 08/94] [REM]: Remove vote from message_summary

bzr revid: atp@tinyerp.com-20120809115032-ffl9v3tcqxuktnn9
---
 addons/mail/mail_thread.py | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index af30ce3630e..9cbf193a1c7 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -64,14 +64,12 @@ class mail_thread(osv.Model):
 
     def _get_message_ids(self, cr, uid, ids, name, args, context=None):
         res = {}
-        img_vote = "<img  class='oe_mail_vote_image'  src='/mail/static/src/img/vote.gif'/>"
         for id in ids:
             message_ids = self.message_search(cr, uid, [id], context=context)
             subscriber_ids = self.message_get_subscribers(cr, uid, [id], context=context)
-            vote_list = self.message_vote_ids(cr, uid, message_ids, context=context)
             res[id] = {
                 'message_ids': message_ids,
-                 'message_summary': "<span><span class='oe_e'>9</span> %d</span> <span><span class='oe_e'>+</span> %d</span> <span> %s  %d</span>" % (len(message_ids), len(subscriber_ids), img_vote, len(vote_list)),
+                'message_summary': "<span><span class='oe_e'>9</span> %d</span> <span><span class='oe_e'>+</span> %d</span>" % (len(message_ids), len(subscriber_ids)),
             }
         return res
 
@@ -102,13 +100,6 @@ class mail_thread(osv.Model):
     #------------------------------------------------------
     # Automatic subscription when creating/reading
     #------------------------------------------------------
-    def message_vote_ids(self, cr, uid, ids, context=None):
-        message_pool = self.pool.get('mail.message')
-        vote_list = []
-        for message in message_pool.browse(cr, uid, ids, context=context):
-            if message.vote_ids:
-                vote_list.append(message.vote_ids)
-        return vote_list
     
     def create(self, cr, uid, vals, context=None):
         """Automatically subscribe the creator """

From ea65cbb1e3ac1b919648c7b4cadb4f32dd7def10 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Mon, 13 Aug 2012 16:58:01 +0530
Subject: [PATCH 09/94] [FIX]: Remove get_vote_summary from mail message and
 search message id and user id from client side

bzr revid: atp@tinyerp.com-20120813112801-9f075ct8y73ide6m
---
 addons/mail/mail_message.py       | 31 +++++--------------------------
 addons/mail/static/src/js/mail.js | 28 ++++++++++++++++------------
 2 files changed, 21 insertions(+), 38 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 1b5178e7271..d8256039359 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -242,41 +242,20 @@ class mail_message(osv.Model):
     #---------------------------------------------------
     #Mail Vote system (Like or Unlike comments
     #-----------------------------------------------------
-    
-    def get_vote_summary(self, cr, uid, ids, context=None):
-        '''
-        Return message ,count vote of message id given by .particular user with True or False.
-        '''
-        for message in self.browse(cr, uid, ids, context):
-            is_vote_liked = False
-            vote_count = len(message.vote_ids)
-            for vote in message.vote_ids:
-                if vote.user_id.id == uid:
-                    is_vote_liked = True
-                    break
-            res = {
-                'msg_id': message.id,
-                'vote_count': vote_count,
-                'is_vote_liked': is_vote_liked
-            }
-        return res
-    
     def vote_toggle(self, cr, uid, ids, context=None):
         '''
         Toggles when Comment is liked or unlike.
         Return the number of votes of particular message.
         '''
         vote_pool = self.pool.get('mail.vote')
-        vote_count = 0
+        new_vote_id = False
         for message in self.browse(cr, uid, ids, context):
-            voters_id = vote_pool.search(cr, uid, [('msg_id', '=', message.id), ('user_id', '=', uid)], context=context)
-            if not voters_id:
+            voters_ids = [x.id for x in message.vote_ids if x.user_id.id == uid]
+            if not voters_ids:
                 new_vote_id =  vote_pool.create(cr, uid, {'msg_id': message.id, 'user_id': uid}, context=context)
             else:
-                vote_pool.unlink(cr, uid, voters_id, context=context)
-            if message.vote_ids:
-                vote_count = len(message.vote_ids)    
-        return vote_count 
+                vote_pool.unlink(cr, uid, voters_ids, context=context)
+        return True
 
     #------------------------------------------------------
     # Email api
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 8b60e96744c..38a3ab0d1bf 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -582,14 +582,20 @@ openerp.mail = function(session) {
 
         render_vote: function(message_id){
             var self = this;
-            this.mail_message = new session.web.DataSet(this, 'mail.message');
-            this.mail_message.call('get_vote_summary',[[parseInt(message_id)]]).then(function(result){
-                if (result){
-                    parent_element = self.find_parent_element(".oe_mail_msg_vote", message_id);
-                    vote_element = session.web.qweb.render('VoteDisplay', result);
-                    $(parent_element).html(vote_element);
-                    self.add_vote_event($(parent_element));
-                }
+            var mail_vote = new session.web.DataSetSearch(self, 'mail.vote', self.session.context, [['msg_id','=',parseInt(message_id)]]);
+            mail_vote.read_slice(['user_id']).then(function(result){
+                vote_count = result.length;
+                is_vote_liked = false;
+                _.each(result, function(vote){
+                    if (self.session.uid == vote.user_id[0]){
+                        is_vote_liked = true;
+                        }
+                });
+                parent_element = self.find_parent_element(".oe_mail_msg_vote", message_id);
+                vote_element = session.web.qweb.render('VoteDisplay', {'msg_id': message_id, 'vote_count': vote_count, 'is_vote_liked': is_vote_liked});
+                $(parent_element).html(vote_element);
+                self.add_vote_event($(parent_element));
+              
             });
         },
         
@@ -739,10 +745,6 @@ openerp.mail = function(session) {
         
         display_comments: function (records) {
             var self = this;
-            //Render Vote.
-            _.each(records, function(record){
-                self.render_vote(record.id);
-            });
             // sort the records
             mail.ChatterUtils.records_struct_add_records(this.comments_structure, records, this.params.parent_id);
             //build attachments download urls and compute time-relative from dates
@@ -756,6 +758,8 @@ openerp.mail = function(session) {
                 }
             }
             _(records).each(function (record) {
+                //Render Votes.
+                 self.render_vote(record.id);
                 var sub_msgs = [];
                 if ((record.parent_id == false || record.parent_id[0] == self.params.parent_id) && self.params.thread_level > 0 ) {
                     var sub_list = self.comments_structure['tree_struct'][record.id]['direct_childs'];

From 0b99488c3560f82e876cdbd7166eea72ffdec44e Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Mon, 13 Aug 2012 17:03:51 +0530
Subject: [PATCH 10/94] [FIX]: Fix doc string in vote_toggle method

bzr revid: atp@tinyerp.com-20120813113351-cl09uvu4pqgvmbb4
---
 addons/mail/mail_message.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index d8256039359..587c7485d19 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -245,7 +245,7 @@ class mail_message(osv.Model):
     def vote_toggle(self, cr, uid, ids, context=None):
         '''
         Toggles when Comment is liked or unlike.
-        Return the number of votes of particular message.
+        create vote entries if current user like comment..
         '''
         vote_pool = self.pool.get('mail.vote')
         new_vote_id = False

From 7781f9cc974420f0dada6483fe356db62e6ac081 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Mon, 13 Aug 2012 17:19:19 +0530
Subject: [PATCH 11/94] [FIX]: Fix indentation and remove extra space

bzr revid: atp@tinyerp.com-20120813114919-7moebenujr9f9pf6
---
 addons/mail/static/src/js/mail.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 38a3ab0d1bf..2923f723952 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -561,8 +561,8 @@ openerp.mail = function(session) {
 
         //Mail vote Functionality...
         add_vote_event: function(element){
-            vote_img = element.find('.oe_mail_msg_vote_like');
             self = this;
+            vote_img = element.find('.oe_mail_msg_vote_like');
             if (vote_img)
                 vote_img.click(function(){
                     self.subscribe_vote($(this).attr('data-id'));
@@ -589,13 +589,12 @@ openerp.mail = function(session) {
                 _.each(result, function(vote){
                     if (self.session.uid == vote.user_id[0]){
                         is_vote_liked = true;
-                        }
+                    }
                 });
                 parent_element = self.find_parent_element(".oe_mail_msg_vote", message_id);
                 vote_element = session.web.qweb.render('VoteDisplay', {'msg_id': message_id, 'vote_count': vote_count, 'is_vote_liked': is_vote_liked});
                 $(parent_element).html(vote_element);
                 self.add_vote_event($(parent_element));
-              
             });
         },
         
@@ -603,7 +602,7 @@ openerp.mail = function(session) {
             var self = this;
             this.mail_message = new session.web.DataSet(this, 'mail.message');
             return this.mail_message.call('vote_toggle', [[parseInt(message_id)]]).then(function(result){
-                    self.render_vote(message_id);
+                self.render_vote(message_id);
             });
         },
          

From 1d2168a02ebeeb7441c9171bd9dcda8226d29cdc Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Tue, 14 Aug 2012 11:42:51 +0530
Subject: [PATCH 12/94] [FIX]: Set vote red button alignment.

bzr revid: atp@tinyerp.com-20120814061251-em6ipxuvvay8ei2p
---
 addons/mail/static/src/xml/mail.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index bd18d78e41d..bf29ada9f63 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -130,7 +130,7 @@
             </button>
         </t>
         <t t-if="is_vote_liked">
-            <button class="oe_mail_msg_vote_like" t-att-data-id="msg_id" title="Click to Unvote." style="background:#DC5F59; padding:2px">
+            <button class="oe_mail_msg_vote_like" t-att-data-id="msg_id" title="Click to Unvote." style="background:#DC5F59; padding:1px">
                 <span>-1</span>
             </button>
         </t>

From cbb41e6ed35e86ae0eb5b570aab26378903f47d8 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Thu, 16 Aug 2012 12:10:26 +0530
Subject: [PATCH 13/94] [FIX]: Remove mail_subscription

bzr revid: atp@tinyerp.com-20120816064026-f3egkm1h2ximajzm
---
 addons/mail/__init__.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/mail/__init__.py b/addons/mail/__init__.py
index 2669eb9f269..c144c5a66bd 100644
--- a/addons/mail/__init__.py
+++ b/addons/mail/__init__.py
@@ -24,7 +24,6 @@ import mail_message
 import mail_followers
 import mail_thread
 import mail_group
-import mail_subscription
 import mail_vote
 import ir_needaction
 import res_partner

From 12d69b3488816d5c5680599a79500a2f616a29c3 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Fri, 24 Aug 2012 12:34:44 +0530
Subject: [PATCH 14/94] [FIX] sale : Traceback on clicking 'View Invoice'
 button.

lp bug: https://launchpad.net/bugs/1038918 fixed

bzr revid: mdi@tinyerp.com-20120824070444-o43u79mvcg8ga99p
---
 addons/sale/sale.py | 28 ++++++++--------------------
 1 file changed, 8 insertions(+), 20 deletions(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index c525ba04df1..cbf7778d126 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -518,36 +518,24 @@ class sale_order(osv.osv):
         This function returns an action that display existing invoices of given sale order ids. It can either be a in a list or in a form view, if there is only one invoice to show.
         '''
         mod_obj = self.pool.get('ir.model.data')
-        result = {
-            'name': _('Cutomer Invoice'),
-            'view_type': 'form',
-            'res_model': 'account.invoice',
-            'context': "{'type':'out_invoice', 'journal_type': 'sale'}",
-            'type': 'ir.actions.act_window',
-            'nodestroy': True,
-            'target': 'current',
-        }
+        act_obj = self.pool.get('ir.actions.act_window')
+
+        result = mod_obj.get_object_reference(cr, uid, 'account', 'action_invoice_tree1')
+        id = result and result[1] or False
+        result = act_obj.read(cr, uid, [id], context=context)[0]
         #compute the number of invoices to display
         inv_ids = []
         for so in self.browse(cr, uid, ids, context=context):
             inv_ids += [invoice.id for invoice in so.invoice_ids]
         #choose the view_mode accordingly
         if len(inv_ids)>1:
-            res = mod_obj.get_object_reference(cr, uid, 'account', 'invoice_tree')
-            result.update({
-                'view_mode': 'tree,form',
-                'res_id': inv_ids or False
-            })
+            result['domain'] = "[('id','in',["+','.join(map(str, inv_ids))+"])]"
         else:
             res = mod_obj.get_object_reference(cr, uid, 'account', 'invoice_form')
-            result.update({
-                'view_mode': 'form',
-                'res_id': inv_ids and inv_ids[0] or False,
-            })
-        result.update(view_id = res and res[1] or False)
+            result['views'] = [(res and res[1] or False, 'form')]
+            result['res_id'] = inv_ids and inv_ids[0] or False
         return result
 
-
     def action_view_delivery(self, cr, uid, ids, context=None):
         '''
         This function returns an action that display existing delivery orders of given sale order ids. It can either be a in a list or in a form view, if there is only one delivery order to show.

From a1fa71621b5310453f7aaf3e0ee17d55f5848aac Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 27 Aug 2012 15:24:28 +0530
Subject: [PATCH 15/94] [IMP] sale : If sale order is not fully 'invoiced' ,
 'Create Invoice' button must be visible .

bzr revid: mdi@tinyerp.com-20120827095428-8h6sx3g79aqn20n8
---
 addons/sale/sale_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index c4edc162f08..dbadf355f9e 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -167,7 +167,7 @@
                             <button name="action_view_delivery" string="View Delivery Order" type="object" class="oe_highlight"
                               attrs="{'invisible': ['|','|','|',('picking_ids','=',False),('picking_ids','=',[]), ('state', 'not in', ('progress','manual')),('shipped','=',True)]}"/>
                             <button name="%(action_view_sale_advance_payment_inv)d" string="Create Invoice"
-                                type="action" states="manual" class="oe_highlight"/>
+                                attrs="{'invisible' : ['|',('state', '!=', 'manual'), ('invoiced', '=', True)]}" type="action" class="oe_highlight"/>
                             <button name="cancel" states="draft,sent" string="Cancel"/>
                             <button name="action_cancel" states="manual,progress" string="Cancel" type="object"/>
                             <button name="ship_cancel" states="shipping_except" string="Cancel"/>

From b48925fb0627d3d3654adc4d25d57a9172c34f59 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Tue, 28 Aug 2012 11:11:11 +0530
Subject: [PATCH 16/94] [IMP]stock : set default location on location field
 ,set groups on some fields, remove icon on button,fix crm_claim error and
 traceability script error

bzr revid: mma@tinyerp.com-20120828054111-dy6k7vc63g7j47ac
---
 addons/crm_claim/crm_claim_menu.xml           |   2 +-
 addons/procurement/procurement.py             |   2 +-
 addons/stock/stock_view.xml                   | 217 +++++++++++++++++-
 addons/stock/wizard/stock_fill_inventory.py   |  10 +
 .../wizard/stock_fill_inventory_view.xml      |  24 +-
 addons/stock/wizard/stock_move_view.xml       |   2 +-
 addons/stock/wizard/stock_traceability.py     |   2 +-
 7 files changed, 236 insertions(+), 23 deletions(-)

diff --git a/addons/crm_claim/crm_claim_menu.xml b/addons/crm_claim/crm_claim_menu.xml
index 46f8760387a..bb881d62a58 100644
--- a/addons/crm_claim/crm_claim_menu.xml
+++ b/addons/crm_claim/crm_claim_menu.xml
@@ -50,9 +50,9 @@
             parent="base.menu_aftersale" action="crm_case_categ_claim0" sequence="1"/>
 
         <!-- Claim Stages -->
+        <menuitem id="base.menu_definitions" name="Configuration" parent="base.menu_main_pm" sequence="60"/>
         <menuitem id="base.menu_project_config_project" name="Stages" parent="base.menu_definitions" sequence="1"/>
         <menuitem id="menu_claim_stage_view" name="Claim Stages" action="crm_claim_stage_act" parent="base.menu_project_config_project" sequence="20"/>
-        <menuitem id="base.menu_definitions" name="Configuration" parent="base.menu_main_pm" sequence="60"/>
 
     </data>
 </openerp>
diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index d1fb3f8a395..ab8f2dabd5a 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -554,7 +554,7 @@ class stock_warehouse_orderpoint(osv.osv):
         'logic': fields.selection([('max','Order to Max'),('price','Best price (not yet active!)')], 'Reordering Mode', required=True),
         'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse', required=True, ondelete="cascade"),
         'location_id': fields.many2one('stock.location', 'Location', required=True, ondelete="cascade"),
-        'product_id': fields.many2one('product.product', 'Product', required=True, ondelete='cascade', domain=[('type','=','product')]),
+        'product_id': fields.many2one('product.product', 'Product', required=True, ondelete='cascade', domain=[('type','!=','service')]),
         'product_uom': fields.many2one('product.uom', 'Product Unit of Measure', required=True),
         'product_min_qty': fields.float('Minimum Quantity', required=True,
             help="When the virtual stock goes below the Min Quantity specified for this field, OpenERP generates "\
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 6927bf68c25..7584f239f34 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -106,6 +106,7 @@
             <field name="arch" type="xml">
                 <form string="Physical Inventory" version="7.0">
                 <header>
+                    <button name="%(action_view_stock_fill_inventory)d" string="Import Inventory" type="action" class="oe_highlight"/>
                     <button name="action_confirm" states="draft" string="Confirm Inventory" type="object" class="oe_highlight"/>
                     <button name="action_done" states="confirm" string="Validate Inventory" type="object" class="oe_highlight"/>
                     <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
@@ -812,9 +813,9 @@
                                 <form string="Stock Moves" version="7.0">
                                     <header>
                                         <span groups="base.group_user">
-                                            <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
-                                            <button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
-                                            <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon="gtk-find"/>
+                                            <button name="force_assign" states="confirmed" string="Force Availability" type="object"/>
+                                            <button name="action_confirm" states="draft" string="Confirm" type="object"/>
+                                            <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object"/>
                                         </span>
                                         <field name="state" widget="statusbar" statusbar_visible="draft,assigned,done"/>
                                     </header>
@@ -880,12 +881,12 @@
                             <group>
                                 <group>
                                     <field name="move_type"/>
-                                    <field name="type" groups="base.group_user"/>
+                                    <field name="type" groups="base.group_no_one"/>
                                     <field name="auto_picking" groups="base.group_user"/>
                                 </group>
                                 <group>
                                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                                    <field name="date_done"/>
+                                    <field name="date_done" groups="base.group_no_one"/>
                                 </group>
                             </group>
                         </page>
@@ -970,7 +971,7 @@
         
         <record id="view_picking_out_tree" model="ir.ui.view">
             <field name="name">stock.picking.out.tree</field>
-            <field name="model">stock.picking</field>
+            <field name="model">stock.picking.out</field>
             <field name="arch" type="xml">
                 <tree colors="blue:state == 'draft';grey:state == 'cancel';red:state not in ('cancel', 'done') and min_date &lt; current_date" string="Delivery Orders">
                     <field name="name"/>
@@ -1000,7 +1001,7 @@
                         <button name="action_assign" states="confirmed" string="Check Availability" type="object" class="oe_highlight"/>
                     </xpath>
                     <xpath expr="/form/header//button[@name='action_process']" position="replace">
-                        <button name="action_process" states="assigned" string="Deliver" type="object" icon="gtk-go-forward" class="oe_highlight"/>
+                        <button name="action_process" states="assigned" string="Deliver" type="object" class="oe_highlight"/>
                     </xpath>
                     <xpath expr="/form/header//field[@name='state']" position="replace">
                         <field name="state" nolabel="1" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"auto":"blue", "confirmed":"blue"}'/>
@@ -1008,6 +1009,106 @@
                     <xpath expr="//field[@name='partner_id']" position="replace">
                         <field name="partner_id" on_change="onchange_partner_in(partner_id)"  colspan="4" string="Customer"/>
                     </xpath>
+                    <xpath expr="//field[@name='move_lines']" position="replace">
+                        <field name="move_lines" context="{'address_in_id': partner_id, 'picking_type': 'out'}">
+                                <tree colors="grey:scrapped == True" string="Stock Moves">
+                                    <field name="product_id"/>
+                                    <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
+                                    <field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
+                                    <field name="product_uos" groups="product.group_uos"/>
+                                    <button name="%(stock.move_scrap)d"
+                                        string="Scrap Products" type="action"
+                                        icon="gtk-convert" context="{'scrap': True}"
+                                        states="draft,waiting,confirmed,assigned"
+                                        groups="base.group_user"/>
+                                    <field name="scrapped" invisible="1"/>
+                                    <field name="prodlot_id" groups="stock.group_production_lot"/>
+                                    <button
+                                        name="%(stock.track_line)d"
+                                        string="Split in Serial Number"
+                                        groups="stock.group_production_lot"
+                                        type="action" icon="terp-stock_effects-object-colorize"
+                                        states="draft,waiting,confirmed,assigned"/>
+                                    <field groups="stock.group_tracking_lot" name="tracking_id"/>
+                                    <button name="setlast_tracking" string="Put in current pack" type="object"
+                                        attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
+                                        icon="terp-stock_effects-object-colorize"
+                                        groups="stock.group_tracking_lot"
+                                        states="draft,assigned,confirmed"/>
+                                    <button name="%(split_into)d" string="Put in a new pack" type="action"
+                                        groups="product.group_stock_packaging"
+                                        icon="terp-stock_effects-object-colorize"
+                                        states="draft,assigned,confirmed"/>
+                                    <field name="location_dest_id" groups="stock.group_locations"/>
+                                    <field name="state"/>
+                                </tree>
+                                <form string="Stock Moves" version="7.0">
+                                    <header>
+                                        <span groups="base.group_user">
+                                            <button name="force_assign" states="confirmed" string="Force Availability" type="object"/>
+                                            <button name="action_confirm" states="draft" string="Confirm" type="object"/>
+                                            <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object"/>
+                                        </span>
+                                        <field name="state" widget="statusbar" statusbar_visible="draft,assigned,done"/>
+                                    </header>
+                                    <group>
+                                        <group>
+                                            <field name="name" invisible="1"/>
+                                            <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.partner_id)"/>
+                                            <label for="product_qty"/>
+                                            <div>
+                                                <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_inline"/>
+                                                <field name="product_uom" string="Unit Of Measure" groups="product.group_uom" class="oe_inline"/>
+                                                <button name="%(stock.move_scrap)d"
+                                                        string="Scrap" type="action"
+                                                        icon="gtk-convert" context="{'scrap': True}"
+                                                        states="draft,waiting,confirmed,assigned"
+                                                        groups="base.group_user"/>
+                                            </div>
+                                            <label for="product_uos_qty" groups="product.group_uos"/>
+                                            <div groups="product.group_uos">
+                                                <field name="product_uos_qty" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" class="oe_inline"/>
+                                                <field name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_inline"/>
+                                            </div>
+                                            <field name="product_packaging" groups="product.group_stock_packaging" domain="[('product_id','=',product_id)]"/>
+                                        </group>
+                                        <group>
+                                            <field name="create_date" invisible="1"/>
+                                            <field name="date"/>
+                                            <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
+                                        </group>
+
+                                        <group string="Locations" groups="stock.group_locations">
+                                            <field name="location_id" domain="[('usage','&lt;&gt;','view')]"/>
+                                            <field name="location_dest_id" domain="[('usage','=','internal')]" groups="stock.group_locations"/>
+                                        </group>
+
+                                        <group groups="stock.group_tracking_lot" string="Traceability">
+                                            <label for="tracking_id"/>
+                                            <div>
+                                                <field name="tracking_id" groups="stock.group_tracking_lot" class="oe_inline"/>
+                                                <button name="%(split_into)d" string="New Pack" type="action"
+                                                      groups="product.group_stock_packaging"
+                                                      icon="terp-stock_effects-object-colorize"
+                                                      states="draft,assigned,confirmed"/>
+                                            </div>
+
+                                            <label for="prodlot_id"/>
+                                            <div>
+                                                <field name="prodlot_id" groups="stock.group_production_lot"
+                                                    context="{'location_id':location_id, 'product_id':product_id}"
+                                                    domain="[('product_id','=?',product_id)]"
+                                                    on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)" class="oe_inline"/>
+                                                <button name="%(track_line)d"
+                                                    groups="stock.group_tracking_lot"
+                                                    states="draft,waiting,confirmed,assigned"
+                                                    string="Split" type="action" icon="terp-stock_effects-object-colorize"/>
+                                            </div>
+                                        </group>
+                                    </group>
+                                </form>
+                            </field>
+                    </xpath>
                     <xpath expr="/form/sheet" position="after">
                         <div class="oe_chatter">
                             <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
@@ -1131,6 +1232,106 @@
                     <xpath expr="//field[@name='partner_id']" position="replace">
                         <field name="partner_id" on_change="onchange_partner_in(partner_id)"  colspan="4" string="Supplier"/>
                     </xpath>
+                    <xpath expr="//field[@name='move_lines']" position="replace">
+                        <field name="move_lines" context="{'address_in_id': partner_id, 'picking_type': 'in'}">
+                                <tree colors="grey:scrapped == True" string="Stock Moves">
+                                    <field name="product_id"/>
+                                    <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
+                                    <field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
+                                    <field name="product_uos" groups="product.group_uos"/>
+                                    <button name="%(stock.move_scrap)d"
+                                        string="Scrap Products" type="action"
+                                        icon="gtk-convert" context="{'scrap': True}"
+                                        states="draft,waiting,confirmed,assigned"
+                                        groups="base.group_user"/>
+                                    <field name="scrapped" invisible="1"/>
+                                    <field name="prodlot_id" groups="stock.group_production_lot"/>
+                                    <button
+                                        name="%(stock.track_line)d"
+                                        string="Split in Serial Number"
+                                        groups="stock.group_production_lot"
+                                        type="action" icon="terp-stock_effects-object-colorize"
+                                        states="draft,waiting,confirmed,assigned"/>
+                                    <field groups="stock.group_tracking_lot" name="tracking_id"/>
+                                    <button name="setlast_tracking" string="Put in current pack" type="object"
+                                        attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
+                                        icon="terp-stock_effects-object-colorize"
+                                        groups="stock.group_tracking_lot"
+                                        states="draft,assigned,confirmed"/>
+                                    <button name="%(split_into)d" string="Put in a new pack" type="action"
+                                        groups="product.group_stock_packaging"
+                                        icon="terp-stock_effects-object-colorize"
+                                        states="draft,assigned,confirmed"/>
+                                    <field name="location_dest_id" groups="stock.group_locations"/>
+                                    <field name="state"/>
+                                </tree>
+                                <form string="Stock Moves" version="7.0">
+                                    <header>
+                                        <span groups="base.group_user">
+                                            <button name="force_assign" states="confirmed" string="Force Availability" type="object"/>
+                                            <button name="action_confirm" states="draft" string="Confirm" type="object"/>
+                                            <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object"/>
+                                        </span>
+                                        <field name="state" widget="statusbar" statusbar_visible="draft,assigned,done"/>
+                                    </header>
+                                    <group>
+                                        <group>
+                                            <field name="name" invisible="1"/>
+                                            <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.partner_id)"/>
+                                            <label for="product_qty"/>
+                                            <div>
+                                                <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_inline"/>
+                                                <field name="product_uom" string="Unit Of Measure" groups="product.group_uom" class="oe_inline"/>
+                                                <button name="%(stock.move_scrap)d"
+                                                        string="Scrap" type="action"
+                                                        icon="gtk-convert" context="{'scrap': True}"
+                                                        states="draft,waiting,confirmed,assigned"
+                                                        groups="base.group_user"/>
+                                            </div>
+                                            <label for="product_uos_qty" groups="product.group_uos"/>
+                                            <div groups="product.group_uos">
+                                                <field name="product_uos_qty" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" class="oe_inline"/>
+                                                <field name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_inline"/>
+                                            </div>
+                                            <field name="product_packaging" groups="product.group_stock_packaging" domain="[('product_id','=',product_id)]"/>
+                                        </group>
+                                        <group>
+                                            <field name="create_date" invisible="1"/>
+                                            <field name="date"/>
+                                            <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
+                                        </group>
+
+                                        <group string="Locations" groups="stock.group_locations">
+                                            <field name="location_id" domain="[('usage','&lt;&gt;','view')]"/>
+                                            <field name="location_dest_id" domain="[('usage','=','internal')]" groups="stock.group_locations"/>
+                                        </group>
+
+                                        <group groups="stock.group_tracking_lot" string="Traceability">
+                                            <label for="tracking_id"/>
+                                            <div>
+                                                <field name="tracking_id" groups="stock.group_tracking_lot" class="oe_inline"/>
+                                                <button name="%(split_into)d" string="New Pack" type="action"
+                                                      groups="product.group_stock_packaging"
+                                                      icon="terp-stock_effects-object-colorize"
+                                                      states="draft,assigned,confirmed"/>
+                                            </div>
+
+                                            <label for="prodlot_id"/>
+                                            <div>
+                                                <field name="prodlot_id" groups="stock.group_production_lot"
+                                                    context="{'location_id':location_id, 'product_id':product_id}"
+                                                    domain="[('product_id','=?',product_id)]"
+                                                    on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)" class="oe_inline"/>
+                                                <button name="%(track_line)d"
+                                                    groups="stock.group_tracking_lot"
+                                                    states="draft,waiting,confirmed,assigned"
+                                                    string="Split" type="action" icon="terp-stock_effects-object-colorize"/>
+                                            </div>
+                                        </group>
+                                    </group>
+                                </form>
+                            </field>
+                    </xpath>
                     <xpath expr="/form/sheet" position="after">
                         <div class="oe_chatter">
                             <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
@@ -1205,7 +1406,7 @@
         </record>
         <menuitem action="action_picking_tree4" id="menu_action_picking_tree4" parent="menu_stock_warehouse_mgmt" sequence="1"/>
 
-        <menuitem action="action_picking_tree6" id="menu_action_picking_tree6" parent="menu_stock_warehouse_mgmt" sequence="2"/>
+        <menuitem action="action_picking_tree6" id="menu_action_picking_tree6" parent="menu_stock_warehouse_mgmt" sequence="2" groups="stock.group_locations"/>
 
         <record id="view_move_tree" model="ir.ui.view">
             <field name="name">stock.move.tree</field>
diff --git a/addons/stock/wizard/stock_fill_inventory.py b/addons/stock/wizard/stock_fill_inventory.py
index 10a1d625e16..54b15719d45 100644
--- a/addons/stock/wizard/stock_fill_inventory.py
+++ b/addons/stock/wizard/stock_fill_inventory.py
@@ -25,11 +25,21 @@ from tools.translate import _
 class stock_fill_inventory(osv.osv_memory):
     _name = "stock.fill.inventory"
     _description = "Import Inventory"
+
+    def _default_location(self, cr, uid, ids, context=None):
+        location_id = self.pool.get('ir.model.data').get_object(cr, uid, 'stock', 'stock_location_stock', context=context)
+        return location_id.id
+
     _columns = {
         'location_id': fields.many2one('stock.location', 'Location', required=True),
         'recursive': fields.boolean("Include children",help="If checked, products contained in child locations of selected location will be included as well."),
         'set_stock_zero': fields.boolean("Set to zero",help="If checked, all product quantities will be set to zero to help ensure a real physical inventory is done"),
     }
+
+    _defaults = {
+        'location_id': _default_location,
+    }
+
     def view_init(self, cr, uid, fields_list, context=None):
         """
          Creates view dynamically and adding fields at runtime.
diff --git a/addons/stock/wizard/stock_fill_inventory_view.xml b/addons/stock/wizard/stock_fill_inventory_view.xml
index 47e6355bcdc..83becb351cc 100644
--- a/addons/stock/wizard/stock_fill_inventory_view.xml
+++ b/addons/stock/wizard/stock_fill_inventory_view.xml
@@ -8,8 +8,8 @@
               <form string="Import Inventory" version="7.0">
                   <separator string="Import current product inventory from the following location"/>
                   <group>
-                      <field name="location_id"/>
-                      <field name="recursive"/>
+                      <field name="location_id" groups="stock.group_locations"/>
+                      <field name="recursive" groups="stock.group_locations"/>
                       <field name="set_stock_zero"/>
                   </group>
                   <footer>
@@ -21,14 +21,16 @@
             </field>
         </record>
 
-         <act_window name="Import Inventory"
-            res_model="stock.fill.inventory"
-            src_model="stock.inventory"
-            view_mode="form"
-            target="new"
-            context="{'search_default_in_location':1}"
-            key2="client_action_multi"
-            id="action_view_stock_fill_inventory"/>
-
+        <record id="action_view_stock_fill_inventory" model="ir.actions.act_window">
+            <field name="name">Import Inventory</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">stock.fill.inventory</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_stock_fill_inventory"/>
+            <field name="target">new</field>
+            <field name="context">{'search_default_in_location':1}</field>
+        </record>
+            
     </data>
 </openerp>
diff --git a/addons/stock/wizard/stock_move_view.xml b/addons/stock/wizard/stock_move_view.xml
index b3a7fbee885..7f3f77538c2 100644
--- a/addons/stock/wizard/stock_move_view.xml
+++ b/addons/stock/wizard/stock_move_view.xml
@@ -48,7 +48,7 @@
                             <field name="product_qty" class="oe_inline"/>
                             <field name="product_uom" class="oe_inline" readonly="1"/>
                         </div>
-                        <field name="location_id" string="Scrap Location" domain="[('usage','&lt;&gt;','view'),('scrap_location','=',True)]" widget="selection"/>
+                        <field name="location_id" string="Scrap Location" domain="[('usage','&lt;&gt;','view'),('scrap_location','=',True)]" widget="selection" groups="stock.group_locations"/>
                     </group>
                     <footer>
                         <button name="move_scrap" string="Ok" type="object" class="oe_highlight"  />
diff --git a/addons/stock/wizard/stock_traceability.py b/addons/stock/wizard/stock_traceability.py
index 28007592f23..fbe91f3140f 100644
--- a/addons/stock/wizard/stock_traceability.py
+++ b/addons/stock/wizard/stock_traceability.py
@@ -42,7 +42,7 @@ class action_traceability(osv.osv_memory):
         lot_id = ids
         if context is None:
             context = {}
-        type1 = context.get('type', 'move_history_ids2')
+        type1 = 'type' in context and context['type'] or 'move_history_ids2'
         field = context.get('field', 'tracking_id')
         obj = self.pool.get('stock.move')
         ids = obj.search(cr, uid, [(field, 'in',lot_id)])

From 417cd902490151ae04d31f7157f2a70b2de9e442 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 28 Aug 2012 15:29:41 +0530
Subject: [PATCH 17/94] [FIX] sale : ValueError: Non-db action dictionaries
 should provide either multiple view modes or a single view mode and an
 optional view id.

bzr revid: mdi@tinyerp.com-20120828095941-kh1c5xh6osj93ck0
---
 addons/sale/sale.py | 27 ++++++++-------------------
 1 file changed, 8 insertions(+), 19 deletions(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index c525ba04df1..e99c7d3f952 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -553,33 +553,22 @@ class sale_order(osv.osv):
         This function returns an action that display existing delivery orders of given sale order ids. It can either be a in a list or in a form view, if there is only one delivery order to show.
         '''
         mod_obj = self.pool.get('ir.model.data')
-        result = {
-            'name': _('Delivery Order'),
-            'view_type': 'form',
-            'res_model': 'stock.picking',
-            'context': "{'type':'out'}",
-            'type': 'ir.actions.act_window',
-            'nodestroy': True,
-            'target': 'current',
-        }
+        act_obj = self.pool.get('ir.actions.act_window')
+
+        result = mod_obj.get_object_reference(cr, uid, 'stock', 'action_picking_tree')
+        id = result and result[1] or False
+        result = act_obj.read(cr, uid, [id], context=context)[0]
         #compute the number of delivery orders to display
         pick_ids = []
         for so in self.browse(cr, uid, ids, context=context):
             pick_ids += [picking.id for picking in so.picking_ids]
         #choose the view_mode accordingly
         if len(pick_ids) > 1:
-            res = mod_obj.get_object_reference(cr, uid, 'stock', 'view_picking_out_tree')
-            result.update({
-                'view_mode': 'tree,form',
-                'res_id': pick_ids or False
-            })
+            result['domain'] = "[('id','in',["+','.join(map(str, pick_ids))+"])]"
         else:
             res = mod_obj.get_object_reference(cr, uid, 'stock', 'view_picking_out_form')
-            result.update({
-                'view_mode': 'form',
-                'res_id': pick_ids and pick_ids[0] or False,
-            })
-        result.update(view_id = res and res[1] or False)
+            result['views'] = [(res and res[1] or False, 'form')]
+            result['res_id'] = pick_ids and pick_ids[0] or False
         return result
 
     def action_invoice_create(self, cr, uid, ids, grouped=False, states=['confirmed', 'done', 'exception'], date_inv = False, context=None):

From f4300a8e183d245068bc96c4e3ccb29341c032a8 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Tue, 28 Aug 2012 15:45:28 +0530
Subject: [PATCH 18/94] [IMP]stock : make a tree and form view for move and set
 in move_line and its location depends on type

bzr revid: mma@tinyerp.com-20120828101528-m07x8zttze5isib5
---
 addons/stock/stock_view.xml | 409 ++++++++++--------------------------
 1 file changed, 115 insertions(+), 294 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 7584f239f34..391b02fba9a 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -778,104 +778,7 @@
                     </group>
                     <notebook>
                         <page string="Products">
-                            <field name="move_lines" context="{'address_in_id': partner_id}">
-                                <tree colors="grey:scrapped == True" string="Stock Moves">
-                                    <field name="product_id"/>
-                                    <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-                                    <field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
-                                    <field name="product_uos" groups="product.group_uos"/>
-                                    <button name="%(stock.move_scrap)d"
-                                        string="Scrap Products" type="action"
-                                        icon="gtk-convert" context="{'scrap': True}"
-                                        states="draft,waiting,confirmed,assigned"
-                                        groups="base.group_user"/>
-                                    <field name="scrapped" invisible="1"/>
-                                    <field name="prodlot_id" groups="stock.group_production_lot"/>
-                                    <button
-                                        name="%(stock.track_line)d"
-                                        string="Split in Serial Number"
-                                        groups="stock.group_production_lot"
-                                        type="action" icon="terp-stock_effects-object-colorize"
-                                        states="draft,waiting,confirmed,assigned"/>
-                                    <field groups="stock.group_tracking_lot" name="tracking_id"/>
-                                    <button name="setlast_tracking" string="Put in current pack" type="object"
-                                        attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
-                                        icon="terp-stock_effects-object-colorize"
-                                        groups="stock.group_tracking_lot"
-                                        states="draft,assigned,confirmed"/>
-                                    <button name="%(split_into)d" string="Put in a new pack" type="action"
-                                        groups="product.group_stock_packaging"
-                                        icon="terp-stock_effects-object-colorize"
-                                        states="draft,assigned,confirmed"/>
-                                    <field name="location_dest_id" groups="stock.group_locations"/>
-                                    <field name="state"/>
-                                </tree>
-                                <form string="Stock Moves" version="7.0">
-                                    <header>
-                                        <span groups="base.group_user">
-                                            <button name="force_assign" states="confirmed" string="Force Availability" type="object"/>
-                                            <button name="action_confirm" states="draft" string="Confirm" type="object"/>
-                                            <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object"/>
-                                        </span>
-                                        <field name="state" widget="statusbar" statusbar_visible="draft,assigned,done"/>
-                                    </header>
-                                    <group>
-                                        <group>
-                                            <field name="name" invisible="1"/>
-                                            <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.partner_id)"/>
-                                            <label for="product_qty"/>
-                                            <div>
-                                                <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_inline"/>
-                                                <field name="product_uom" string="Unit Of Measure" groups="product.group_uom" class="oe_inline"/>
-                                                <button name="%(stock.move_scrap)d"
-                                                        string="Scrap" type="action"
-                                                        icon="gtk-convert" context="{'scrap': True}"
-                                                        states="draft,waiting,confirmed,assigned"
-                                                        groups="base.group_user"/>
-                                            </div>
-                                            <label for="product_uos_qty" groups="product.group_uos"/>
-                                            <div groups="product.group_uos">
-                                                <field name="product_uos_qty" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" class="oe_inline"/>
-                                                <field name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_inline"/>
-                                            </div>
-                                            <field name="product_packaging" groups="product.group_stock_packaging" domain="[('product_id','=',product_id)]"/>
-                                        </group>
-                                        <group>
-                                            <field name="create_date" invisible="1"/>
-                                            <field name="date"/>
-                                            <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
-                                        </group>
-
-                                        <group string="Locations" groups="stock.group_locations">
-                                            <field name="location_id" domain="[('usage','&lt;&gt;','view')]"/>
-                                            <field name="location_dest_id" domain="[('usage','=','internal')]" groups="stock.group_locations"/>
-                                        </group>
-
-                                        <group groups="stock.group_tracking_lot" string="Traceability">
-                                            <label for="tracking_id"/>
-                                            <div>
-                                                <field name="tracking_id" groups="stock.group_tracking_lot" class="oe_inline"/>
-                                                <button name="%(split_into)d" string="New Pack" type="action"
-                                                      groups="product.group_stock_packaging"
-                                                      icon="terp-stock_effects-object-colorize"
-                                                      states="draft,assigned,confirmed"/>
-                                            </div>
-
-                                            <label for="prodlot_id"/>
-                                            <div>
-                                                <field name="prodlot_id" groups="stock.group_production_lot"
-                                                    context="{'location_id':location_id, 'product_id':product_id}"
-                                                    domain="[('product_id','=?',product_id)]"
-                                                    on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)" class="oe_inline"/>
-                                                <button name="%(track_line)d"
-                                                    groups="stock.group_tracking_lot"
-                                                    states="draft,waiting,confirmed,assigned"
-                                                    string="Split" type="action" icon="terp-stock_effects-object-colorize"/>
-                                            </div>
-                                        </group>
-                                    </group>
-                                </form>
-                            </field>
+                            <field name="move_lines" context="{'address_in_id': partner_id, 'form_view_ref':'view_move_picking_form', 'tree_view_ref':'view_move_picking_tree'}"/>
                         </page>
                         <page string="Additional Info">
                             <group>
@@ -1010,104 +913,7 @@
                         <field name="partner_id" on_change="onchange_partner_in(partner_id)"  colspan="4" string="Customer"/>
                     </xpath>
                     <xpath expr="//field[@name='move_lines']" position="replace">
-                        <field name="move_lines" context="{'address_in_id': partner_id, 'picking_type': 'out'}">
-                                <tree colors="grey:scrapped == True" string="Stock Moves">
-                                    <field name="product_id"/>
-                                    <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-                                    <field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
-                                    <field name="product_uos" groups="product.group_uos"/>
-                                    <button name="%(stock.move_scrap)d"
-                                        string="Scrap Products" type="action"
-                                        icon="gtk-convert" context="{'scrap': True}"
-                                        states="draft,waiting,confirmed,assigned"
-                                        groups="base.group_user"/>
-                                    <field name="scrapped" invisible="1"/>
-                                    <field name="prodlot_id" groups="stock.group_production_lot"/>
-                                    <button
-                                        name="%(stock.track_line)d"
-                                        string="Split in Serial Number"
-                                        groups="stock.group_production_lot"
-                                        type="action" icon="terp-stock_effects-object-colorize"
-                                        states="draft,waiting,confirmed,assigned"/>
-                                    <field groups="stock.group_tracking_lot" name="tracking_id"/>
-                                    <button name="setlast_tracking" string="Put in current pack" type="object"
-                                        attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
-                                        icon="terp-stock_effects-object-colorize"
-                                        groups="stock.group_tracking_lot"
-                                        states="draft,assigned,confirmed"/>
-                                    <button name="%(split_into)d" string="Put in a new pack" type="action"
-                                        groups="product.group_stock_packaging"
-                                        icon="terp-stock_effects-object-colorize"
-                                        states="draft,assigned,confirmed"/>
-                                    <field name="location_dest_id" groups="stock.group_locations"/>
-                                    <field name="state"/>
-                                </tree>
-                                <form string="Stock Moves" version="7.0">
-                                    <header>
-                                        <span groups="base.group_user">
-                                            <button name="force_assign" states="confirmed" string="Force Availability" type="object"/>
-                                            <button name="action_confirm" states="draft" string="Confirm" type="object"/>
-                                            <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object"/>
-                                        </span>
-                                        <field name="state" widget="statusbar" statusbar_visible="draft,assigned,done"/>
-                                    </header>
-                                    <group>
-                                        <group>
-                                            <field name="name" invisible="1"/>
-                                            <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.partner_id)"/>
-                                            <label for="product_qty"/>
-                                            <div>
-                                                <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_inline"/>
-                                                <field name="product_uom" string="Unit Of Measure" groups="product.group_uom" class="oe_inline"/>
-                                                <button name="%(stock.move_scrap)d"
-                                                        string="Scrap" type="action"
-                                                        icon="gtk-convert" context="{'scrap': True}"
-                                                        states="draft,waiting,confirmed,assigned"
-                                                        groups="base.group_user"/>
-                                            </div>
-                                            <label for="product_uos_qty" groups="product.group_uos"/>
-                                            <div groups="product.group_uos">
-                                                <field name="product_uos_qty" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" class="oe_inline"/>
-                                                <field name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_inline"/>
-                                            </div>
-                                            <field name="product_packaging" groups="product.group_stock_packaging" domain="[('product_id','=',product_id)]"/>
-                                        </group>
-                                        <group>
-                                            <field name="create_date" invisible="1"/>
-                                            <field name="date"/>
-                                            <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
-                                        </group>
-
-                                        <group string="Locations" groups="stock.group_locations">
-                                            <field name="location_id" domain="[('usage','&lt;&gt;','view')]"/>
-                                            <field name="location_dest_id" domain="[('usage','=','internal')]" groups="stock.group_locations"/>
-                                        </group>
-
-                                        <group groups="stock.group_tracking_lot" string="Traceability">
-                                            <label for="tracking_id"/>
-                                            <div>
-                                                <field name="tracking_id" groups="stock.group_tracking_lot" class="oe_inline"/>
-                                                <button name="%(split_into)d" string="New Pack" type="action"
-                                                      groups="product.group_stock_packaging"
-                                                      icon="terp-stock_effects-object-colorize"
-                                                      states="draft,assigned,confirmed"/>
-                                            </div>
-
-                                            <label for="prodlot_id"/>
-                                            <div>
-                                                <field name="prodlot_id" groups="stock.group_production_lot"
-                                                    context="{'location_id':location_id, 'product_id':product_id}"
-                                                    domain="[('product_id','=?',product_id)]"
-                                                    on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)" class="oe_inline"/>
-                                                <button name="%(track_line)d"
-                                                    groups="stock.group_tracking_lot"
-                                                    states="draft,waiting,confirmed,assigned"
-                                                    string="Split" type="action" icon="terp-stock_effects-object-colorize"/>
-                                            </div>
-                                        </group>
-                                    </group>
-                                </form>
-                            </field>
+                        <field name="move_lines" context="{'address_in_id': partner_id, 'picking_type': 'out', 'form_view_ref':'view_move_picking_form', 'tree_view_ref':'view_move_picking_tree'}"/>
                     </xpath>
                     <xpath expr="/form/sheet" position="after">
                         <div class="oe_chatter">
@@ -1233,104 +1039,7 @@
                         <field name="partner_id" on_change="onchange_partner_in(partner_id)"  colspan="4" string="Supplier"/>
                     </xpath>
                     <xpath expr="//field[@name='move_lines']" position="replace">
-                        <field name="move_lines" context="{'address_in_id': partner_id, 'picking_type': 'in'}">
-                                <tree colors="grey:scrapped == True" string="Stock Moves">
-                                    <field name="product_id"/>
-                                    <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-                                    <field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
-                                    <field name="product_uos" groups="product.group_uos"/>
-                                    <button name="%(stock.move_scrap)d"
-                                        string="Scrap Products" type="action"
-                                        icon="gtk-convert" context="{'scrap': True}"
-                                        states="draft,waiting,confirmed,assigned"
-                                        groups="base.group_user"/>
-                                    <field name="scrapped" invisible="1"/>
-                                    <field name="prodlot_id" groups="stock.group_production_lot"/>
-                                    <button
-                                        name="%(stock.track_line)d"
-                                        string="Split in Serial Number"
-                                        groups="stock.group_production_lot"
-                                        type="action" icon="terp-stock_effects-object-colorize"
-                                        states="draft,waiting,confirmed,assigned"/>
-                                    <field groups="stock.group_tracking_lot" name="tracking_id"/>
-                                    <button name="setlast_tracking" string="Put in current pack" type="object"
-                                        attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
-                                        icon="terp-stock_effects-object-colorize"
-                                        groups="stock.group_tracking_lot"
-                                        states="draft,assigned,confirmed"/>
-                                    <button name="%(split_into)d" string="Put in a new pack" type="action"
-                                        groups="product.group_stock_packaging"
-                                        icon="terp-stock_effects-object-colorize"
-                                        states="draft,assigned,confirmed"/>
-                                    <field name="location_dest_id" groups="stock.group_locations"/>
-                                    <field name="state"/>
-                                </tree>
-                                <form string="Stock Moves" version="7.0">
-                                    <header>
-                                        <span groups="base.group_user">
-                                            <button name="force_assign" states="confirmed" string="Force Availability" type="object"/>
-                                            <button name="action_confirm" states="draft" string="Confirm" type="object"/>
-                                            <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object"/>
-                                        </span>
-                                        <field name="state" widget="statusbar" statusbar_visible="draft,assigned,done"/>
-                                    </header>
-                                    <group>
-                                        <group>
-                                            <field name="name" invisible="1"/>
-                                            <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.partner_id)"/>
-                                            <label for="product_qty"/>
-                                            <div>
-                                                <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_inline"/>
-                                                <field name="product_uom" string="Unit Of Measure" groups="product.group_uom" class="oe_inline"/>
-                                                <button name="%(stock.move_scrap)d"
-                                                        string="Scrap" type="action"
-                                                        icon="gtk-convert" context="{'scrap': True}"
-                                                        states="draft,waiting,confirmed,assigned"
-                                                        groups="base.group_user"/>
-                                            </div>
-                                            <label for="product_uos_qty" groups="product.group_uos"/>
-                                            <div groups="product.group_uos">
-                                                <field name="product_uos_qty" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" class="oe_inline"/>
-                                                <field name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_inline"/>
-                                            </div>
-                                            <field name="product_packaging" groups="product.group_stock_packaging" domain="[('product_id','=',product_id)]"/>
-                                        </group>
-                                        <group>
-                                            <field name="create_date" invisible="1"/>
-                                            <field name="date"/>
-                                            <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
-                                        </group>
-
-                                        <group string="Locations" groups="stock.group_locations">
-                                            <field name="location_id" domain="[('usage','&lt;&gt;','view')]"/>
-                                            <field name="location_dest_id" domain="[('usage','=','internal')]" groups="stock.group_locations"/>
-                                        </group>
-
-                                        <group groups="stock.group_tracking_lot" string="Traceability">
-                                            <label for="tracking_id"/>
-                                            <div>
-                                                <field name="tracking_id" groups="stock.group_tracking_lot" class="oe_inline"/>
-                                                <button name="%(split_into)d" string="New Pack" type="action"
-                                                      groups="product.group_stock_packaging"
-                                                      icon="terp-stock_effects-object-colorize"
-                                                      states="draft,assigned,confirmed"/>
-                                            </div>
-
-                                            <label for="prodlot_id"/>
-                                            <div>
-                                                <field name="prodlot_id" groups="stock.group_production_lot"
-                                                    context="{'location_id':location_id, 'product_id':product_id}"
-                                                    domain="[('product_id','=?',product_id)]"
-                                                    on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)" class="oe_inline"/>
-                                                <button name="%(track_line)d"
-                                                    groups="stock.group_tracking_lot"
-                                                    states="draft,waiting,confirmed,assigned"
-                                                    string="Split" type="action" icon="terp-stock_effects-object-colorize"/>
-                                            </div>
-                                        </group>
-                                    </group>
-                                </form>
-                            </field>
+                        <field name="move_lines" context="{'address_in_id': partner_id, 'picking_type': 'in', 'form_view_ref':'view_move_picking_form', 'tree_view_ref':'view_move_picking_tree'}"/>
                     </xpath>
                     <xpath expr="/form/sheet" position="after">
                         <div class="oe_chatter">
@@ -1450,6 +1159,44 @@
             </field>
         </record>
 
+        <record id="view_move_picking_tree" model="ir.ui.view">
+            <field name="name">stock.move.tree</field>
+            <field name="model">stock.move</field>
+            <field name="arch" type="xml">
+                <tree colors="grey:scrapped == True" string="Stock Moves">
+                    <field name="product_id"/>
+                    <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
+                    <field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
+                    <field name="product_uos" groups="product.group_uos"/>
+                    <button name="%(stock.move_scrap)d"
+                       string="Scrap Products" type="action"
+                       icon="gtk-convert" context="{'scrap': True}"
+                       states="draft,waiting,confirmed,assigned"
+                       groups="base.group_user"/>
+                    <field name="scrapped" invisible="1"/>
+                    <field name="prodlot_id" groups="stock.group_production_lot"/>
+                    <button
+                       name="%(stock.track_line)d"
+                       string="Split in Serial Number"
+                       groups="stock.group_production_lot"
+                       type="action" icon="terp-stock_effects-object-colorize"
+                       states="draft,waiting,confirmed,assigned"/>
+                     <field groups="stock.group_tracking_lot" name="tracking_id"/>
+                     <button name="setlast_tracking" string="Put in current pack" type="object"
+                        attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
+                        icon="terp-stock_effects-object-colorize"
+                        groups="stock.group_tracking_lot"
+                        states="draft,assigned,confirmed"/>
+                     <button name="%(split_into)d" string="Put in a new pack" type="action"
+                        groups="product.group_stock_packaging"
+                        icon="terp-stock_effects-object-colorize"
+                        states="draft,assigned,confirmed"/>
+                      <field name="location_dest_id" groups="stock.group_locations"/>
+                      <field name="state"/>
+                </tree>
+            </field>
+        </record>
+
         <record id="view_move_form" model="ir.ui.view">
             <field name="name">stock.move.form</field>
             <field name="model">stock.move</field>
@@ -1528,6 +1275,80 @@
             </field>
         </record>
 
+        <record id="view_move_picking_form" model="ir.ui.view">
+            <field name="name">stock.move.form</field>
+            <field name="model">stock.move</field>
+            <field eval="4" name="priority"/>
+            <field name="arch" type="xml">
+            <form string="Stock Moves" version="7.0">
+                <header>
+                    <span groups="base.group_user">
+                        <button name="force_assign" states="confirmed" string="Force Availability" type="object"/>
+                        <button name="action_confirm" states="draft" string="Confirm" type="object"/>
+                        <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object"/>
+                    </span>
+                        <field name="state" widget="statusbar" statusbar_visible="draft,assigned,done"/>
+                </header>
+                <group>
+                    <group>
+                        <field name="name" invisible="1"/>
+                        <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.partner_id)"/>
+                        <label for="product_qty"/>
+                        <div>
+                            <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_inline"/>
+                            <field name="product_uom" string="Unit Of Measure" groups="product.group_uom" class="oe_inline"/>
+                            <button name="%(stock.move_scrap)d"
+                                string="Scrap" type="action"
+                                icon="gtk-convert" context="{'scrap': True}"
+                                states="draft,waiting,confirmed,assigned"
+                                groups="base.group_user"/>
+                        </div>
+                            <label for="product_uos_qty" groups="product.group_uos"/>
+                            <div groups="product.group_uos">
+                                <field name="product_uos_qty" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" class="oe_inline"/>
+                                <field name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_inline"/>
+                            </div>
+                            <field name="product_packaging" groups="product.group_stock_packaging" domain="[('product_id','=',product_id)]"/>
+                            </group>
+                            <group>
+                                <field name="create_date" invisible="1"/>
+                                <field name="date"/>
+                                <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
+                            </group>
+
+                            <group string="Locations" groups="stock.group_locations">
+                                <field name="location_id" domain="[('usage','&lt;&gt;','view')]"/>
+                                <field name="location_dest_id" domain="[('usage','=','internal')]" groups="stock.group_locations"/>
+                            </group>
+
+                            <group groups="stock.group_tracking_lot" string="Traceability">
+                                <label for="tracking_id"/>
+                                <div>
+                                    <field name="tracking_id" groups="stock.group_tracking_lot" class="oe_inline"/>
+                                      <button name="%(split_into)d" 
+                                            string="New Pack" type="action"
+                                            groups="product.group_stock_packaging"
+                                            icon="terp-stock_effects-object-colorize"
+                                            states="draft,assigned,confirmed"/>
+                                 </div>
+
+                                  <label for="prodlot_id"/>
+                                  <div>
+                                        <field name="prodlot_id" groups="stock.group_production_lot"
+                                            context="{'location_id':location_id, 'product_id':product_id}"
+                                            domain="[('product_id','=?',product_id)]"
+                                            on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)" class="oe_inline"/>
+                                        <button name="%(track_line)d"
+                                            groups="stock.group_tracking_lot"
+                                            states="draft,waiting,confirmed,assigned"
+                                            string="Split" type="action" icon="terp-stock_effects-object-colorize"/>
+                            </div>
+                        </group>
+                    </group>
+                </form>
+            </field>
+        </record>
+
         <record id="view_move_search" model="ir.ui.view">
             <field name="name">stock.move.search</field>
             <field name="model">stock.move</field>

From 99a105b699b3d483022c8181737cab5b4d077865 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Wed, 29 Aug 2012 14:06:14 +0530
Subject: [PATCH 19/94] [IMP]stock : fixed delivery view error

bzr revid: mma@tinyerp.com-20120829083614-v9zkh79f4yhhmoy2
---
 addons/delivery/delivery_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 6a68d1a979f..5f28cbd95f5 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -306,7 +306,7 @@
 
         <record id="view_delivery_order_inherit_stock" model="ir.ui.view">
             <field name="name">stock.picking.out.form</field>
-            <field name="model">stock.picking</field>
+            <field name="model">stock.picking.out</field>
             <field name="inherit_id" ref="stock.view_picking_out_form"/>
             <field name="arch" type="xml">
                 <xpath expr="/form/header//button[@string='Create Invoice/Refund']" position="after">

From 07ef966c5bb53841ce81180ca6b958f0cb19a71d Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Wed, 29 Aug 2012 15:22:27 +0530
Subject: [PATCH 20/94] [IMP]stock : added a priority in tree view

bzr revid: mma@tinyerp.com-20120829095227-lx41lxyhg3tbyu4w
---
 addons/stock/stock_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 391b02fba9a..d6ae96cf121 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1162,6 +1162,7 @@
         <record id="view_move_picking_tree" model="ir.ui.view">
             <field name="name">stock.move.tree</field>
             <field name="model">stock.move</field>
+            <field eval="4" name="priority"/>
             <field name="arch" type="xml">
                 <tree colors="grey:scrapped == True" string="Stock Moves">
                     <field name="product_id"/>

From 64423a44d96e54d323155e53b92683150a84ea4a Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Wed, 29 Aug 2012 15:48:31 +0530
Subject: [PATCH 21/94] [IMP]stock : improve inheited view with new one

bzr revid: mma@tinyerp.com-20120829101831-ra14hkmadr517y9q
---
 addons/delivery/delivery_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 5f28cbd95f5..deb59983ef2 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -259,10 +259,10 @@
 
         <record id="view_picking_withweight_internal_move_form" model="ir.ui.view">
             <field name="name">stock.picking_withweight.internal.move.form.view</field>
-            <field name="model">stock.picking</field>
-            <field name="inherit_id" ref="stock.view_picking_form"/>
+            <field name="model">stock.move</field>
+            <field name="inherit_id" ref="stock.view_move_picking_tree"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/sheet/notebook/page/field[@name='move_lines']/tree/field[@name='product_uom']" position="after">
+                <xpath expr="//field[@name='product_uom']" position="after">
                     <field name="weight"/>
                     <field name="weight_net" groups="base.group_no_one"/>
                 </xpath>

From b185760c7bf5531d61ab0f165ecffcf07ac779ae Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Thu, 30 Aug 2012 12:22:55 +0530
Subject: [PATCH 22/94] [IMP]stock : added a new filed type for set a location
 in or out and make a onchane & default method for it and set action of moves
 for its view

bzr revid: mma@tinyerp.com-20120830065255-ogmp9xytwd3kr8f8
---
 addons/stock/stock.py       | 38 +++++++++++++++++++++++++++++++++++++
 addons/stock/stock_view.xml | 20 ++++++++++++++++++-
 2 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 7f0a744a62e..e49cc0ffa5c 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1653,6 +1653,7 @@ class stock_move(osv.osv):
 
         # used for colors in tree views:
         'scrapped': fields.related('location_dest_id','scrap_location',type='boolean',relation='stock.location',string='Scrapped', readonly=True),
+        'type': fields.selection([('out', 'Sending Goods'), ('in', 'Getting Goods'), ('internal', 'Internal')], 'Shipping Type', required=True, select=True, help="Shipping type specify, goods coming in or going out."),
     }
     def _check_location(self, cr, uid, ids, context=None):
         for record in self.browse(cr, uid, ids, context=context):
@@ -1732,10 +1733,27 @@ class stock_move(osv.osv):
         user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
         return user.company_id.partner_id.id
 
+    def _default_move_type(self, cr, uid, context=None):
+        """ Gets default type of move 
+        @return: type
+        """
+        picking_type = context.get('picking_type')
+        type = False
+        if context is None:
+            context = {}
+        if picking_type == 'in':
+            type = 'in'
+        elif picking_type == 'out':
+            type = 'out'
+        else: 
+            type = 'internal'
+        return type
+
     _defaults = {
         'location_id': _default_location_source,
         'location_dest_id': _default_location_destination,
         'partner_id': _default_destination_address,
+        'type': _default_move_type,
         'state': 'draft',
         'priority': '1',
         'product_qty': 1.0,
@@ -1889,6 +1907,26 @@ class stock_move(osv.osv):
             result['location_dest_id'] = loc_dest_id
         return {'value': result}
 
+    def onchange_move_type(self, cr, uid, ids, type, context=None):
+        """ On change of move type gives sorce and destination location.
+        @param type: Move Type
+        @return: Dictionary of values
+        """
+        mod_obj = self.pool.get('ir.model.data')
+        location_source_id = False
+        location_dest_id = False
+        if type == 'in':
+            location_source_id = 'stock_location_suppliers'
+            location_dest_id = 'stock_location_stock' 
+        elif type == 'out':
+            location_source_id = 'stock_location_stock' 
+            location_dest_id = 'stock_location_customers'
+        if location_source_id:
+            location_model, location_source_id = mod_obj.get_object_reference(cr, uid, 'stock', location_source_id)
+        if location_dest_id:
+            location_model, location_dest_id = mod_obj.get_object_reference(cr, uid, 'stock', location_dest_id)
+        return {'value':{'location_id': location_source_id, 'location_dest_id': location_dest_id}}
+
     def onchange_date(self, cr, uid, ids, date, date_expected, context=None):
         """ On change of Scheduled Date gives a Move date.
         @param date_expected: Scheduled Date
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index d6ae96cf121..cdce4c3dc94 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1126,6 +1126,7 @@
                     <field name="name"/>
                     <field name="picking_id" string="Reference"/>
                     <field name="origin"/>
+                    <field name="type" on_change="onchange_move_type(type)"/>
                     <field name="create_date" invisible="1" groups="base.group_no_one"/>
                     <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, False)"/>
                     <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
@@ -1239,6 +1240,7 @@
                         </group>
                         <group name="origin_grp" string="Origin">
                             <field name="picking_id"/>
+                             <field name="type" on_change="onchange_move_type(type)"/>
                             <field name="location_id" groups="stock.group_locations"/>
                             <field name="create_date" groups="base.group_no_one"/>
                         </group>
@@ -1279,7 +1281,7 @@
         <record id="view_move_picking_form" model="ir.ui.view">
             <field name="name">stock.move.form</field>
             <field name="model">stock.move</field>
-            <field eval="4" name="priority"/>
+            <field eval="2" name="priority"/>
             <field name="arch" type="xml">
             <form string="Stock Moves" version="7.0">
                 <header>
@@ -1294,6 +1296,7 @@
                     <group>
                         <field name="name" invisible="1"/>
                         <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.partner_id)"/>
+                        <field name="type" invisible="1"/>
                         <label for="product_qty"/>
                         <div>
                             <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_inline"/>
@@ -1400,6 +1403,21 @@
               </p>
             </field>
         </record>
+        
+        <record model="ir.actions.act_window.view" id="action_stock_move_tree_all">
+            <field name="sequence" eval="1"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_move_tree"/>
+            <field name="act_window_id" ref="action_move_form2"/>
+        </record>
+
+        <record model="ir.actions.act_window.view" id="action_stock_move_form_all">
+            <field name="sequence" eval="3"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_move_form"/>
+        <field name="act_window_id" ref="action_move_form2"/>
+        </record>
+
         <menuitem action="action_move_form2" id="menu_action_move_form2" parent="menu_traceability" sequence="3"/>
 
         <!--

From 5710f88977bc6ad3aa64702cff7d012518f86560 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Thu, 30 Aug 2012 18:19:52 +0530
Subject: [PATCH 23/94] [IMP]stock : pass a type of move in sale and purchase

bzr revid: mma@tinyerp.com-20120830124952-02bmcrfk33z0zff4
---
 addons/purchase/purchase.py | 1 +
 addons/sale/sale.py         | 1 +
 2 files changed, 2 insertions(+)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 756016d39e2..6d2997d4af6 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -543,6 +543,7 @@ class purchase_order(osv.osv):
             'partner_id': order.dest_address_id.id or order.partner_id.id,
             'move_dest_id': order_line.move_dest_id.id,
             'state': 'draft',
+            'type':'in',
             'purchase_line_id': order_line.id,
             'company_id': order.company_id.id,
             'price_unit': order_line.price_unit
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index c525ba04df1..e3dd277f24c 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -870,6 +870,7 @@ class sale_order(osv.osv):
             'sale_line_id': line.id,
             'tracking_id': False,
             'state': 'draft',
+            'type':'out',
             #'state': 'waiting',
             'note': '\n'.join(line.name.split('\n')[1:]),
             'company_id': order.company_id.id,

From 694a3ffced347f5e3a3e4c059ffc2ae0ce71ba34 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Thu, 30 Aug 2012 18:33:53 +0530
Subject: [PATCH 24/94] [IMP]stock : improve little bit code

bzr revid: mma@tinyerp.com-20120830130353-9pvgngbpoleef3f2
---
 addons/stock/stock.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index e49cc0ffa5c..f4997178c5e 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1738,15 +1738,13 @@ class stock_move(osv.osv):
         @return: type
         """
         picking_type = context.get('picking_type')
-        type = False
+        type = 'internal'
         if context is None:
             context = {}
         if picking_type == 'in':
             type = 'in'
         elif picking_type == 'out':
             type = 'out'
-        else: 
-            type = 'internal'
         return type
 
     _defaults = {

From 0dd1516ce2997371fc4a8b031cb17d3214849ec3 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Fri, 31 Aug 2012 11:52:01 +0530
Subject: [PATCH 25/94] [IMP]stock :set a appropriate access rights and groups
 for manager and user

bzr revid: mma@tinyerp.com-20120831062201-tyw9qvrf23eh8i3y
---
 addons/mrp/board_manufacturing_view.xml        | 3 ++-
 addons/purchase/board_purchase_view.xml        | 3 ++-
 addons/stock/report/report_stock_move_view.xml | 3 ++-
 addons/stock/security/ir.model.access.csv      | 4 ++--
 addons/stock/stock_view.xml                    | 4 ++--
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/addons/mrp/board_manufacturing_view.xml b/addons/mrp/board_manufacturing_view.xml
index e7668517a70..12d2f96454f 100644
--- a/addons/mrp/board_manufacturing_view.xml
+++ b/addons/mrp/board_manufacturing_view.xml
@@ -31,7 +31,8 @@
                   icon="terp-graph"
                   id="menu_board_manufacturing"
                   parent="base.menu_reporting_dashboard"
-                  sequence="30"/>
+                  sequence="30"
+                  groups="group_mrp_manager"/>
 
     </data>
 </openerp>
diff --git a/addons/purchase/board_purchase_view.xml b/addons/purchase/board_purchase_view.xml
index 67c3981f383..e41caddfd21 100644
--- a/addons/purchase/board_purchase_view.xml
+++ b/addons/purchase/board_purchase_view.xml
@@ -85,7 +85,8 @@
                   icon="terp-graph"
                   id="menu_board_purchase"
                   parent="base.menu_reporting_dashboard"
-                  sequence="20"/>
+                  sequence="20"
+                  groups="group_purchase_manager"/>
 
     </data>
 </openerp>
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index a78a506cefe..4c911dd6e7c 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -6,7 +6,8 @@
         id="stock.next_id_61"
         name="Warehouse"
         sequence="15"
-        parent="base.menu_reporting"/>
+        parent="base.menu_reporting"
+        groups="group_stock_manager"/>
 
     <record id="view_stock_tree" model="ir.ui.view">
         <field name="name">report.stock.move.tree</field>
diff --git a/addons/stock/security/ir.model.access.csv b/addons/stock/security/ir.model.access.csv
index f56696bcbaa..5dbc66df39b 100644
--- a/addons/stock/security/ir.model.access.csv
+++ b/addons/stock/security/ir.model.access.csv
@@ -21,9 +21,9 @@ access_stock_production_lot_manager,stock.production.lot manager,model_stock_pro
 access_stock_production_lot_user,stock.production.lot user,model_stock_production_lot,stock.group_stock_user,1,1,1,1
 access_stock_production_lot_revision,stock.production.lot.revision,model_stock_production_lot_revision,stock.group_stock_user,1,1,1,1
 access_stock_move_manager,stock.move manager,model_stock_move,stock.group_stock_manager,1,1,0,0
-access_stock_move_user,stock.move user,model_stock_move,stock.group_stock_user,1,0,0,0
+access_stock_move_user,stock.move user,model_stock_move,stock.group_stock_user,1,1,1,0
 access_stock_move_warehouse_manager,stock.move.manager,model_stock_move,stock.group_stock_manager,1,1,1,1
-access_stock_inventory_user,stock.inventory user,model_stock_inventory,stock.group_stock_user,1,0,0,0
+access_stock_inventory_user,stock.inventory user,model_stock_inventory,stock.group_stock_user,1,1,1,0
 access_stock_inventory_manager,stock.inventory manager,model_stock_inventory,stock.group_stock_manager,1,1,1,1
 access_stock_inventory_line_user,stock.inventory.line user,model_stock_inventory_line,stock.group_stock_user,1,0,0,0
 access_stock_inventory_line_manager,stock.inventory.line manager,model_stock_inventory_line,stock.group_stock_manager,1,1,1,1
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index cdce4c3dc94..63b006e2369 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -107,8 +107,8 @@
                 <form string="Physical Inventory" version="7.0">
                 <header>
                     <button name="%(action_view_stock_fill_inventory)d" string="Import Inventory" type="action" class="oe_highlight"/>
-                    <button name="action_confirm" states="draft" string="Confirm Inventory" type="object" class="oe_highlight"/>
-                    <button name="action_done" states="confirm" string="Validate Inventory" type="object" class="oe_highlight"/>
+                    <button name="action_confirm" states="draft" string="Confirm Inventory" type="object" class="oe_highlight" groups="stock.group_stock_user"/>
+                    <button name="action_done" states="confirm" string="Validate Inventory" type="object" class="oe_highlight" groups="stock.group_stock_manager"/>
                     <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
                     <button name="action_cancel_inventory" states="draft,confirm,done" string="Cancel Inventory" type="object"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>

From 1ff9edff22276588a92ecdb276329e37bc8a76bf Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Fri, 31 Aug 2012 11:56:37 +0530
Subject: [PATCH 26/94] [IMP]stock : improve little bit

bzr revid: mma@tinyerp.com-20120831062637-ypnga3qcb0ab0bo7
---
 addons/stock/stock.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index f4997178c5e..d8695752c46 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1737,10 +1737,10 @@ class stock_move(osv.osv):
         """ Gets default type of move 
         @return: type
         """
-        picking_type = context.get('picking_type')
-        type = 'internal'
         if context is None:
             context = {}
+        picking_type = context.get('picking_type')
+        type = 'internal'
         if picking_type == 'in':
             type = 'in'
         elif picking_type == 'out':

From 36874b2911e816920968e472d56847240c63a0ac Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Mon, 3 Sep 2012 17:00:15 +0530
Subject: [PATCH 27/94] [IMP]purchase : set group on warehouse filed

bzr revid: mma@tinyerp.com-20120903113015-ql8lpem6idnusp2r
---
 addons/purchase/stock_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml
index ad1c26a84c1..ab649e37e47 100644
--- a/addons/purchase/stock_view.xml
+++ b/addons/purchase/stock_view.xml
@@ -31,7 +31,7 @@
                     <field name="purchase_id"/>
                 </xpath>
                 <xpath expr="//field[@name='company_id']" position="after">
-                    <field name="warehouse_id"/>
+                    <field name="warehouse_id" groups="stock.group_locations"/>
                 </xpath>
             </field>
         </record>

From 374dd5524de55d6e4f9167b37a16f773270ca053 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Tue, 4 Sep 2012 12:35:27 +0530
Subject: [PATCH 28/94] [IMP]stock : give a user access to create invenoty line

bzr revid: mma@tinyerp.com-20120904070527-da3xgu1sxrdrlp55
---
 addons/stock/security/ir.model.access.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/security/ir.model.access.csv b/addons/stock/security/ir.model.access.csv
index 5dbc66df39b..f0a3e68d810 100644
--- a/addons/stock/security/ir.model.access.csv
+++ b/addons/stock/security/ir.model.access.csv
@@ -25,7 +25,7 @@ access_stock_move_user,stock.move user,model_stock_move,stock.group_stock_user,1
 access_stock_move_warehouse_manager,stock.move.manager,model_stock_move,stock.group_stock_manager,1,1,1,1
 access_stock_inventory_user,stock.inventory user,model_stock_inventory,stock.group_stock_user,1,1,1,0
 access_stock_inventory_manager,stock.inventory manager,model_stock_inventory,stock.group_stock_manager,1,1,1,1
-access_stock_inventory_line_user,stock.inventory.line user,model_stock_inventory_line,stock.group_stock_user,1,0,0,0
+access_stock_inventory_line_user,stock.inventory.line user,model_stock_inventory_line,stock.group_stock_user,1,1,1,0
 access_stock_inventory_line_manager,stock.inventory.line manager,model_stock_inventory_line,stock.group_stock_manager,1,1,1,1
 access_stock_report_prodlots,stock.report.prodlots,model_stock_report_prodlots,stock.group_stock_manager,1,0,0,0
 access_stock_location_sale_manager,stock.location sale manager,model_stock_location,base.group_sale_manager,1,0,0,0

From c5fa8a77c9e174fa4d4072b8b560126f8d934829 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Tue, 4 Sep 2012 14:05:29 +0530
Subject: [PATCH 29/94] [IMP]sale : give a user right to quotation menu

bzr revid: mma@tinyerp.com-20120904083529-qgo0fcvo1wqepc78
---
 addons/sale/sale_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index a0e69efe849..cee4dc38bf4 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -450,7 +450,7 @@
 
         <menuitem id="menu_sale_quotations"
         action="action_order_tree5" parent="base.menu_sales"
-        sequence="4"/>
+        sequence="4" groups="base.group_sale_salesman_all_leads"/>
 
         <record id="action_order_tree" model="ir.actions.act_window">
             <field name="name">Old Quotations</field>

From cf42513f428319efe4cc9cd79dae0e9f72711255 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Thu, 6 Sep 2012 12:30:45 +0530
Subject: [PATCH 30/94] [IMP]stock : set button top right side

bzr revid: mma@tinyerp.com-20120906070045-1ff2sedb67t2s52w
---
 addons/stock/stock_view.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 63b006e2369..e78008d14bf 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -106,7 +106,6 @@
             <field name="arch" type="xml">
                 <form string="Physical Inventory" version="7.0">
                 <header>
-                    <button name="%(action_view_stock_fill_inventory)d" string="Import Inventory" type="action" class="oe_highlight"/>
                     <button name="action_confirm" states="draft" string="Confirm Inventory" type="object" class="oe_highlight" groups="stock.group_stock_user"/>
                     <button name="action_done" states="confirm" string="Validate Inventory" type="object" class="oe_highlight" groups="stock.group_stock_manager"/>
                     <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
@@ -114,6 +113,9 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
                 </header>
                 <sheet>
+                    <div class="oe_right oe_button_box">
+                        <button name="%(action_view_stock_fill_inventory)d" string="Import Inventory" type="action" />
+                    </div>
                     <div>
                         <label for="name" class="oe_edit_only"/>
                         <field name="name" placeholder="e.g. Annual inventory" class="oe_inline"/> -

From 6f888ccb5e62753465fb2c04cc2ab16cf1824dbc Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Thu, 6 Sep 2012 15:14:04 +0530
Subject: [PATCH 31/94] [IMP]Set title again which is replace by
 on_record_loaded method.

bzr revid: vme@tinyerp.com-20120906094404-ufxfcls2f6vntnob
---
 addons/board/static/src/js/dashboard.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/addons/board/static/src/js/dashboard.js b/addons/board/static/src/js/dashboard.js
index 0333690aa57..cdb5193c712 100644
--- a/addons/board/static/src/js/dashboard.js
+++ b/addons/board/static/src/js/dashboard.js
@@ -24,6 +24,10 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({
             scroll: false
         }).bind('sortstop', self.do_save_dashboard);
 
+        var old_title = this.__parentedParent.get('title');
+        this.__parentedParent.on_record_loaded.add_last(function(){
+            self.__parentedParent.set({ 'title' : old_title});
+        });
         // Events
         this.$el.find('.oe_dashboard_link_reset').click(this.on_reset);
         this.$el.find('.oe_dashboard_link_change_layout').click(this.on_change_layout);

From e89e8c75c06d90e7d8da84e230934b3980397b8c Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Fri, 7 Sep 2012 16:58:34 +0530
Subject: [PATCH 32/94] [IMP] sale: added function field & did some other
 changes

bzr revid: cha@tinyerp.com-20120907112834-affnrfgzjc3hsnu1
---
 addons/sale/sale.py       | 50 +++++++++++++++++++++++----------------
 addons/sale/sale_view.xml |  3 ++-
 2 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index e983abb7962..eedab3bce8d 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -145,6 +145,22 @@ class sale_order(osv.osv):
                 res[sale.id] = 0.0
         return res
 
+    def _get_invoiced_amount(self, cr, uid, sale_object, context=None):
+        invoiced_amount = 0
+        for invoice in sale_object.invoice_ids:
+            if invoice.state!='cancel':
+                invoiced_amount += invoice.amount_total
+        return invoiced_amount
+
+    def _partial_invoiced(self, cursor, user, ids, name, arg, context=None):
+        res = {}
+        for sale in self.browse(cursor, user, ids, context=context):
+            res[sale.id] = True
+            invoiced_amount = self._get_invoiced_amount(cursor, user, sale, context=context)
+            if not invoiced_amount or invoiced_amount == sale.amount_total and sale.invoiced:
+                res[sale.id] = False
+        return res
+
     def _invoiced(self, cursor, user, ids, name, arg, context=None):
         res = {}
         for sale in self.browse(cursor, user, ids, context=context):
@@ -156,7 +172,8 @@ class sale_order(osv.osv):
                     if invoice.state != 'paid':
                         res[sale.id] = False
                         break
-            if not invoice_existence:
+            invoiced_amount = self._get_invoiced_amount(cursor, user, sale, context=context)
+            if invoiced_amount != sale.amount_total or not invoice_existence:
                 res[sale.id] = False
         return res
 
@@ -245,6 +262,8 @@ class sale_order(osv.osv):
         'invoiced_rate': fields.function(_invoiced_rate, string='Invoiced', type='float'),
         'invoiced': fields.function(_invoiced, string='Paid',
             fnct_search=_invoiced_search, type='boolean', help="It indicates that an invoice has been paid."),
+        'partial_invoiced': fields.function(_partial_invoiced, string='Partial invoiced',
+            fnct_search=_invoiced_search, type='boolean', help="It indicates that sale order has been partially invoiced."),
         'note': fields.text('Terms and conditions'),
 
         'amount_untaxed': fields.function(_amount_all, digits_compute= dp.get_precision('Account'), string='Untaxed Amount',
@@ -518,33 +537,22 @@ class sale_order(osv.osv):
         This function returns an action that display existing invoices of given sale order ids. It can either be a in a list or in a form view, if there is only one invoice to show.
         '''
         mod_obj = self.pool.get('ir.model.data')
-        result = {
-            'name': _('Cutomer Invoice'),
-            'view_type': 'form',
-            'res_model': 'account.invoice',
-            'context': "{'type':'out_invoice', 'journal_type': 'sale'}",
-            'type': 'ir.actions.act_window',
-            'nodestroy': True,
-            'target': 'current',
-        }
+        act_obj = self.pool.get('ir.actions.act_window')
+
+        result = mod_obj.get_object_reference(cr, uid, 'account', 'action_invoice_tree1')
+        id = result and result[1] or False
+        result = act_obj.read(cr, uid, [id], context=context)[0]
         #compute the number of invoices to display
         inv_ids = []
         for so in self.browse(cr, uid, ids, context=context):
             inv_ids += [invoice.id for invoice in so.invoice_ids]
         #choose the view_mode accordingly
-        if len(inv_ids)>1:
-            res = mod_obj.get_object_reference(cr, uid, 'account', 'invoice_tree')
-            result.update({
-                'view_mode': 'tree,form',
-                'res_id': inv_ids or False
-            })
+        if len(inv_ids) > 1:
+            result['domain'] = "[('id','in',["+','.join(map(str, inv_ids))+"])]"
         else:
             res = mod_obj.get_object_reference(cr, uid, 'account', 'invoice_form')
-            result.update({
-                'view_mode': 'form',
-                'res_id': inv_ids and inv_ids[0] or False,
-            })
-        result.update(view_id = res and res[1] or False)
+            result['views'] = [(res and res[1] or False, 'form')]
+            result['res_id'] = inv_ids and inv_ids[0] or False
         return result
 
 
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 63b1f7ada3e..b1d84d9d470 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -163,7 +163,7 @@
                             <button name="action_button_confirm" states="draft" string="Confirm" type="object"/>
                             <button name="action_button_confirm" states="sent" string="Confirm" class="oe_highlight" type="object"/>
                             <button name="action_view_invoice" string="View Invoice" type="object" class="oe_highlight"
-                              attrs="{'invisible': ['|','|',('state', '!=','progress'), ('invoiced', '=', True),('order_policy','=','picking')]}"/>
+                              attrs="{'invisible': ['|', '|', '|', ('state', 'not in',('progress','manual')), ('invoiced', '=', True), ('partial_invoiced', '=', False), ('order_policy','=','picking')]}"/>
                             <button name="action_view_delivery" string="View Delivery Order" type="object" class="oe_highlight"
                               attrs="{'invisible': ['|','|','|',('picking_ids','=',False),('picking_ids','=',[]), ('state', 'not in', ('progress','manual')),('shipped','=',True)]}"/>
                             <button name="%(action_view_sale_advance_payment_inv)d" string="Create Invoice"
@@ -320,6 +320,7 @@
                                 <group>
                                     <field name="invoiced"/>
                                     <field name="shipped"/>
+                                    <field name="partial_invoiced"/>
                                 </group>
                             </group>
                         </page>

From e82782e1f6baab9471995dfa0db5dac13528abd2 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Fri, 7 Sep 2012 17:40:28 +0530
Subject: [PATCH 33/94] [FIX]: replace vote_user_ids inplace  of vote_ids.
 write or update vote_ids

bzr revid: atp@tinyerp.com-20120907121028-oyklpcccxb0ewv21
---
 addons/mail/mail_message.py         | 19 ++++++++++++++-----
 addons/mail/static/src/js/mail.js   | 21 +++++++++------------
 addons/mail/static/src/xml/mail.xml |  4 ++--
 3 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 652c95d1b05..1a2cd1881ed 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -124,7 +124,7 @@ class mail_message(osv.Model):
         'unread': fields.function(_get_unread, fnct_search=_search_unread,
             type='boolean', string='Unread',
             help='Functional field to search for unread messages linked to uid'),
-        'vote_ids': fields.one2many('mail.vote', 'msg_id', 'Votes'),            
+        'vote_user_ids': fields.many2many('mail.vote', 'message_vote_rel', 'message_id', 'vote_id', 'Votes'),
 
     }
 
@@ -154,13 +154,14 @@ class mail_message(osv.Model):
         vote_pool = self.pool.get('mail.vote')
         new_vote_id = False
         for message in self.browse(cr, uid, ids, context):
-            voters_ids = [x.id for x in message.vote_ids if x.user_id.id == uid]
+            voters_ids = [x.id for x in message.vote_user_ids if x.user_id.id == uid]
             if not voters_ids:
                 new_vote_id =  vote_pool.create(cr, uid, {'msg_id': message.id, 'user_id': uid}, context=context)
-            else:    
+                self.write(cr, uid, ids, {'vote_user_ids': [(4, new_vote_id)]}, context=context)
+            else:
+                self.write(cr, uid, ids, {'vote_user_ids': [(3, voters_ids[0])]}, context=context)
                 vote_pool.unlink(cr, uid, voters_ids, context=context)
-        return True                
-
+        return True
 
     #------------------------------------------------------
     # Message loading for web interface
@@ -168,7 +169,13 @@ class mail_message(osv.Model):
 
     def _message_dict_get(self, cr, uid, msg, context=None):
         """ Return a dict representation of the message browse record. """
+        vote_pool = self.pool.get('mail.vote')
         attachment_ids = self.pool.get('ir.attachment').name_get(cr, uid, [x.id for x in msg.attachment_ids], context=context)
+        vote_ids = vote_pool.name_get(cr, uid, [x.id for x in msg.vote_user_ids], context=context)
+        has_voted = False;
+        for vote in msg.vote_user_ids:
+            if (uid == vote.user_id.id):
+              has_voted = True;
         author_id = self.pool.get('res.partner').name_get(cr, uid, [msg.author_id.id], context=context)[0]
         author_user_id = self.pool.get('res.users').name_get(cr, uid, [msg.author_id.user_ids[0].id], context=context)[0]
         partner_ids = self.pool.get('res.partner').name_get(cr, uid, [x.id for x in msg.partner_ids], context=context)
@@ -186,6 +193,8 @@ class mail_message(osv.Model):
             'author_user_id': author_user_id,
             'partner_ids': partner_ids,
             'child_ids': [],
+            'vote_user_ids': vote_ids,
+            'has_voted': has_voted
         }
 
     def message_read_tree_flatten(self, cr, uid, messages, current_level, level, context=None):
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index e902451ee1b..026808f8905 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -289,19 +289,16 @@ openerp.mail = function(session) {
 
         render_vote: function(message_id){
             var self = this;
-            var mail_vote = new session.web.DataSetSearch(self, 'mail.vote', self.session.context, [['msg_id','=',parseInt(message_id)]]);
-            mail_vote.read_slice(['user_id']).then(function(result){
-                vote_count = result.length;
-                is_vote_liked = false;
-                _.each(result, function(vote){
-                    if (self.session.uid == vote.user_id[0]){
-                        is_vote_liked = true;
-                    }
-                });
+            this.ds_message.call('message_read', [[parseInt(message_id)]]).then(function(result){
+                vote_count = 0;
+                if (result[0].vote_user_ids){length
+                	vote_count = result[0].vote_user_ids.length;
+                }
                 parent_element = self.find_parent_element(".oe_mail_msg_vote", message_id);
-                vote_element = session.web.qweb.render('VoteDisplay', {'msg_id': message_id, 'vote_count': vote_count, 'is_vote_liked': is_vote_liked});
+                vote_element = session.web.qweb.render('VoteDisplay', {'msg_id': message_id, 'vote_count': vote_count, 'has_voted': result[0].has_voted});
                 $(parent_element).html(vote_element);
                 self.add_vote_event($(parent_element));
+                
             });
         },
         
@@ -446,8 +443,6 @@ openerp.mail = function(session) {
             var self = this;
             var _expendable = false;
             _(records).each(function (record) {
-                //Render Votes.
-                self.render_vote(record.id);
                 if (record.type == 'expandable') {
                     _expendable = true;
                     self.update_fetch_more(true);
@@ -484,6 +479,8 @@ openerp.mail = function(session) {
          * - record.is_author: is the current user the author of the record */
         display_record: function (record) {
             // formatting and additional fields
+            //Render Votes.
+            this.render_vote(record.id);
             record.date = session.web.format_value(record.date, {type:"datetime"});
             record.timerelative = $.timeago(record.date);
             if (record.type == 'email') {
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 2cab9825946..3b3a5d2de9e 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -98,12 +98,12 @@
              <span class="oe_left oe_mail_vote_string">Votes :<t t-esc="vote_count"/></span>
         </t>
         <li>
-        <t t-if="!is_vote_liked">
+        <t t-if="!has_voted">
             <button class="oe_mail_msg_vote_like" t-att-data-id="msg_id" title="Click to Vote.">
                 <span>+1</span>
             </button>
         </t>
-        <t t-if="is_vote_liked">
+        <t t-if="has_voted">
             <button class="oe_mail_msg_vote_like" t-att-data-id="msg_id" title="Click to Unvote." style="background:#DC5F59; padding:1px">
                 <span>-1</span>
             </button>

From 56f7b22cc02f2eb6dbf34ade58aab5472e9ad5fb Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Fri, 7 Sep 2012 17:59:36 +0530
Subject: [PATCH 34/94] [REM]: Remove unused length

bzr revid: atp@tinyerp.com-20120907122936-tyk4kdapozh8ed0n
---
 addons/mail/static/src/js/mail.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 026808f8905..750df7aed41 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -291,7 +291,7 @@ openerp.mail = function(session) {
             var self = this;
             this.ds_message.call('message_read', [[parseInt(message_id)]]).then(function(result){
                 vote_count = 0;
-                if (result[0].vote_user_ids){length
+                if (result[0].vote_user_ids){
                 	vote_count = result[0].vote_user_ids.length;
                 }
                 parent_element = self.find_parent_element(".oe_mail_msg_vote", message_id);

From cd0be77ffac765ed3160a2a812bef9ca5b91d8a4 Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Fri, 7 Sep 2012 18:24:53 +0530
Subject: [PATCH 35/94] [IMP]implement CSs

bzr revid: vme@tinyerp.com-20120907125453-rowm6tydm09rxpfm
---
 addons/board/static/src/css/dashboard.css  | 33 ++++++++++++++++++++++
 addons/board/static/src/css/dashboard.sass | 26 +++++++++++++++++
 2 files changed, 59 insertions(+)

diff --git a/addons/board/static/src/css/dashboard.css b/addons/board/static/src/css/dashboard.css
index 6907b4271a0..095893b2c97 100644
--- a/addons/board/static/src/css/dashboard.css
+++ b/addons/board/static/src/css/dashboard.css
@@ -1,3 +1,36 @@
+.openerp .oe_dashboard_layout_1 .oe_dashboard_column.index_0 {
+  width: 100%;
+}
+.openerp .oe_dashboard_layout_1 .oe_dashboard_column.index_1, .openerp .oe_dashboard_layout_1 .oe_dashboard_column.index_2 {
+  display: none;
+}
+.openerp .oe_dashboard_layout_1-1 .oe_dashboard_column {
+  width: 50%;
+}
+.openerp .oe_dashboard_layout_1-1 .oe_dashboard_column.index_2 {
+  display: none;
+}
+.openerp .oe_dashboard_layout_1-1-1 .oe_dashboard_column {
+  width: 33%;
+}
+.openerp .oe_dashboard_layout_2-1 .oe_dashboard_column.index_0 {
+  width: 70%;
+}
+.openerp .oe_dashboard_layout_2-1 .oe_dashboard_column.index_1 {
+  width: 30%;
+}
+.openerp .oe_dashboard_layout_2-1 .oe_dashboard_column.index_2 {
+  display: none;
+}
+.openerp .oe_dashboard_layout_1-2 .oe_dashboard_column.index_0 {
+  width: 30%;
+}
+.openerp .oe_dashboard_layout_1-2 .oe_dashboard_column.index_1 {
+  width: 70%;
+}
+.openerp .oe_dashboard_layout_1-2 .oe_dashboard_column.index_2 {
+  display: none;
+}
 .openerp .oe_dashboard_links {
   text-align: right;
   margin: 0 4px 6px 0;
diff --git a/addons/board/static/src/css/dashboard.sass b/addons/board/static/src/css/dashboard.sass
index 4bacc7bd892..b97f7831cd6 100644
--- a/addons/board/static/src/css/dashboard.sass
+++ b/addons/board/static/src/css/dashboard.sass
@@ -9,6 +9,31 @@
   box-shadow: $bsval
 
 .openerp
+  .oe_dashboard_layout_1 .oe_dashboard_column
+    &.index_0
+      width: 100%
+    &.index_1, &.index_2
+      display: none
+  .oe_dashboard_layout_1-1 .oe_dashboard_column
+    width: 50% 
+    &.index_2
+      display: none
+  .oe_dashboard_layout_1-1-1 .oe_dashboard_column
+    width: 33% 
+  .oe_dashboard_layout_2-1 .oe_dashboard_column
+    &.index_0
+      width: 70%
+    &.index_1
+      width: 30%
+    &.index_2
+      display: none
+  .oe_dashboard_layout_1-2 .oe_dashboard_column
+    &.index_0
+      width: 30%
+    &.index_1
+      width: 70%
+    &.index_2
+      display: none
   .oe_dashboard_links
     text-align: right
     margin: 0 4px 6px 0
@@ -86,3 +111,4 @@
           > tbody
             tr:nth-child(odd)
               background: transparent
+

From 4fc67d7a5d7d8bbd6180cc717c0f267c5ec0e1c1 Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Fri, 7 Sep 2012 18:41:49 +0530
Subject: [PATCH 36/94] [IMP]show reset button on debug mode.

bzr revid: vme@tinyerp.com-20120907131149-4z5vjfha0bfi8rb7
---
 addons/board/static/src/js/dashboard.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/board/static/src/js/dashboard.js b/addons/board/static/src/js/dashboard.js
index cdb5193c712..8da4f6cf7b5 100644
--- a/addons/board/static/src/js/dashboard.js
+++ b/addons/board/static/src/js/dashboard.js
@@ -17,7 +17,10 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({
     start: function() {
         var self = this;
         this._super.apply(this, arguments);
-
+        
+        if(!this.session.debug)
+            this.$el.find(".oe_dashboard_links button:first").css("display", "none");
+            
         this.$el.find('.oe_dashboard_column').sortable({
             connectWith: '.oe_dashboard_column',
             handle: '.oe_header',

From 1401d52c9ef0481634e7d49e76f381d9b9883e82 Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Tue, 11 Sep 2012 11:52:15 +0530
Subject: [PATCH 37/94] [IMP] sale: made 'manual_order_polity.yml' not to test

bzr revid: cha@tinyerp.com-20120911062215-nles25g1jgtck0bv
---
 addons/sale/__openerp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py
index aa712f1d7b5..91869a60aad 100644
--- a/addons/sale/__openerp__.py
+++ b/addons/sale/__openerp__.py
@@ -88,7 +88,7 @@ Dashboard for Sales Manager that includes:
     'test': [
         'test/sale_order_demo.yml',
         'test/picking_order_policy.yml',
-        'test/manual_order_policy.yml',
+        #'test/manual_order_policy.yml',
         'test/prepaid_order_policy.yml',
         'test/cancel_order.yml',
         'test/delete_order.yml',

From ce3ebe5cebf8b040dae066ac8077aacf4aed2b3d Mon Sep 17 00:00:00 2001
From: "Bhumi Thakkar (Open ERP)" <bth@tinyerp.com>
Date: Tue, 11 Sep 2012 12:12:51 +0530
Subject: [PATCH 38/94] [IMP] For firefox browser css apply on blockUI.

bzr revid: bth@tinyerp.com-20120911064251-vh6j1au1lzpj0k44
---
 addons/web/static/lib/jquery.blockUI/jquery.blockUI.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/lib/jquery.blockUI/jquery.blockUI.js b/addons/web/static/lib/jquery.blockUI/jquery.blockUI.js
index 04db883c76e..6aba71ec58d 100644
--- a/addons/web/static/lib/jquery.blockUI/jquery.blockUI.js
+++ b/addons/web/static/lib/jquery.blockUI/jquery.blockUI.js
@@ -260,13 +260,14 @@ function install(el, opts) {
 			lyr3.css(themedCSS);
 			lyr3.addClass('ui-widget-content');
 		}
-		else 
+		else
 			lyr3.css(css);
 	}
-
 	// style the overlay
 	if (!opts.theme && (!opts.applyPlatformOpacityRules || !($.browser.mozilla && /Linux/.test(navigator.platform))))
-		lyr2.css(opts.overlayCSS);
+        lyr2.css(opts.overlayCSS);
+	if ($.browser.mozilla && /Linux/.test(navigator.platform))
+        lyr2.css(opts.overlayCSS);
 	lyr2.css('position', full ? 'fixed' : 'absolute');
 
 	// make iframe layer transparent in IE

From 75de060cd836578962788a61c4a2728aedd95d80 Mon Sep 17 00:00:00 2001
From: "Bhumi Thakkar (Open ERP)" <bth@tinyerp.com>
Date: Tue, 11 Sep 2012 12:27:11 +0530
Subject: [PATCH 39/94] [IMP] Indentation.

bzr revid: bth@tinyerp.com-20120911065711-hm4ka55a3g4g6e9j
---
 addons/web/static/lib/jquery.blockUI/jquery.blockUI.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/lib/jquery.blockUI/jquery.blockUI.js b/addons/web/static/lib/jquery.blockUI/jquery.blockUI.js
index 6aba71ec58d..58c11f46f9f 100644
--- a/addons/web/static/lib/jquery.blockUI/jquery.blockUI.js
+++ b/addons/web/static/lib/jquery.blockUI/jquery.blockUI.js
@@ -265,9 +265,9 @@ function install(el, opts) {
 	}
 	// style the overlay
 	if (!opts.theme && (!opts.applyPlatformOpacityRules || !($.browser.mozilla && /Linux/.test(navigator.platform))))
-        lyr2.css(opts.overlayCSS);
+            lyr2.css(opts.overlayCSS);
 	if ($.browser.mozilla && /Linux/.test(navigator.platform))
-        lyr2.css(opts.overlayCSS);
+            lyr2.css(opts.overlayCSS);
 	lyr2.css('position', full ? 'fixed' : 'absolute');
 
 	// make iframe layer transparent in IE

From 8e976060ee97de27dd7eacca4644686df6ed78c2 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Tue, 11 Sep 2012 12:31:45 +0530
Subject: [PATCH 40/94] [IMP]: iterate for result instead of result[0]

bzr revid: atp@tinyerp.com-20120911070145-bkj5y3redpxyfvu3
---
 addons/mail/static/src/js/mail.js | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index a957a1386f8..db0099ca33e 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -291,14 +291,15 @@ openerp.mail = function(session) {
             var self = this;
             this.ds_message.call('message_read', [[parseInt(message_id)]]).then(function(result){
                 vote_count = 0;
-                if (result[0].vote_user_ids){
-                	vote_count = result[0].vote_user_ids.length;
-                }
-                parent_element = self.find_parent_element(".oe_mail_msg_vote", message_id);
-                vote_element = session.web.qweb.render('VoteDisplay', {'msg_id': message_id, 'vote_count': vote_count, 'has_voted': result[0].has_voted});
-                $(parent_element).html(vote_element);
-                self.add_vote_event($(parent_element));
-                
+                _.each(result, function(res){
+	                if (res.vote_user_ids){
+	                	vote_count = res.vote_user_ids.length;
+	                }
+	                parent_element = self.find_parent_element(".oe_mail_msg_vote", message_id);
+	                vote_element = session.web.qweb.render('VoteDisplay', {'msg_id': message_id, 'vote_count': vote_count, 'has_voted': res.has_voted});
+	                $(parent_element).html(vote_element);
+	                self.add_vote_event($(parent_element));
+	            });
             });
         },
         

From cbe44438b2ab31143821e56809a296c3fbcf531a Mon Sep 17 00:00:00 2001
From: "Purnendu Singh (OpenERP)" <psi@tinyerp.com>
Date: Tue, 11 Sep 2012 15:09:18 +0530
Subject: [PATCH 41/94] [IMP] small code improvment

bzr revid: psi@tinyerp.com-20120911093918-2pf605tadf0u6jkb
---
 addons/sale/__openerp__.py | 2 +-
 addons/sale/sale.py        | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py
index 91869a60aad..aa712f1d7b5 100644
--- a/addons/sale/__openerp__.py
+++ b/addons/sale/__openerp__.py
@@ -88,7 +88,7 @@ Dashboard for Sales Manager that includes:
     'test': [
         'test/sale_order_demo.yml',
         'test/picking_order_policy.yml',
-        #'test/manual_order_policy.yml',
+        'test/manual_order_policy.yml',
         'test/prepaid_order_policy.yml',
         'test/cancel_order.yml',
         'test/delete_order.yml',
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index eedab3bce8d..89d9a694485 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -145,9 +145,9 @@ class sale_order(osv.osv):
                 res[sale.id] = 0.0
         return res
 
-    def _get_invoiced_amount(self, cr, uid, sale_object, context=None):
+    def _get_invoiced_amount(self, cr, uid, sale, context=None):
         invoiced_amount = 0
-        for invoice in sale_object.invoice_ids:
+        for invoice in sale.invoice_ids:
             if invoice.state!='cancel':
                 invoiced_amount += invoice.amount_total
         return invoiced_amount
@@ -173,7 +173,7 @@ class sale_order(osv.osv):
                         res[sale.id] = False
                         break
             invoiced_amount = self._get_invoiced_amount(cursor, user, sale, context=context)
-            if invoiced_amount != sale.amount_total or not invoice_existence:
+            if invoiced_amount != sale.amount_total and not invoice_existence:
                 res[sale.id] = False
         return res
 

From 84ae2ce144cb39256e6d0cc0056ef29664a0548f Mon Sep 17 00:00:00 2001
From: "Bhumi Thakkar (Open ERP)" <bth@tinyerp.com>
Date: Tue, 11 Sep 2012 15:15:08 +0530
Subject: [PATCH 42/94] [IMP] Pass parameter for clear_breadcrumbs with server
 action.

bzr revid: bth@tinyerp.com-20120911094508-eby3d04wo4cevhzn
---
 addons/web/static/src/js/views.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 90709276bdf..b2d80489e5f 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -327,7 +327,7 @@ instance.web.ActionManager = instance.web.Widget.extend({
         }
         this.dialog_stop();
     },
-    ir_actions_server: function (action, on_closed) {
+    ir_actions_server: function (action, on_closed, clear_breadcrumbs) {
         var self = this;
         this.rpc('/web/action/run', {
             action_id: action.id,

From 73dc43adc66ce4ce51b4a2468504d84bc32ebe1f Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Tue, 11 Sep 2012 16:51:33 +0530
Subject: [PATCH 43/94] [IMP] sale: change some code of functions & change name
 of field

bzr revid: cha@tinyerp.com-20120911112133-55m46wi003k28ikn
---
 addons/sale/sale.py       | 16 +++++++---------
 addons/sale/sale_view.xml |  4 ++--
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 89d9a694485..f86d5722da2 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -152,13 +152,12 @@ class sale_order(osv.osv):
                 invoiced_amount += invoice.amount_total
         return invoiced_amount
 
-    def _partial_invoiced(self, cursor, user, ids, name, arg, context=None):
+    def _invoice_exists(self, cursor, user, ids, name, arg, context=None):
         res = {}
         for sale in self.browse(cursor, user, ids, context=context):
-            res[sale.id] = True
-            invoiced_amount = self._get_invoiced_amount(cursor, user, sale, context=context)
-            if not invoiced_amount or invoiced_amount == sale.amount_total and sale.invoiced:
-                res[sale.id] = False
+            res[sale.id] = False
+            if sale.invoice_ids:
+                res[sale.id] = True
         return res
 
     def _invoiced(self, cursor, user, ids, name, arg, context=None):
@@ -172,8 +171,7 @@ class sale_order(osv.osv):
                     if invoice.state != 'paid':
                         res[sale.id] = False
                         break
-            invoiced_amount = self._get_invoiced_amount(cursor, user, sale, context=context)
-            if invoiced_amount != sale.amount_total and not invoice_existence:
+            if not invoice_existence or sale.state == 'manual':
                 res[sale.id] = False
         return res
 
@@ -262,8 +260,8 @@ class sale_order(osv.osv):
         'invoiced_rate': fields.function(_invoiced_rate, string='Invoiced', type='float'),
         'invoiced': fields.function(_invoiced, string='Paid',
             fnct_search=_invoiced_search, type='boolean', help="It indicates that an invoice has been paid."),
-        'partial_invoiced': fields.function(_partial_invoiced, string='Partial invoiced',
-            fnct_search=_invoiced_search, type='boolean', help="It indicates that sale order has been partially invoiced."),
+        'invoice_exists': fields.function(_invoice_exists, string='Invoiced',
+            fnct_search=_invoiced_search, type='boolean', help="It indicates that sale order has at least one invoice."),
         'note': fields.text('Terms and conditions'),
 
         'amount_untaxed': fields.function(_amount_all, digits_compute= dp.get_precision('Account'), string='Untaxed Amount',
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index b1d84d9d470..b6ad83683dc 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -163,7 +163,7 @@
                             <button name="action_button_confirm" states="draft" string="Confirm" type="object"/>
                             <button name="action_button_confirm" states="sent" string="Confirm" class="oe_highlight" type="object"/>
                             <button name="action_view_invoice" string="View Invoice" type="object" class="oe_highlight"
-                              attrs="{'invisible': ['|', '|', '|', ('state', 'not in',('progress','manual')), ('invoiced', '=', True), ('partial_invoiced', '=', False), ('order_policy','=','picking')]}"/>
+                              attrs="{'invisible': ['|', '|', '|', ('state', 'not in',('progress','manual')), ('invoiced', '=', True), ('invoice_exists', '=', False), ('order_policy','=','picking')]}"/>
                             <button name="action_view_delivery" string="View Delivery Order" type="object" class="oe_highlight"
                               attrs="{'invisible': ['|','|','|',('picking_ids','=',False),('picking_ids','=',[]), ('state', 'not in', ('progress','manual')),('shipped','=',True)]}"/>
                             <button name="%(action_view_sale_advance_payment_inv)d" string="Create Invoice"
@@ -320,7 +320,7 @@
                                 <group>
                                     <field name="invoiced"/>
                                     <field name="shipped"/>
-                                    <field name="partial_invoiced"/>
+                                    <field name="invoice_exists"/>
                                 </group>
                             </group>
                         </page>

From aa779d50007291de06427110ca6012dec36ebe95 Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Wed, 12 Sep 2012 13:03:57 +0530
Subject: [PATCH 44/94] [IMP] sale: update 'Manual_order_policy.yml'

bzr revid: cha@tinyerp.com-20120912073357-naznvtd9n0zja3pd
---
 addons/sale/test/manual_order_policy.yml | 34 +++++++++---------------
 1 file changed, 12 insertions(+), 22 deletions(-)

diff --git a/addons/sale/test/manual_order_policy.yml b/addons/sale/test/manual_order_policy.yml
index 3a8dcbd2f5b..d67677c8254 100644
--- a/addons/sale/test/manual_order_policy.yml
+++ b/addons/sale/test/manual_order_policy.yml
@@ -15,38 +15,28 @@
     ctx = context.copy()
     ctx.update({"active_model": 'sale.order', "active_ids": [ref("sale_order_2")], "active_id":ref("sale_order_2")})
     order_line = self.pool.get('sale.order.line').browse(cr, uid, ref("sale_order_line_4"), context=context)
-    pay_id = self.create(cr, uid, {'advance_payment_method': 'fixed', 'product_id': order_line.product_id.id, 'amount': order_line.price_subtotal, 'qtty': order_line.product_uom_qty})
+    pay_id = self.create(cr, uid, {'advance_payment_method': 'fixed', 'product_id': order_line.product_id.id, 'amount': order_line.price_unit})
     self.create_invoices(cr, uid, [pay_id], context=ctx)
 -
-  I check Invoice which made advance
+  I check Invoice which made advance.
 -
   !python {model: sale.order}: |
     order = self.browse(cr, uid, ref('sale_order_2'))
     assert order.invoice_ids, "Invoice should be created after make advance invoice."
 -
-  I create Invoice from sale order line.
+  I create advance invoice where payment method is 'all'.
 -
-  !python {model: sale.order.line.make.invoice}: |
+  !python {model: sale.advance.payment.inv}: |
     ctx = context.copy()
-    ctx.update({"active_model": 'sale.order.line', "active_ids": [ref("sale_order_line_5")], "active_id":ref("sale_order_line_5")})
-    self.make_invoices(cr, uid, [], context=ctx)
+    ctx.update({"active_model": 'sale.order', "active_ids": [ref("sale_order_2")], "active_id":ref("sale_order_2")})
+    pay_id = self.create(cr, uid, {'advance_payment_method': 'all'})
+    self.create_invoices(cr, uid, [pay_id], context=ctx)
 -
-  I check Invoice which made from sale order line.
+  I check Invoice which made advance where payment method is 'all'.
 -
-  !python {model: sale.order.line}: |
-    line = self.browse(cr, uid, ref('sale_order_line_5'))
-    assert line.invoiced, "Line is not invoiced."
-    assert line.invoice_lines, "Invoice line should be created."
--
-  I create manual Invoice for order.
--
-  !record {model: sale.make.invoice, id: sale_make_invoice_1}:
-    invoice_date: !eval time.strftime('%Y-%m-%d')
--
-  !python {model: sale.make.invoice}: |
-    ctx = context.copy()
-    ctx = ctx.update({"active_model": 'sale.order', "active_ids": [ref("sale_order_2")], "active_id":ref("sale_order_2")})
-    self.make_invoices(cr, uid, [ref("sale_make_invoice_1")], context)
+  !python {model: sale.order}: |
+    order = self.browse(cr, uid, ref('sale_order_2'))
+    assert order.invoice_ids, "Invoice should be created after make advance invoice where payment method is 'all'."
 -
   I open the Invoice.
 -
@@ -76,7 +66,7 @@
     sale_order = self.browse(cr, uid, ref("sale_order_2"))
     assert sale_order.invoice_ids, "Invoice should be created."
     assert sale_order.invoiced, "Order is not invoiced."
-    assert sale_order.state == 'manual', 'Order should be in Manual.'
+    assert sale_order.state == 'progress', 'Order should be in Progress.'
     
 -
   I set order policy "Deliver & invoice on demand" as default policy.

From 427200a24168d589054198c91cf322b9b7cd54da Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Wed, 12 Sep 2012 14:40:40 +0530
Subject: [PATCH 45/94] [IMP] sale: update some statements in yml & clear
 unwanted code in sale.py file.

bzr revid: cha@tinyerp.com-20120912091040-yezbspjjucempq2e
---
 addons/sale/sale.py                      | 37 +++++++++++++-----------
 addons/sale/test/manual_order_policy.yml | 15 +++++-----
 2 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index f86d5722da2..04523e86ecb 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -145,13 +145,6 @@ class sale_order(osv.osv):
                 res[sale.id] = 0.0
         return res
 
-    def _get_invoiced_amount(self, cr, uid, sale, context=None):
-        invoiced_amount = 0
-        for invoice in sale.invoice_ids:
-            if invoice.state!='cancel':
-                invoiced_amount += invoice.amount_total
-        return invoiced_amount
-
     def _invoice_exists(self, cursor, user, ids, name, arg, context=None):
         res = {}
         for sale in self.browse(cursor, user, ids, context=context):
@@ -535,25 +528,35 @@ class sale_order(osv.osv):
         This function returns an action that display existing invoices of given sale order ids. It can either be a in a list or in a form view, if there is only one invoice to show.
         '''
         mod_obj = self.pool.get('ir.model.data')
-        act_obj = self.pool.get('ir.actions.act_window')
-
-        result = mod_obj.get_object_reference(cr, uid, 'account', 'action_invoice_tree1')
-        id = result and result[1] or False
-        result = act_obj.read(cr, uid, [id], context=context)[0]
+        result = {
+            'name': _('Cutomer Invoice'),
+            'view_type': 'form',
+            'res_model': 'account.invoice',
+            'context': "{'type':'out_invoice', 'journal_type': 'sale'}",
+            'type': 'ir.actions.act_window',
+            'nodestroy': True,
+            'target': 'current',
+        }
         #compute the number of invoices to display
         inv_ids = []
         for so in self.browse(cr, uid, ids, context=context):
             inv_ids += [invoice.id for invoice in so.invoice_ids]
         #choose the view_mode accordingly
-        if len(inv_ids) > 1:
-            result['domain'] = "[('id','in',["+','.join(map(str, inv_ids))+"])]"
+        if len(inv_ids)>1:
+            res = mod_obj.get_object_reference(cr, uid, 'account', 'invoice_tree')
+            result.update({
+                'view_mode': 'tree,form',
+                'res_id': inv_ids or False
+            })
         else:
             res = mod_obj.get_object_reference(cr, uid, 'account', 'invoice_form')
-            result['views'] = [(res and res[1] or False, 'form')]
-            result['res_id'] = inv_ids and inv_ids[0] or False
+            result.update({
+                'view_mode': 'form',
+                'res_id': inv_ids and inv_ids[0] or False,
+            })
+        result.update(view_id = res and res[1] or False)
         return result
 
-
     def action_view_delivery(self, cr, uid, ids, context=None):
         '''
         This function returns an action that display existing delivery orders of given sale order ids. It can either be a in a list or in a form view, if there is only one delivery order to show.
diff --git a/addons/sale/test/manual_order_policy.yml b/addons/sale/test/manual_order_policy.yml
index d67677c8254..17ebeb9f86b 100644
--- a/addons/sale/test/manual_order_policy.yml
+++ b/addons/sale/test/manual_order_policy.yml
@@ -1,5 +1,5 @@
 -
-  I confirm the Quotation with "Deliver & invoice on demand".
+  I confirm the Quotation with "On Demand" order policy.
 -
   !workflow {model: sale.order, action: order_confirm, ref: sale_order_2}
 -
@@ -9,7 +9,7 @@
     sale_order = self.browse(cr, uid, ref("sale_order_2"))
     assert len(sale_order.invoice_ids) == False, "Invoice should not created."
 -
-  I create advance invoice.
+  I create advance invoice where type is 'Fixed Price'.
 -
   !python {model: sale.advance.payment.inv}: |
     ctx = context.copy()
@@ -24,7 +24,7 @@
     order = self.browse(cr, uid, ref('sale_order_2'))
     assert order.invoice_ids, "Invoice should be created after make advance invoice."
 -
-  I create advance invoice where payment method is 'all'.
+  I create advance invoice where type is 'Invoice all the Sale Order'.
 -
   !python {model: sale.advance.payment.inv}: |
     ctx = context.copy()
@@ -32,11 +32,11 @@
     pay_id = self.create(cr, uid, {'advance_payment_method': 'all'})
     self.create_invoices(cr, uid, [pay_id], context=ctx)
 -
-  I check Invoice which made advance where payment method is 'all'.
+  I check Invoice which made advance where type is 'Invoice all the Sale Order'.
 -
   !python {model: sale.order}: |
     order = self.browse(cr, uid, ref('sale_order_2'))
-    assert order.invoice_ids, "Invoice should be created after make advance invoice where payment method is 'all'."
+    assert order.invoice_ids, "Invoice should be created after make advance invoice where type is 'Invoice all the Sale Order'."
 -
   I open the Invoice.
 -
@@ -47,7 +47,7 @@
     for invoice in so.invoice_ids:
       wf_service.trg_validate(uid, 'account.invoice', invoice.id, 'invoice_open', cr)
 -
-  I pay the invoice
+  I pay the invoice.
 -
   !python {model: account.invoice}: |
     sale_order = self.pool.get('sale.order')
@@ -65,7 +65,8 @@
   !python {model: sale.order}: |
     sale_order = self.browse(cr, uid, ref("sale_order_2"))
     assert sale_order.invoice_ids, "Invoice should be created."
-    assert sale_order.invoiced, "Order is not invoiced."
+    assert sale_order.invoice_exists, "Order is not invoiced."
+    assert sale_order.invoiced, "Order is not paid."
     assert sale_order.state == 'progress', 'Order should be in Progress.'
     
 -

From 7aab0643eebd3517cde14a3572c307f1827a2b9c Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Wed, 12 Sep 2012 16:11:38 +0530
Subject: [PATCH 46/94] [FIX] stock : Form open with a lable 'Transfer
 Products' instead of 'Deliver products'.

bzr revid: mdi@tinyerp.com-20120912104138-5fv3xyr0aqt5dscd
---
 addons/stock/wizard/stock_partial_picking.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/wizard/stock_partial_picking.py b/addons/stock/wizard/stock_partial_picking.py
index b3720b8a51b..755da7c42ee 100644
--- a/addons/stock/wizard/stock_partial_picking.py
+++ b/addons/stock/wizard/stock_partial_picking.py
@@ -78,7 +78,7 @@ class stock_partial_picking(osv.osv_memory):
         if context is None:
             context={}
         res = super(stock_partial_picking, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=submenu)
-        type = context.get('active_model','').split('.')[-1]
+        type = context.get('default_type', False)
         if type:
             doc = etree.XML(res['arch'])
             for node in doc.xpath("//button[@name='do_partial']"):

From 2b8e7613a0b2031fca358312e349b3cc63965106 Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Wed, 12 Sep 2012 18:26:23 +0530
Subject: [PATCH 47/94] [IMP] reduce the call when rendering vote, do the
 related changes in py, and improve the code for js and py

bzr revid: nco@tinyerp.com-20120912125623-ffrhgf84ttosjx44
---
 addons/mail/mail_message.py         | 25 ++++++++++++------------
 addons/mail/mail_vote.py            |  2 +-
 addons/mail/static/src/js/mail.js   | 30 +++++++++++++----------------
 addons/mail/static/src/xml/mail.xml |  4 ++--
 4 files changed, 29 insertions(+), 32 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 1a2cd1881ed..86bbb405b9c 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -124,7 +124,7 @@ class mail_message(osv.Model):
         'unread': fields.function(_get_unread, fnct_search=_search_unread,
             type='boolean', string='Unread',
             help='Functional field to search for unread messages linked to uid'),
-        'vote_user_ids': fields.many2many('mail.vote', 'message_vote_rel', 'message_id', 'vote_id', 'Votes'),
+        'vote_user_ids': fields.many2many('res.users', 'mail_vote', 'message_id', 'user_id', 'Votes'),
 
     }
 
@@ -146,21 +146,20 @@ class mail_message(osv.Model):
     #---------------------------------------------------
     #Mail Vote system (Like or Unlike comments
     #-----------------------------------------------------
-    def vote_toggle(self, cr, uid, ids, context=None):
+    def vote_toggle(self, cr, uid, ids, user_ids=None, context=None):
         '''
         Toggles when Comment is liked or unlike.
         create vote entries if current user like comment..
         '''
+        if not user_ids: user_ids = [uid]
         vote_pool = self.pool.get('mail.vote')
-        new_vote_id = False
+        
         for message in self.browse(cr, uid, ids, context):
-            voters_ids = [x.id for x in message.vote_user_ids if x.user_id.id == uid]
+            voters_ids = [x.id for x in message.vote_user_ids if x.id == uid]
             if not voters_ids:
-                new_vote_id =  vote_pool.create(cr, uid, {'msg_id': message.id, 'user_id': uid}, context=context)
-                self.write(cr, uid, ids, {'vote_user_ids': [(4, new_vote_id)]}, context=context)
+                self.write(cr, uid, ids, {'vote_user_ids': [(4, user_id) for user_id in user_ids]}, context=context)
             else:
-                self.write(cr, uid, ids, {'vote_user_ids': [(3, voters_ids[0])]}, context=context)
-                vote_pool.unlink(cr, uid, voters_ids, context=context)
+                self.write(cr, uid, ids, {'vote_user_ids': [(3, uid)]}, context=context)
         return True
 
     #------------------------------------------------------
@@ -170,12 +169,14 @@ class mail_message(osv.Model):
     def _message_dict_get(self, cr, uid, msg, context=None):
         """ Return a dict representation of the message browse record. """
         vote_pool = self.pool.get('mail.vote')
+        has_voted = False;
+        vote_ids = []
         attachment_ids = self.pool.get('ir.attachment').name_get(cr, uid, [x.id for x in msg.attachment_ids], context=context)
         vote_ids = vote_pool.name_get(cr, uid, [x.id for x in msg.vote_user_ids], context=context)
-        has_voted = False;
-        for vote in msg.vote_user_ids:
-            if (uid == vote.user_id.id):
-              has_voted = True;
+        if msg.vote_user_ids:
+            for user_id in msg.vote_user_ids:
+                if (uid == user_id.id):
+                    has_voted = True;
         author_id = self.pool.get('res.partner').name_get(cr, uid, [msg.author_id.id], context=context)[0]
         author_user_id = self.pool.get('res.users').name_get(cr, uid, [msg.author_id.user_ids[0].id], context=context)[0]
         partner_ids = self.pool.get('res.partner').name_get(cr, uid, [x.id for x in msg.partner_ids], context=context)
diff --git a/addons/mail/mail_vote.py b/addons/mail/mail_vote.py
index 5d63de80864..81ca4e4e75e 100644
--- a/addons/mail/mail_vote.py
+++ b/addons/mail/mail_vote.py
@@ -30,7 +30,7 @@ class mail_vote(osv.Model):
     _name = 'mail.vote'
     _description = 'Mail Vote'
     _columns = {
-            'msg_id': fields.many2one('mail.message', 'Message', required=True),
+            'message_id': fields.many2one('mail.message', 'Message', required=True),
             'user_id': fields.many2one('res.users', 'User', required=True),
         }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index c5d4119881c..7ede8bdc7e3 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -272,7 +272,7 @@ openerp.mail = function(session) {
                 });
             return
         },
-        
+
         find_parent_element: function(name, message_id){
             parent_element = false;
             _.each($(name), function(element){
@@ -283,27 +283,22 @@ openerp.mail = function(session) {
             return parent_element;
          },
 
-        render_vote: function(message_id){
+        render_vote: function(record){
+            vote_element = session.web.qweb.render('VoteDisplay', {});
+            var message_id = record.id
             var self = this;
-            this.ds_message.call('message_read', [[parseInt(message_id)]]).then(function(result){
-                vote_count = 0;
-                _.each(result, function(res){
-	                if (res.vote_user_ids){
-	                	vote_count = res.vote_user_ids.length;
-	                }
-	                parent_element = self.find_parent_element(".oe_mail_msg_vote", message_id);
-	                vote_element = session.web.qweb.render('VoteDisplay', {'msg_id': message_id, 'vote_count': vote_count, 'has_voted': res.has_voted});
-	                $(parent_element).html(vote_element);
-	                self.add_vote_event($(parent_element));
-	            });
-            });
+            var to_render_element = false;
+            vote_element = session.web.qweb.render('VoteDisplay', {'message_id': message_id, 'vote_count': record.vote_user_ids.length, 'has_voted': record.has_voted});
+            parent_element = self.find_parent_element(".oe_mail_msg_vote",message_id);
+            $(parent_element).html(vote_element);
+            self.add_vote_event($(parent_element));
         },
         
         subscribe_vote: function(message_id){
             var self = this;
             this.mail_message = new session.web.DataSet(this, 'mail.message');
             return this.mail_message.call('vote_toggle', [[parseInt(message_id)]]).then(function(result){
-                self.render_vote(message_id);
+                //self.render_vote(message_id);
             });
         },
 
@@ -481,8 +476,6 @@ openerp.mail = function(session) {
          * - record.is_author: is the current user the author of the record */
         display_record: function (record) {
             // formatting and additional fields
-            //Render Votes.
-            this.render_vote(record.id);
             record.date = session.web.format_value(record.date, {type:"datetime"});
             record.timerelative = $.timeago(record.date);
             if (record.type == 'email') {
@@ -509,6 +502,9 @@ openerp.mail = function(session) {
                 moreClass: 'oe_mail_expand',
                 lessClass: 'oe_mail_reduce',
                 });
+            
+            //Render Votes.
+            this.render_vote(record);
         },
 
         /** Display 'show more' button */
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index cd17838dadf..696d52e1766 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -99,12 +99,12 @@
         </t>
         <li>
         <t t-if="!has_voted">
-            <button class="oe_mail_msg_vote_like" t-att-data-id="msg_id" title="Click to Vote.">
+            <button class="oe_mail_msg_vote_like" t-att-data-id="message_id" title="Click to Vote.">
                 <span>+1</span>
             </button>
         </t>
         <t t-if="has_voted">
-            <button class="oe_mail_msg_vote_like" t-att-data-id="msg_id" title="Click to Unvote." style="background:#DC5F59; padding:1px">
+            <button class="oe_mail_msg_vote_like" t-att-data-id="message_id" title="Click to Unvote." style="background:#DC5F59; padding:1px">
                 <span>-1</span>
             </button>
         </t>

From 553c04b260e63cadbffbd7391b4f5ec7417710a4 Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Wed, 12 Sep 2012 18:29:55 +0530
Subject: [PATCH 48/94] [REMOVE] remove unused variable.

bzr revid: nco@tinyerp.com-20120912125955-djn6ivs3vtkrw49n
---
 addons/mail/static/src/js/mail.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 7ede8bdc7e3..ff0dfaa01b8 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -285,9 +285,8 @@ openerp.mail = function(session) {
 
         render_vote: function(record){
             vote_element = session.web.qweb.render('VoteDisplay', {});
-            var message_id = record.id
             var self = this;
-            var to_render_element = false;
+            var message_id = record.id
             vote_element = session.web.qweb.render('VoteDisplay', {'message_id': message_id, 'vote_count': record.vote_user_ids.length, 'has_voted': record.has_voted});
             parent_element = self.find_parent_element(".oe_mail_msg_vote",message_id);
             $(parent_element).html(vote_element);

From 951b6653cd58832ad2f546f05168c4da89c24ff7 Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Wed, 12 Sep 2012 18:45:51 +0530
Subject: [PATCH 49/94] [ADD] add function to fatch the new vote and render it.

bzr revid: nco@tinyerp.com-20120912131551-xzz16f5zuz3mlz6r
---
 addons/mail/static/src/js/mail.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index ff0dfaa01b8..084c1001be7 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -292,12 +292,17 @@ openerp.mail = function(session) {
             $(parent_element).html(vote_element);
             self.add_vote_event($(parent_element));
         },
-        
+        fetch_voters: function (message_id) {
+            var self= this
+            this.ds_message.call('message_read', [[parseInt(message_id)]]).then(function(result){
+                self.render_vote(result[0]);
+            });
+        },
         subscribe_vote: function(message_id){
             var self = this;
             this.mail_message = new session.web.DataSet(this, 'mail.message');
             return this.mail_message.call('vote_toggle', [[parseInt(message_id)]]).then(function(result){
-                //self.render_vote(message_id);
+                self.fetch_voters(message_id);
             });
         },
 

From 423b787d6eff26a90a42dcd262128a76dc3d2241 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Thu, 13 Sep 2012 10:46:11 +0530
Subject: [PATCH 50/94] [IMP] stock : Removed the icon on the deliver button.

bzr revid: mdi@tinyerp.com-20120913051611-rghl7zuxo4317lo5
---
 addons/stock/stock_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 154927a2f19..2630f9fb160 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1002,7 +1002,7 @@
                         <button name="action_assign" states="confirmed" string="Check Availability" type="object" class="oe_highlight"/>
                     </xpath>
                     <xpath expr="/form/header//button[@name='action_process']" position="replace">
-                        <button name="action_process" states="assigned" string="Deliver" type="object" icon="gtk-go-forward" class="oe_highlight"/>
+                        <button name="action_process" states="assigned" string="Deliver" type="object" class="oe_highlight"/>
                     </xpath>
                     <xpath expr="/form/header//field[@name='state']" position="replace">
                         <field name="state" nolabel="1" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"auto":"blue", "confirmed":"blue"}'/>

From 891dcd2a4327118ead320d27c55113355ef06c88 Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Thu, 13 Sep 2012 11:54:37 +0530
Subject: [PATCH 51/94] [IMP]show reset button when debug mode is on.

bzr revid: vme@tinyerp.com-20120913062437-5vcscpnk19u441m5
---
 addons/board/static/src/js/dashboard.js | 2 --
 addons/board/static/src/xml/board.xml   | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/addons/board/static/src/js/dashboard.js b/addons/board/static/src/js/dashboard.js
index 193224ada3b..4e67c1e7618 100644
--- a/addons/board/static/src/js/dashboard.js
+++ b/addons/board/static/src/js/dashboard.js
@@ -172,8 +172,6 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({
         this.rpc('/web/view/add_custom', {
             view_id: this.view.fields_view.view_id,
             arch: arch
-        }, function() {
-            self.$el.find('.oe_dashboard_link_reset').show();
         });
     },
     on_load_action: function(result, index, action_attrs) {
diff --git a/addons/board/static/src/xml/board.xml b/addons/board/static/src/xml/board.xml
index e13fa707776..03ede793036 100644
--- a/addons/board/static/src/xml/board.xml
+++ b/addons/board/static/src/xml/board.xml
@@ -1,7 +1,7 @@
 <template>
 <t t-name="DashBoard">
     <div class="oe_dashboard_links">
-        <button type="button" class="button oe_dashboard_link_reset" title="Reset Layout.." t-att-style="view.fields_view.custom_view_id ? null : 'display: none'">
+        <button type="button" class="button oe_dashboard_link_reset" title="Reset Layout.." t-att-style="view.fields_view.custom_view_id || session.debug ? null : 'display: none'">
             <img src="/board/static/src/img/layout_2-1.png" width="16" height="16"/>
             <span> Reset </span>
         </button>

From 881b1ed7cc4396ded4937975be110d1ac59b0fa0 Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Thu, 13 Sep 2012 12:03:54 +0530
Subject: [PATCH 52/94] [REM]remove css to solve confilct

bzr revid: vme@tinyerp.com-20120913063354-qtswgf0h9v29hvcl
---
 addons/board/static/src/css/dashboard.css  | 33 ----------------------
 addons/board/static/src/css/dashboard.sass | 25 ----------------
 2 files changed, 58 deletions(-)

diff --git a/addons/board/static/src/css/dashboard.css b/addons/board/static/src/css/dashboard.css
index d4a1e322780..38e224daf42 100644
--- a/addons/board/static/src/css/dashboard.css
+++ b/addons/board/static/src/css/dashboard.css
@@ -1,36 +1,3 @@
-.openerp .oe_dashboard_layout_1 .oe_dashboard_column.index_0 {
-  width: 100%;
-}
-.openerp .oe_dashboard_layout_1 .oe_dashboard_column.index_1, .openerp .oe_dashboard_layout_1 .oe_dashboard_column.index_2 {
-  display: none;
-}
-.openerp .oe_dashboard_layout_1-1 .oe_dashboard_column {
-  width: 50%;
-}
-.openerp .oe_dashboard_layout_1-1 .oe_dashboard_column.index_2 {
-  display: none;
-}
-.openerp .oe_dashboard_layout_1-1-1 .oe_dashboard_column {
-  width: 33%;
-}
-.openerp .oe_dashboard_layout_2-1 .oe_dashboard_column.index_0 {
-  width: 70%;
-}
-.openerp .oe_dashboard_layout_2-1 .oe_dashboard_column.index_1 {
-  width: 30%;
-}
-.openerp .oe_dashboard_layout_2-1 .oe_dashboard_column.index_2 {
-  display: none;
-}
-.openerp .oe_dashboard_layout_1-2 .oe_dashboard_column.index_0 {
-  width: 30%;
-}
-.openerp .oe_dashboard_layout_1-2 .oe_dashboard_column.index_1 {
-  width: 70%;
-}
-.openerp .oe_dashboard_layout_1-2 .oe_dashboard_column.index_2 {
-  display: none;
-}
 .openerp .oe_dashboard_links {
   text-align: right;
   margin: 0 4px 6px 0;
diff --git a/addons/board/static/src/css/dashboard.sass b/addons/board/static/src/css/dashboard.sass
index b5ef5cde934..6c8d24a4d37 100644
--- a/addons/board/static/src/css/dashboard.sass
+++ b/addons/board/static/src/css/dashboard.sass
@@ -9,31 +9,6 @@
   box-shadow: $bsval
 
 .openerp
-  .oe_dashboard_layout_1 .oe_dashboard_column
-    &.index_0
-      width: 100%
-    &.index_1, &.index_2
-      display: none
-  .oe_dashboard_layout_1-1 .oe_dashboard_column
-    width: 50% 
-    &.index_2
-      display: none
-  .oe_dashboard_layout_1-1-1 .oe_dashboard_column
-    width: 33% 
-  .oe_dashboard_layout_2-1 .oe_dashboard_column
-    &.index_0
-      width: 70%
-    &.index_1
-      width: 30%
-    &.index_2
-      display: none
-  .oe_dashboard_layout_1-2 .oe_dashboard_column
-    &.index_0
-      width: 30%
-    &.index_1
-      width: 70%
-    &.index_2
-      display: none
   .oe_dashboard_links
     text-align: right
     margin: 0 4px 6px 0

From ad54fae15f06feaf94da69bd2a378caf443aa879 Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Thu, 13 Sep 2012 12:07:12 +0530
Subject: [PATCH 53/94] [IMP]enter css.

bzr revid: vme@tinyerp.com-20120913063712-fckff2ufxgwvwuaz
---
 addons/board/static/src/css/dashboard.css  | 33 ++++++++++++++++++++++
 addons/board/static/src/css/dashboard.sass | 25 ++++++++++++++++
 addons/board/static/src/js/dashboard.js    |  5 +---
 3 files changed, 59 insertions(+), 4 deletions(-)

diff --git a/addons/board/static/src/css/dashboard.css b/addons/board/static/src/css/dashboard.css
index ed66e338c81..f2bbcd07071 100644
--- a/addons/board/static/src/css/dashboard.css
+++ b/addons/board/static/src/css/dashboard.css
@@ -1,3 +1,36 @@
+.openerp .oe_dashboard_layout_1 .oe_dashboard_column.index_0 {
+  width: 100%;
+}
+.openerp .oe_dashboard_layout_1 .oe_dashboard_column.index_1, .openerp .oe_dashboard_layout_1 .oe_dashboard_column.index_2 {
+  display: none;
+}
+.openerp .oe_dashboard_layout_1-1 .oe_dashboard_column {
+  width: 50%;
+}
+.openerp .oe_dashboard_layout_1-1 .oe_dashboard_column.index_2 {
+  display: none;
+}
+.openerp .oe_dashboard_layout_1-1-1 .oe_dashboard_column {
+  width: 33%;
+}
+.openerp .oe_dashboard_layout_2-1 .oe_dashboard_column.index_0 {
+  width: 70%;
+}
+.openerp .oe_dashboard_layout_2-1 .oe_dashboard_column.index_1 {
+  width: 30%;
+}
+.openerp .oe_dashboard_layout_2-1 .oe_dashboard_column.index_2 {
+  display: none;
+}
+.openerp .oe_dashboard_layout_1-2 .oe_dashboard_column.index_0 {
+  width: 30%;
+}
+.openerp .oe_dashboard_layout_1-2 .oe_dashboard_column.index_1 {
+  width: 70%;
+}
+.openerp .oe_dashboard_layout_1-2 .oe_dashboard_column.index_2 {
+  display: none;
+}
 .openerp .oe_dashboard_layout_selector ul {
   white-space: nowrap;
 }
diff --git a/addons/board/static/src/css/dashboard.sass b/addons/board/static/src/css/dashboard.sass
index 074b8b90c17..122b6dc232c 100644
--- a/addons/board/static/src/css/dashboard.sass
+++ b/addons/board/static/src/css/dashboard.sass
@@ -9,6 +9,31 @@
   box-shadow: $bsval
 
 .openerp
+  .oe_dashboard_layout_1 .oe_dashboard_column
+    &.index_0
+      width: 100%
+    &.index_1, &.index_2
+      display: none
+  .oe_dashboard_layout_1-1 .oe_dashboard_column
+    width: 50% 
+    &.index_2
+      display: none
+  .oe_dashboard_layout_1-1-1 .oe_dashboard_column
+    width: 33% 
+  .oe_dashboard_layout_2-1 .oe_dashboard_column
+    &.index_0
+      width: 70%
+    &.index_1
+      width: 30%
+    &.index_2
+      display: none
+  .oe_dashboard_layout_1-2 .oe_dashboard_column
+    &.index_0
+      width: 30%
+    &.index_1
+      width: 70%
+    &.index_2
+      display: none
   .oe_dashboard_layout_selector
     ul
       white-space: nowrap
diff --git a/addons/board/static/src/js/dashboard.js b/addons/board/static/src/js/dashboard.js
index 4e67c1e7618..43d7ca76d39 100644
--- a/addons/board/static/src/js/dashboard.js
+++ b/addons/board/static/src/js/dashboard.js
@@ -17,10 +17,7 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({
     start: function() {
         var self = this;
         this._super.apply(this, arguments);
-        
-        if(!this.session.debug)
-            this.$el.find(".oe_dashboard_links button:first").css("display", "none");
-            
+
         this.$el.find('.oe_dashboard_column').sortable({
             connectWith: '.oe_dashboard_column',
             handle: '.oe_header',

From 6a4d58ace80320db0b42bc86ab7877bcf14b1e47 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Thu, 13 Sep 2012 13:00:45 +0530
Subject: [PATCH 54/94] [IMP]stock : set group on warehouse user and default
 value in action

bzr revid: mma@tinyerp.com-20120913073045-ee9fidsc4inufjha
---
 addons/stock/board_warehouse_view.xml | 2 +-
 addons/stock/stock_view.xml           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/stock/board_warehouse_view.xml b/addons/stock/board_warehouse_view.xml
index b223e731e8f..839a99c1fa7 100644
--- a/addons/stock/board_warehouse_view.xml
+++ b/addons/stock/board_warehouse_view.xml
@@ -61,7 +61,7 @@
                     parent="base.menu_reporting_dashboard" 
                     action="open_board_warehouse" 
                     sequence="25" 
-                    groups="group_stock_manager"/>
+                    groups="stock.group_stock_user"/>
 
     </data>
 </openerp>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index f278edb0758..26616cca5a4 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1496,7 +1496,7 @@
             <field name="view_mode">tree,form</field>
             <field name="domain">['|','&amp;',('picking_id','=',False),('location_id.usage', 'in', ['customer','supplier']),'&amp;',('picking_id','!=',False),('picking_id.type','=','in')]</field>
             <field name="view_id" ref="view_move_tree_reception_picking"/>
-            <field name="context" eval="'{\'product_receive\' : True, \'default_location_id\':%d, \'default_location_dest_id\':%d, \'search_default_future\': 1}' % (ref('stock_location_suppliers'),ref('stock_location_stock') )"/>
+            <field name="context">{'product_receive': True, 'search_default_future': True, 'picking_type': 'in'}</field>
             <field name="help" type="html">
               <p>
                 Click to register a product reception. 
@@ -1631,7 +1631,7 @@
             <field name="view_mode">tree,form</field>
             <field name="domain">['|','&amp;',('picking_id','=',False),('location_dest_id.usage', 'in', ['customer','supplier']),'&amp;',('picking_id','!=',False),('picking_id.type','=','out')]</field>
             <field name="view_id" ref="view_move_tree_reception_picking"/>
-            <field name="context" eval="'{\'default_location_id\':%d, \'default_location_dest_id\':%d, \'search_default_future\': 1}' % (ref('stock_location_stock'),ref('stock_location_customers'))"/>
+            <field name="context">{'picking_type': 'out', 'search_default_future': True}</field>
             <field name="help" type="html">
               <p>
                 You will find in this list all products you have to deliver to

From 228a19d6c2c115367299ddd262e7bd8f34eeef79 Mon Sep 17 00:00:00 2001
From: "Bhumi Thakkar (Open ERP)" <bth@tinyerp.com>
Date: Thu, 13 Sep 2012 16:04:47 +0530
Subject: [PATCH 55/94] [IMP] In help field define type='html'.

bzr revid: bth@tinyerp.com-20120913103447-ag5p3yhzi59tp3uo
---
 addons/procurement/procurement_view.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index 432ff13aaa5..ba0d4506709 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -166,7 +166,9 @@
             <field name="view_mode">tree,form</field>
             <field name="context">{'search_default_perm_exceptions':1}</field>
             <field name="search_view_id" ref="view_procurement_filter"/>
-            <field name="help">Procurement Orders represent the need for a certain quantity of products, at a given time, in a given location. Sales Orders are one typical source of Procurement Orders (but these are distinct documents). Depending on the procurement parameters and the product configuration, the procurement engine will attempt to satisfy the need by reserving products from stock, ordering products from a supplier, or passing a manufacturing order, etc. A Procurement Exception occurs when the system cannot find a way to fulfill a procurement. Some exceptions will resolve themselves automatically, but others require manual intervention (those are identified by a specific error message).</field>
+            <field name="help" type="html">
+                Procurement Orders represent the need for a certain quantity of products, at a given time, in a given location. Sales Orders are one typical source of Procurement Orders (but these are distinct documents). Depending on the procurement parameters and the product configuration, the procurement engine will attempt to satisfy the need by reserving products from stock, ordering products from a supplier, or passing a manufacturing order, etc. A Procurement Exception occurs when the system cannot find a way to fulfill a procurement. Some exceptions will resolve themselves automatically, but others require manual intervention (those are identified by a specific error message).
+            </field>
         </record>
 
         <record id="procurement_action5" model="ir.actions.act_window">

From 7ee881b98d0af19f81888b967457873f785f922f Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Thu, 13 Sep 2012 17:08:32 +0530
Subject: [PATCH 56/94] [IMP]stock : add button claim on right side of delivery
 order and added data file for claim and give a acces right of borad to
 warehouse user

bzr revid: mma@tinyerp.com-20120913113832-80jmjtoj83pjflra
---
 addons/claim_from_delivery/__openerp__.py     |  4 ++-
 .../claim_delivery_data.xml                   | 10 ++++++++
 .../claim_delivery_view.xml                   | 25 +++++++++++++++----
 addons/stock/security/ir.model.access.csv     |  3 ++-
 4 files changed, 35 insertions(+), 7 deletions(-)
 create mode 100644 addons/claim_from_delivery/claim_delivery_data.xml

diff --git a/addons/claim_from_delivery/__openerp__.py b/addons/claim_from_delivery/__openerp__.py
index 9c4395927af..9e3f7f59ca2 100644
--- a/addons/claim_from_delivery/__openerp__.py
+++ b/addons/claim_from_delivery/__openerp__.py
@@ -30,7 +30,9 @@ Create a claim from a delivery order.
 
 Adds a Claim link to the delivery order.
 """,
-    'data' : ['claim_delivery_view.xml'],
+    'data' : [
+              'claim_delivery_view.xml',
+              'claim_delivery_data.xml',],
     'auto_install': False,
     'installable': True,
     'certificate' : '001101649349223746957',
diff --git a/addons/claim_from_delivery/claim_delivery_data.xml b/addons/claim_from_delivery/claim_delivery_data.xml
new file mode 100644
index 00000000000..d5faa279434
--- /dev/null
+++ b/addons/claim_from_delivery/claim_delivery_data.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<openerp>
+    <data noupdate="1">
+    
+     <record model="res.request.link" id="request_link_claim_from_delivery">
+            <field name="name">Delivery Order</field>
+            <field name="object">stock.picking.out</field>
+     </record>
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/claim_from_delivery/claim_delivery_view.xml b/addons/claim_from_delivery/claim_delivery_view.xml
index f345484b4a9..17803b1f546 100644
--- a/addons/claim_from_delivery/claim_delivery_view.xml
+++ b/addons/claim_from_delivery/claim_delivery_view.xml
@@ -1,11 +1,26 @@
 <openerp>
     <data>
 
-        <act_window id="action_claim_from_delivery" name="Claim"
-            domain="[]" target="current"
-            context="{'default_partner_id': partner_id}"
-            view_mode="form" res_model="crm.claim"
-            src_model="stock.picking" />
+        <record id="action_claim_from_delivery" model="ir.actions.act_window">
+            <field name="name">Claim From Delivery</field>
+            <field name="res_model">crm.claim</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="crm_claim.crm_case_claims_tree_view"/>
+            <field name="context">{}</field>
+        </record>
+
+        <record id="crm_claim_from_delivery" model="ir.ui.view">
+            <field name="name">crm.claim.from_delivery.form</field>
+            <field name="model">stock.picking.out</field>
+            <field name="inherit_id" ref="stock.view_picking_out_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="/form/sheet/h1" position="before">
+                    <div class="oe_right oe_button_box">
+                        <button name="%(action_claim_from_delivery)d" string="Claim" type="action"/>
+                    </div>
+                </xpath>
+            </field>
+        </record>
 
     </data>
 </openerp>
diff --git a/addons/stock/security/ir.model.access.csv b/addons/stock/security/ir.model.access.csv
index f0a3e68d810..67766519ff4 100644
--- a/addons/stock/security/ir.model.access.csv
+++ b/addons/stock/security/ir.model.access.csv
@@ -33,7 +33,7 @@ access_stock_location_stock_manager,stock.location stock manager,model_stock_loc
 access_stock_lines_date_user,report.stock.lines.date user,model_report_stock_lines_date,stock.group_stock_user,1,0,0,0
 access_stock_lines_date_manager,report.stock.lines.date manager,model_report_stock_lines_date,stock.group_stock_manager,1,1,1,1
 access_stock_report_tracklots,stock.report.tracklots,model_stock_report_tracklots,stock.group_stock_user,1,1,1,1
-access_report_stock_move_user,report.stock.move user,model_report_stock_move,stock.group_stock_user,1,0,0,0
+access_report_stock_move_user,report.stock.move user,model_report_stock_move,stock.group_stock_user,1,1,0,0
 access_report_stock_move_manager,report.stock.move manager,model_report_stock_move,stock.group_stock_manager,1,1,1,1
 access_report_stock_inventory_user,report.stock.inventory user,model_report_stock_inventory,stock.group_stock_user,1,1,1,1
 access_product_product_stock_user,product_product_stock_user,product.model_product_product,stock.group_stock_user,1,0,0,0
@@ -61,3 +61,4 @@ access_product_group_res_partner_stock_manager,res_partner group_stock_manager,b
 access_product_pricelist_version_stock_manager,product.pricelist.version stock_manager,product.model_product_pricelist_version,stock.group_stock_manager,1,1,1,1
 access_product_pricelist_item_stock_manager,product.pricelist.item stock_manager,product.model_product_pricelist_item,stock.group_stock_manager,1,1,1,1
 access_account_account_stock_manager,account.account stock manager,account.model_account_account,stock.group_stock_manager,1,0,0,0
+access_board_stock_user,board.board user,board.model_board_board,stock.group_stock_user,1,1,0,0

From 65b6041e9784813a613012eff131b4e69ef3dab7 Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Fri, 14 Sep 2012 12:09:11 +0530
Subject: [PATCH 57/94] [FIX] event: solved the issue of not getting buttons on
 form view

lp bug: https://launchpad.net/bugs/1050747 fixed

bzr revid: cha@tinyerp.com-20120914063911-jux3xeufwd9frrv7
---
 addons/event/event_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index e2ff2e67e87..16b2254492c 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -101,7 +101,7 @@
             <field name="arch" type="xml">
                 <form string="Events" version="7.0">
                     <header>
-                        <span groups="base.user_group">
+                        <span groups="base.group_user">
                             <button string="Confirm Event" name="button_confirm" states="draft" type="object" class="oe_highlight"/>
                             <button string="Event Ended" name="button_done" states="confirm" type="object" class="oe_highlight"/>
                             <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" />

From ed7a980a8556e7ea0ab5840d130f9accc83bf7ff Mon Sep 17 00:00:00 2001
From: "Jiten (OpenERP)" <jra@tinyerp.com>
Date: Fri, 14 Sep 2012 14:58:32 +0530
Subject: [PATCH 58/94] [IMP] minor change to add <p> on text context.

bzr revid: jra@tinyerp.com-20120914092832-sbu30zjrkx5y2j18
---
 addons/procurement/procurement_view.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index ba0d4506709..bf73b383216 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -167,7 +167,9 @@
             <field name="context">{'search_default_perm_exceptions':1}</field>
             <field name="search_view_id" ref="view_procurement_filter"/>
             <field name="help" type="html">
+                <p>
                 Procurement Orders represent the need for a certain quantity of products, at a given time, in a given location. Sales Orders are one typical source of Procurement Orders (but these are distinct documents). Depending on the procurement parameters and the product configuration, the procurement engine will attempt to satisfy the need by reserving products from stock, ordering products from a supplier, or passing a manufacturing order, etc. A Procurement Exception occurs when the system cannot find a way to fulfill a procurement. Some exceptions will resolve themselves automatically, but others require manual intervention (those are identified by a specific error message).
+                </p>
             </field>
         </record>
 

From 8ad2786b5c025aed1170c92dd41a5870c0328aa8 Mon Sep 17 00:00:00 2001
From: "Jiten (OpenERP)" <jra@tinyerp.com>
Date: Fri, 14 Sep 2012 18:40:58 +0530
Subject: [PATCH 59/94] [FIX] Fix the issue of dashboard giving traceback for
 knowledge.

bzr revid: jra@tinyerp.com-20120914131058-celb1tgo93en0dpl
---
 addons/document/report/document_report_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/document/report/document_report_view.xml b/addons/document/report/document_report_view.xml
index 2a8b9f34ddf..2740967d53a 100644
--- a/addons/document/report/document_report_view.xml
+++ b/addons/document/report/document_report_view.xml
@@ -114,7 +114,7 @@
             <field name="model">report.document.user</field>
             <field name="arch" type="xml">
                 <graph string="Files by User" type="pie">
-                    <field name="user" />
+                    <field name="user_id" />
                     <field name="nbr" operator="+"/>
                 </graph>
             </field>

From a0f23eb60b5cbd352bc5dbecd81bc2e098607df3 Mon Sep 17 00:00:00 2001
From: "olt@tinyerp.com" <>
Date: Mon, 17 Sep 2012 10:10:17 +0200
Subject: [PATCH 60/94] [FIX] anonymization: raise a good descriptive error
 when the state is 'unstable'

bzr revid: olt@tinyerp.com-20120917081017-s15mm36ppvs4lfxc
---
 addons/anonymization/anonymization.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/addons/anonymization/anonymization.py b/addons/anonymization/anonymization.py
index 47e168a12b8..6b6db168a4f 100644
--- a/addons/anonymization/anonymization.py
+++ b/addons/anonymization/anonymization.py
@@ -64,11 +64,13 @@ class ir_model_fields_anonymization(osv.osv):
             state = 'anonymized' # all fields are anonymized
         else:
             state = 'unstable' # fields are mixed: this should be fixed
+
         return state
 
     def _check_write(self, cr, uid, context=None):
         # check that the field is created from the menu and not from an database update
         # otherwise the database update can crash:
+
         if context.get('manual'):
             global_state = self._get_global_state(cr, uid, context=context)
             if global_state == 'anonymized':
@@ -100,12 +102,16 @@ class ir_model_fields_anonymization(osv.osv):
         # check field state: all should be clear before we can add a new field to anonymize:
         self._check_write(cr, uid, context=context)
 
+        global_state = self._get_global_state(cr, uid, context=context)
+
         if 'field_name' in vals and vals['field_name'] and 'model_name' in vals and vals['model_name']:
             vals['model_id'], vals['field_id'] = self._get_model_and_field_ids(cr, uid, vals, context=context)
 
         # check not existing fields:
         if not vals.get('field_id'):
             vals['state'] = 'not_existing'
+        else:
+            vals['state'] = global_state
 
         res = super(ir_model_fields_anonymization, self).create(cr, uid, vals, context=context)
 
@@ -340,8 +346,9 @@ class ir_model_fields_anonymize_wizard(osv.osv_memory):
                 # remove the placeholer:
                 eview.remove(placeholder)
             else:
-                # unstable ?
-                raise
+                msg = "The database anonymization is currently in an unstable state. Some fields are anonymized," + \
+                  " while some fields are not anonymized. You should try to solve this problem before trying to do anything else."
+                raise osv.except_osv('Error !', msg)
 
             res['arch'] = etree.tostring(eview)
 

From fabf4971aaaebb03d3bc7c582b5acb68082c0a2c Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 17 Sep 2012 10:14:51 +0200
Subject: [PATCH 61/94] [FIX] timesheet_sheet should not crash anymmore when
 tests are performed at 23:59

bzr revid: fp@tinyerp.com-20120917081451-ugk1qi0le22kn44n
---
 addons/hr_attendance/hr_attendance.py         |  2 +-
 .../test/test_hr_timesheet_sheet.yml          | 26 +++++++++++--------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/addons/hr_attendance/hr_attendance.py b/addons/hr_attendance/hr_attendance.py
index d3bc79bda1a..8fdd2928fe6 100644
--- a/addons/hr_attendance/hr_attendance.py
+++ b/addons/hr_attendance/hr_attendance.py
@@ -55,7 +55,7 @@ class hr_attendance(osv.osv):
         'name': fields.datetime('Date', required=True, select=1),
         'action': fields.selection([('sign_in', 'Sign In'), ('sign_out', 'Sign Out'), ('action','Action')], 'Action', required=True),
         'action_desc': fields.many2one("hr.action.reason", "Action Reason", domain="[('action_type', '=', action)]", help='Specifies the reason for Signing In/Signing Out in case of extra hours.'),
-        'employee_id': fields.many2one('hr.employee', "Employee's Name", required=True, select=True),
+        'employee_id': fields.many2one('hr.employee', "Employee", required=True, select=True),
         'day': fields.function(_day_compute, type='char', string='Day', store=True, select=1, size=32),
     }
     _defaults = {
diff --git a/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml b/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml
index 99705b07a39..070079a4b80 100644
--- a/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml
+++ b/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml
@@ -13,7 +13,7 @@
     product_id: product.product_product_consultant
     journal_id: hr_timesheet.analytic_journal
 -
-  I create my current timesheet for employee "Quentin Paolinon".
+  I create a timesheet for employee "Quentin Paolinon".
 -
   !record {model: hr_timesheet_sheet.sheet, id: hr_timesheet_sheet_sheet_deddk0}:
     date_current: !eval time.strftime('%Y-%m-%d')
@@ -23,13 +23,17 @@
     user_id: base.user_demo
     employee_id: 'hr.employee_qdp'
 -
-  Now, at the time of login, I create Attendances and perform "Sign In" action.
+  Quentin "Sign In" at around 9am.
 -
-  !python {model: hr_timesheet_sheet.sheet}: |
-    self.attendance_action_change(cr, uid, [ref('hr_timesheet_sheet_sheet_deddk0')], {})
-    task_work = self.search(cr, uid, [("name","=","Quentin Paolinon")],context)[0]
-    task_ids = self.browse(cr, uid, task_work, context)
-    assert task_ids.state == "draft", "I State In Timesheet"
+  !record {model: hr.attendance, id: hr_attendance_1}:
+    action: sign_in
+    employee_id: 'hr.employee_qdp'
+    name: !eval datetime.now().strftime('%Y-%m-%d 09:%M:%S')
+-
+  I test that Quentin in signed in
+-
+  !assert {model: hr.employee, id: hr.employee_qdp}:
+    - state == 'present'
 -
   I want to check attendance and work of yesterday. I click on <- button.
 -
@@ -57,10 +61,10 @@
 -
   At the time of logout, I create attendance and perform "Sign Out".
 -
-  !record {model: hr.attendance, id: hr_attendance_1}:
+  !record {model: hr.attendance, id: hr_attendance_2}:
     action: sign_out
     employee_id: 'hr.employee_qdp'
-    name: !eval (datetime.now() + timedelta(minutes=1)).strftime('%Y-%m-%d %H:%M:%S')
+    name: !eval datetime.now().strftime('%Y-%m-%d 17:30:00')
 -
   I create Timesheet Entry for time spend on today work.
 -
@@ -103,10 +107,10 @@
         general_account_id: account.a_expense
         journal_id: hr_timesheet.analytic_journal
 -
-  I set an allowed difference of 25 hours
+  I set an allowed difference of 1 hour
 -
   !record {model: res.company, id: base.main_company}:
-    timesheet_max_difference: 25.00
+    timesheet_max_difference: 1.00
 -
   I tried again to confirm the timesheet after modification.
 -

From 46f7aa283bcc4173718e0b1c518ef17ba4c5449a Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Mon, 17 Sep 2012 11:41:12 +0200
Subject: [PATCH 62/94] [IMP] code cleaning

bzr revid: abo@openerp.com-20120917094112-uahrew8q0jz6aqo3
---
 addons/account/wizard/account_move_journal.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/wizard/account_move_journal.py b/addons/account/wizard/account_move_journal.py
index d1353049b72..d87e4d04a0c 100644
--- a/addons/account/wizard/account_move_journal.py
+++ b/addons/account/wizard/account_move_journal.py
@@ -92,14 +92,14 @@ class account_move_journal(osv.osv_memory):
 
             journal = False
             if journal_id:
-                journal = journal_pool.read(cr, uid, [journal_id], ['name'])[0]['name']
+                journal = journal_pool.read(cr, uid, journal_id, ['name'], context=context).name
                 journal_string = _("Journal: %s") % tools.ustr(journal)
             else:
                 journal_string = _("Journal: All")
 
             period = False
             if period_id:
-                period = period_pool.browse(cr, uid, [period_id], context=context)[0]['name']
+                period = period_pool.browse(cr, uid, period_id, context=context).name
                 period_string = _("Period: %s") % tools.ustr(period)
 
             open_string = _("Open")

From 29ff1bf82aba1274641bf35d5f3cf53bb751ffa4 Mon Sep 17 00:00:00 2001
From: "Bhumi Thakkar (Open ERP)" <bth@tinyerp.com>
Date: Mon, 17 Sep 2012 16:33:46 +0530
Subject: [PATCH 63/94] [IMP] Improve code for return value of selection field.

bzr revid: bth@tinyerp.com-20120917110346-0daw7ho3y31zbpu3
---
 addons/web_graph/controllers/graph.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/web_graph/controllers/graph.py b/addons/web_graph/controllers/graph.py
index f6c1343c042..1da5e3bc91f 100644
--- a/addons/web_graph/controllers/graph.py
+++ b/addons/web_graph/controllers/graph.py
@@ -53,6 +53,9 @@ class GraphView(View):
             if fields[field]['type']=='many2one':
                 data = data and data[1]
             if tick:
+                if fields[field]['type']=='selection':
+                    d = dict(fields[field]['selection'])
+                    data = d[data]
                 return ticks.setdefault(data, len(ticks))
             return data or 0
 

From 06852d994b287e3af74a629a8feb55ae6b797f79 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Mon, 17 Sep 2012 14:09:26 +0200
Subject: [PATCH 64/94] [FIX] point_of_sale: Take the 'cash' journals if there
 is no specific cash journal for the Point Of Sale

bzr revid: stw@openerp.com-20120917120926-h3bzu2k9ds5lnjjr
---
 addons/point_of_sale/point_of_sale.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index 95b54b6baed..590718b48f0 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -314,9 +314,13 @@ class pos_session(osv.osv):
 
             # define some cash journal if no payment method exists
             if not pos_config.journal_ids:
-                cashids = self.pool.get('account.journal').search(cr, uid, [('journal_user', '=', True), ('type','=','cash')], context=context)
+                journal_proxy = self.pool.get('account.journal')
+                cashids = journal_proxy.search(cr, uid, [('journal_user', '=', True), ('type','=','cash')], context=context)
                 if not cashids:
-                    cashids = self.pool.get('account.journal').search(cr, uid, [('journal_user','=',True)], context=context)
+                    cashids = journal_proxy.search(cr, uid, [('type', '=', 'cash')], context=context)
+                    if not cashids:
+                        cashids = journal_proxy.search(cr, uid, [('journal_user','=',True)], context=context)
+
                 jobj.write(cr, uid, [pos_config.id], {'journal_ids': [(6,0, cashids)]})
 
 

From 1d8007f03c5de0f3a660b4eb61542b1582f8eebd Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Mon, 17 Sep 2012 14:28:21 +0200
Subject: [PATCH 65/94] [FIX] an error from the last merge

bzr revid: abo@openerp.com-20120917122821-0kfcipo5nw5gps08
---
 .../crm_fundraising_view.xml.THIS             | 224 ------------------
 .../project_timesheet_data.xml.THIS           |  20 --
 2 files changed, 244 deletions(-)
 delete mode 100644 addons/crm_fundraising/crm_fundraising_view.xml.THIS
 delete mode 100644 addons/project_timesheet/project_timesheet_data.xml.THIS

diff --git a/addons/crm_fundraising/crm_fundraising_view.xml.THIS b/addons/crm_fundraising/crm_fundraising_view.xml.THIS
deleted file mode 100644
index 961ba2d6d3e..00000000000
--- a/addons/crm_fundraising/crm_fundraising_view.xml.THIS
+++ /dev/null
@@ -1,224 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-           <!-- Fund Raising Configuration Menu -->
-        <menuitem id="menu_config_fundrising" name="Fund Raising"
-            groups="base.group_no_one"
-            parent="base.menu_base_config" sequence="65" />
-
-        <!-- Fund Raising Categories Form View -->
-
-        <record id="crm_fund_categ_action" model="ir.actions.act_window">
-            <field name="name">Fundraising Categories</field>
-            <field name="res_model">crm.case.categ</field>
-            <field name="view_type">form</field>
-            <field name="view_id" ref="crm.crm_case_categ_tree-view"/>
-            <field name="domain">[('object_id.model', '=', 'crm.fundraising')]</field>
-            <field name="context" eval="{'object_id': ref('model_crm_fundraising')}"/>
-            <field name="help">Manage and define the fund raising categories you want to be maintained in the system.</field>
-        </record>
-
-        <menuitem action="crm_fund_categ_action" name="Categories"
-            id="menu_crm_case_fundraising-act" groups="base.group_no_one"
-            parent="menu_config_fundrising" />
-
-        <!-- Fund Stage Form View -->
-
-        <record id="crm_fundraising_stage_act" model="ir.actions.act_window">
-            <field name="name">Fundraising Stages</field>
-            <field name="res_model">crm.case.stage</field>
-            <field name="view_type">form</field>
-            <field name="view_id" ref="crm.crm_case_stage_tree"/>
-            <field name="context">{'search_default_fundraising':1}</field>
-            <field name="help">Create and manage fund raising activity categories you want to be maintained in the system.</field>
-        </record>
-
-        <!-- Fund Raising Tree View -->
-
-        <record model="ir.ui.view" id="crm_case_tree_view_fund">
-            <field name="name">CRM - Funds Tree</field>
-            <field name="model">crm.fundraising</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Funds Tree"
-                    colors="blue:state=='pending';grey:state in ('cancel', 'done')">
-                    <field name="name" string="Fund Description" />
-                    <field name="categ_id" />
-                    <field name="type_id" string="Payment Mode" />
-                    <field name="planned_cost" string="Amount" />
-                    <field name="probability" />
-                    <field name="user_id" />
-                    <field name="state" />
-                    <field name="partner_id" invisible="1"/>
-                </tree>
-            </field>
-        </record>
-
-        <!-- Fund Raising Form View -->
-
-        <record model="ir.ui.view" id="crm_case_form_view_fund">
-            <field name="name">CRM - Funds Form</field>
-            <field name="model">crm.fundraising</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form version="7.0">
-                <header>
-                    <button name="case_close" string="Done" states="open,pending" type="object" class="oe_highlight"/>
-                    <button name="case_open" string="Open" states="draft,pending" type="object" class="oe_highlight"/>
-                    <button name="case_pending" string="Pending" states="draft,open" type="object" class="oe_highlight"/>
-                    <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object"/>
-                    <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" />
-                    <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" />
-                    <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
-                </header>
-                <sheet string="Funds Form">
-                    <label for="name" class="oe_edit_only"/>
-                    <h1>
-                        <field name="name"/>
-                    </h1>
-                    <label for="categ_id" class="oe_edit_only"/>
-                    <h2>
-                        <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.fundraising')]" class="oe_inline"/>
-                    </h2>
-                    <group>
-                        <group>
-                            <field name="user_id" string="Responsible"/>
-                            <field name="section_id" colspan="1" widget="selection"/>
-                        </group>
-                        <group>
-                            <field name="date"/>
-                            <field name="type_id" string="Payment Mode" widget="selection"/>
-                            <field name="priority" string="Priority"/>
-                        </group>
-                    </group>
-                    <notebook>
-                        <page string="Funds">
-                            <group>
-                                <group>
-                                    <field name="partner_id"
-                                        on_change="onchange_partner_id(partner_id, email_from)"
-                                        />
-                                    <field name="email_from"/>
-                                </group>
-                                <group>
-                                    <field name="planned_cost"/>
-                                    <field name="planned_revenue"/>
-                                    <field name="probability"/>
-                                </group>
-                            </group>
-                            <separator colspan="4" string="Notes"/>
-                            <field name="description" placeholder="Add a note..."/>
-                        </page>
-                        <page string="Extra Info">
-                            <group>
-                                <group string="Misc">
-                                    <field name="active"/>
-                                    <field name="id"/>
-                                </group>
-                                <group groups="base.group_no_one" string="Dates">
-                                    <field name="create_date"/>
-                                    <field name="date_closed"/>
-                                    <field name="duration"/>
-                                </group>
-                                <group string="References">
-                                    <field name="ref"/>
-                                    <field name="ref2"/>
-                                </group>
-                            </group>
-                        </page>
-                    </notebook>
-                </sheet>
-                <div class="oe_chatter">
-                    <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
-                </div>
-                </form>
-            </field>
-        </record>
-
-        <!-- Fund Raising Calendar View -->
-
-        <record model="ir.ui.view" id="crm_case_calendar_view_fund">
-            <field name="name">CRM - Funds Calendar</field>
-            <field name="model">crm.fundraising</field>
-            <field name="type">calendar</field>
-            <field name="priority" eval="2"/>
-            <field name="arch" type="xml">
-                <calendar string="Funds" date_start="date" color="user_id" date_delay="duration">
-                    <field name="name"/>
-                    <field name="partner_id"/>
-                </calendar>
-            </field>
-        </record>
-
-        <!-- Fund Raising Graph View -->
-
-        <record model="ir.ui.view" id="crm_case_graph_view_fund">
-            <field name="name">CRM - Funds Graph</field>
-            <field name="model">crm.fundraising</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Funds by Categories" type="bar" orientation="horizontal">
-                    <field name="categ_id"/>
-                    <field name="planned_cost" operator="+"/>
-                    <field name="state" group="True"/>
-                </graph>
-            </field>
-        </record>
-
-        <!-- Fund Raising Search View -->
-        <record id="view_crm_case_fund_filter" model="ir.ui.view">
-                <field name="name">CRM - Funds Search</field>
-                <field name="model">crm.fundraising</field>
-                <field name="type">search</field>
-                <field name="arch" type="xml">
-                    <search string="Search Funds">
-                        <group>
-                            <field name="name" string="Fund Description"/>
-                            <separator orientation="vertical" />
-                            <filter icon="terp-check" string="New"
-                                domain="[('state','=','draft')]" name="current"
-                                help="New Funds" />
-                            <filter icon="terp-camera_test" string="Open"
-                                domain="[('state','=','open')]"
-                                help="Open Funds" />
-                            <filter icon="terp-gtk-media-pause"
-                                string="Pending"
-                                domain="[('state','=','pending')]"
-                                help="Pending Funds" />
-                            <separator orientation="vertical" />
-                            <filter string="Unassigned"
-                                    icon="terp-personal-"
-                                    domain="[('user_id','=', False)]"
-                                    help="Unassigned" />
-                            <filter string="Assigned to Me or to My Sales Team(s)" 
-                                    icon="terp-personal+"
-                                    domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
-                                    help="Fund Raisings that are assigned to me or to one of the sale teams I manage" />
-                            <separator orientation="vertical" />
-                            <field name="state"/>
-                            <field name="user_id" 
-                                widget="selection"/>
-                            <field name="section_id" widget="selection" string="Sales Team"/>
-                        </group>
-                        <newline/>
-                        <group expand="0" string="Group By...">
-                            <filter string="Partner" icon="terp-partner"
-                                domain="[]"
-                                context="{'group_by':'partner_id'}" />
-                            <filter string="Responsible" icon="terp-personal"
-                                domain="[]"
-                                context="{'group_by':'user_id'}" />
-                            <filter string="Category" help="Fund Category"
-                                icon="terp-stock_symbol-selection" domain="[]"
-                                context="{'group_by':'categ_id'}" />
-                            <filter string="Payment Mode" help="Payment Mode"
-                                icon="terp-dolar" domain="[]"
-                                context="{'group_by':'type_id'}" />
-                            <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]"
-                                context="{'group_by':'state'}" />
-                        </group>
-                    </search>
-                </field>
-            </record>
-    </data>
-</openerp>
diff --git a/addons/project_timesheet/project_timesheet_data.xml.THIS b/addons/project_timesheet/project_timesheet_data.xml.THIS
deleted file mode 100644
index fc6597595ae..00000000000
--- a/addons/project_timesheet/project_timesheet_data.xml.THIS
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" ?>
-<openerp>
-    <data noupdate="1">
-
-      <!--   <record id="base.menu_project_management_time_tracking" model="ir.ui.menu">
-            <field name="name">Time Tracking</field>
-            <field eval="5" name="sequence"/>
-            <field name="parent_id" ref="base.menu_main_pm"/>
-        </record>
-
-        <record id="menu_act_project_management_timesheet_sheet_form" model="ir.ui.menu">
-            <field name="name">My Timesheet</field>
-            <field eval="5" name="sequence"/>
-            <field name="parent_id" ref="base.menu_project_management_time_tracking"/>
-            <field name="icon">STOCK_JUSTIFY_FILL</field>
-            <field name="action" ref="hr_timesheet_sheet.ir_actions_server_timsheet_sheet"/>
-        </record> -->
-
-    </data>
-</openerp>

From 313c4ef511115dd598a23a3698dc8ad25fe21126 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 17 Sep 2012 14:30:54 +0200
Subject: [PATCH 66/94] [IMP] note: search, css

bzr revid: chm@openerp.com-20120917123054-futj80nzfo725kiv
---
 addons/note/note.py              | 17 ++++++++++++-----
 addons/note/note_demo.xml        |  9 ---------
 addons/note/note_view.xml        | 17 +++++++++--------
 addons/note/security/ir.rule.xml |  9 +++++++++
 4 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/addons/note/note.py b/addons/note/note.py
index 429c16eed6d..33d138de641 100644
--- a/addons/note/note.py
+++ b/addons/note/note.py
@@ -22,6 +22,7 @@
 from openerp.osv import osv, fields
 from tools.translate import _
 import re
+from openerp.tools.misc import html2plaintext
 
 class note_stage(osv.osv):
     """ Category of Note """
@@ -60,6 +61,10 @@ class note_note(osv.osv):
         rec_id = self.create(cr, uid, {'memo': name}, context=context)
         return self.name_get(cr, uid, [rec_id], context)[0]
 
+    def _from_xml(self, mappings):
+        return chr(int( mappings.group(1) ))
+    
+
     #read the first line (convert hml into text)
     def _get_note_first_line(self, cr, uid, ids, name="", args={}, context=None):
         res = {}
@@ -67,13 +72,14 @@ class note_note(osv.osv):
             text_note = (note.memo or '').strip().split('\n')[0]
             text_note = re.sub(r'(\S?)(<br[ /]*>|<[/]?p>|<[/]?div>|<table>)[\s\S]*',r'\1',text_note)
             text_note = re.sub(r'<[^>]+>','',text_note)
+            text_note = html2plaintext(text_note)
             res[note.id] = text_note
             
         return res
 
     #unactivate a sticky note and record the date
     def onclick_note_is_done(self, cr, uid, ids, context=None):
-        self.write(cr, uid, ids, { 'active' : False, 'date_done' : fields.date.today() })
+        self.write(cr, uid, ids, { 'open' : False, 'date_done' : fields.date.today() })
         
         self.message_post(cr, uid, ids[0], body='This sticky note is active', subject=False, 
             type='notification', parent_id=False, attachments=None, context=context)
@@ -82,7 +88,7 @@ class note_note(osv.osv):
 
     #activate a Sticky note
     def onclick_note_not_done(self, cr, uid, ids, context=None):
-        self.write(cr, uid, ids, { 'active' : True })
+        self.write(cr, uid, ids, { 'open' : True })
 
         self.message_post(cr, uid, ids[0], body='This sticky note is close', subject=False, 
             type='notification', parent_id=False, attachments=None, context=context)
@@ -124,7 +130,8 @@ class note_note(osv.osv):
     _columns = {
         'name': fields.function(_get_note_first_line, 
             string='Sticky note Summary', 
-            type='text', store=True),
+            type='text',
+            store=True),
         'memo': fields.html('Pad Content'),
         'sequence': fields.integer('Sequence'),
 
@@ -140,7 +147,7 @@ class note_note(osv.osv):
         # stage per user
         'stage_ids': fields.many2many('note.stage','note_stage_rel','note_id','stage_id','Linked stages users'),
 
-        'active': fields.boolean('Active'),
+        'open': fields.boolean('Active'),
         # when the user unactivate the Sticky note, record de date for un display Sticky note after 1 days
         'date_done': fields.date('Date done'),
         'color': fields.integer('Color Index'),
@@ -151,7 +158,7 @@ class note_note(osv.osv):
     }
 
     _defaults = {
-        'active' : 1,
+        'open' : 1,
         'stage_id' : _get_default_stage_id,
         'memo': " "
     }
diff --git a/addons/note/note_demo.xml b/addons/note/note_demo.xml
index 88b21effb7e..8b76887e577 100644
--- a/addons/note/note_demo.xml
+++ b/addons/note/note_demo.xml
@@ -115,14 +115,5 @@
       <field name="color">7</field>
     </record>
 
-    <record id="note_13" model="note.note">
-      <field name="memo"><![CDATA[Read those books
-      <br/><br/>* Open ERP: a modern approach to integrated business management
-      <br/>* Open ERP for Retail and Industrial Management
-      ]]>
-      </field>
-      <field name="stage_id" ref="note_stage_03"/>
-    </record>
-
   </data>
 </openerp>
diff --git a/addons/note/note_view.xml b/addons/note/note_view.xml
index 232b96f643a..5617fae4376 100644
--- a/addons/note/note_view.xml
+++ b/addons/note/note_view.xml
@@ -51,7 +51,7 @@
           <field name="sequence"/>
           <field name="name"/>
           <field name="stage_id"/>
-          <field name="active"/>
+          <field name="open"/>
           <field name="memo"/>
           <field name="date_done"/>
           <field name="current_partner_id"/>
@@ -65,8 +65,8 @@
               <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_global_click_edit oe_semantic_html_override oe_kanban_card #{record.group_fancy==1 ? 'oe_kanban_card_fancy' : ''}">
                 <div class="oe_dropdown_kanban">
                   <span>
-                    <a name="onclick_note_is_done" type="object" t-if="record.active.raw_value" class="oe_e">W</a>
-                    <a name="onclick_note_not_done" type="object" t-if="!record.active.raw_value" class="oe_e">è</a>
+                    <a name="onclick_note_is_done" type="object" t-if="record.open.raw_value" class="oe_e">W</a>
+                    <a name="onclick_note_not_done" type="object" t-if="!record.open.raw_value" class="oe_e">è</a>
                   </span>
 
                   <!-- dropdown menu -->
@@ -80,7 +80,7 @@
                 </div>
 
                 <!-- kanban memo -->
-                <div t-attf-class="oe_kanban_content #{record.active.raw_value ? '' : 'note_text_line_through'}">
+                <div t-attf-class="oe_kanban_content #{record.open.raw_value ? '' : 'note_text_line_through'}">
                   <!-- title -->
                   <field name="name"/>
                 </div>
@@ -107,7 +107,7 @@
       <field name="arch" type="xml">
         <tree string="Stages">
           <field name="name"/>
-          <field name="active"/>
+          <field name="open"/>
           <field name="stage_id"/>
           <field name="tag_ids" widget="many2many_tags" groups="note.group_note_tags"/>
         </tree>
@@ -143,8 +143,9 @@
           <field name="memo" string="Sticky note"/>
           <field name="stage_id"/>
           <field name="tag_ids" groups="note.group_note_tags"/>
-          <filter name="active_true" string="Active" domain="['|',('active', '=', True),('date_done','=',time.strftime('%%Y-%%m-%%d'))]"/>
-          <filter name="active_false" string="Old" domain="[('active', '=', False)]"/>
+          <filter name="open_true" string="Active" domain="[('open', '=', True)]"/>
+          <filter name="open_today" string="Today" domain="['|',('open', '=', True),('date_done','=',time.strftime('%%Y-%%m-%%d'))]"/>
+          <filter name="open_false" string="Older" domain="[('open', '=', False)]"/>
           <group expand="0" string="Group By...">
             <filter icon="terp-stock_symbol-selection" string="Stage" help="By sticky note Category" context="{'group_by':'stage_id'}"/>
           </group>
@@ -188,7 +189,7 @@
       <field name="view_type">form</field>
       <field name="view_mode">kanban,tree,form</field>
       <field name="search_view_id" ref="view_note_note_filter"/>
-      <field name="context">{'search_default_active_true':True}</field>
+      <field name="context">{'search_default_open_true':True}</field>
     </record>
 
     <menuitem name="Sticky notes" id="note_notes" parent="note_my_stuff" sequence="20" action="action_note_note"/>
diff --git a/addons/note/security/ir.rule.xml b/addons/note/security/ir.rule.xml
index 82994b960c2..5f4882c3048 100644
--- a/addons/note/security/ir.rule.xml
+++ b/addons/note/security/ir.rule.xml
@@ -1,12 +1,21 @@
 <?xml version="1.0"?>
 <openerp>
 <data>
+
   <record id="note_note_rule_global" model="ir.rule">
     <field name="name">Only followers can access a sticky notes</field>
     <field model="ir.model" ref="model_note_note" name="model_id"/>
     <field name="domain_force">['|',('message_follower_ids','=',False),('message_follower_ids','=',user.partner_id.id)]</field>
     <field eval="True" name="global"/>
   </record>
+
+  <record id="note_stage_rule_global" model="ir.rule">
+    <field name="name">Each user have his stage name</field>
+    <field model="ir.model" ref="model_note_stage" name="model_id"/>
+    <field name="domain_force">['|',('user_id','=',False),('user_id','=',user.id)]</field>
+    <field eval="True" name="global"/>
+  </record>
+
 </data>
 </openerp>
 

From 2a4aaeba31b685d5771f134ef2806d2e3dbb7a43 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Mon, 17 Sep 2012 16:01:38 +0200
Subject: [PATCH 67/94] [FIX] point_of_sale: Show/Hide some groups in function
 of the state and the cash_control flag

bzr revid: stw@openerp.com-20120917140138-sjsnjxv27nd8rnao
---
 addons/point_of_sale/point_of_sale_view.xml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 80abb5444db..eefdcc6dd6e 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -896,8 +896,8 @@
                                 <field name="stop_at" attrs="{'invisible' : [('state', '!=', 'closed')]}"/>
                             </group>
                             <newline/>
-
-                            <group string="Opening Cash Control" attrs="{'invisible' : ['|', ('cash_control', '=', False),('state', 'in', ('opened', 'closing_control'))]}">
+                            <group string="Opening Cash Control" attrs="{'invisible' : [ '&amp;' ,'!', '&amp;', ('state', '=', 'opening_control'), ('cash_control', '=', True), ('state', '!=',
+                                'closed')]  }" >
                                 <field name="opening_details_ids" nolabel="1" colspan="2" attrs="{'readonly' : [('state', 'not in', ('opening_control',))]}">
                                     <tree string="Opening Cashbox Lines" editable="bottom">
                                         <field name="pieces" readonly="1" />
@@ -906,7 +906,8 @@
                                     </tree>
                                 </field>
                             </group>
-                            <group string="Closing Cash Control" attrs="{'invisible': ['|', ('cash_control', '=', False), ('state', 'in', ('opening_control', 'opened'))]}">
+                            <group string="Closing Cash Control" attrs="{'invisible' : [ '&amp;' ,'!', '&amp;', ('state', '=', 'closing_control'), ('cash_control', '=', True), ('state', '!=',
+                                'closed')]  }" >
                                 <field name="details_ids" nolabel="1" colspan="2">
                                     <tree string="Cashbox Lines" editable="bottom">
                                         <field name="pieces" readonly="1" />
@@ -916,7 +917,7 @@
                                 </field>
                             </group>
 
-                            <div attrs="{'invisible' : ['|', ('cash_control', '=', False),('state', 'in', ('opened', 'closing_control'))]}">
+                            <div attrs="{'invisible' : [('state', '!=', 'closed')]}">
                                 <group class="oe_subtotal_footer oe_right">
                                     <field name="cash_register_balance_start" readonly="1" string="Opening Balance" class="oe_subtotal_footer_separator"/>
                                     <field name="cash_register_total_entry_encoding"  attrs="{'invisible' : [('state', '=', 'opening_control')]}" string="+ Transactions"/>
@@ -933,7 +934,7 @@
                             </div>
 
 
-                            <group class="oe_subtotal_footer oe_right" attrs="{'invisible': ['|', ('cash_control', '=', False), ('state', 'in', ('opening_control', 'opened'))]}">
+                            <group class="oe_subtotal_footer oe_right" attrs="{'invisible': [('state', '!=', 'closed')]}">
                                 <field name="cash_register_balance_end_real" class="oe_subtotal_footer_separator"/>
                                 <field name="cash_register_difference"  class="oe_subtotal_footer_separator"/>
                             </group>

From 62cda268febf432ad530899340beb14527e5332a Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 17 Sep 2012 16:06:30 +0200
Subject: [PATCH 68/94] [IMP] invert Save and new, Save and Close

bzr revid: fp@tinyerp.com-20120917140630-sxk5cuiaadfc8wn4
---
 addons/web/static/src/xml/base.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index e34f3827dcf..5c58c3a1d3c 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1237,8 +1237,8 @@
             <button type="button" class="oe_button oe_abstractformpopup-form-save oe_highlight">Save</button>
         </t>
         <t t-if="multi_select">
-            <button type="button" class="oe_button oe_abstractformpopup-form-save-new oe_highlight">Save &amp; New</button>
             <button type="button" class="oe_button oe_abstractformpopup-form-save oe_highlight">Save &amp; Close</button>
+            <button type="button" class="oe_button oe_abstractformpopup-form-save-new oe_highlight">Save &amp; New</button>
         </t>
         or
     </t>

From abf3d2bd53c3bdc8e0c8191ab3b1c78c0c36d34b Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 17 Sep 2012 16:47:40 +0200
Subject: [PATCH 69/94] [IMP] product explanation about the business flow

bzr revid: fp@tinyerp.com-20120917144740-2hsb04t8dpzxzuue
---
 addons/mail/data/mail_group_data.xml    |  2 +-
 addons/mrp/mrp_view.xml                 | 11 +++++++++--
 addons/product/product_view.xml         | 24 ++++++++++++++++++++++--
 addons/project_mrp/project_mrp_view.xml | 11 +++++++++--
 addons/purchase/purchase_view.xml       | 14 ++++++++++++++
 5 files changed, 55 insertions(+), 7 deletions(-)

diff --git a/addons/mail/data/mail_group_data.xml b/addons/mail/data/mail_group_data.xml
index 53720926a5c..11d0ee7d04b 100644
--- a/addons/mail/data/mail_group_data.xml
+++ b/addons/mail/data/mail_group_data.xml
@@ -7,7 +7,7 @@
             <field name="description">Discussion about best sales practices and deals.</field>
         </record>
         <record model="mail.group" id="group_all_employees">
-            <field name="name">All Employees</field>
+            <field name="name">Whole Company</field>
             <field name="group_ids" eval="[(4, ref('base.group_user'))]"/>
             <field name="description">Discussion about best sales practices and deals.</field>
         </record>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index ec66b5692c0..d05893cf778 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -956,9 +956,16 @@
             <field name="model">product.product</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
-                <xpath expr="//field[@name='procure_method']" position="after">
-                    <field name="supply_method" groups="base.group_user"/>
+                <xpath expr="//field[@name='supply_method']" position="attributes">
+                    <attribute name="invisible">False</attribute>
                 </xpath>
+                <group name="procurement_help" position="inside">
+                    <p attrs="{'invisible': [('type','=','service'),('procure_method','&lt;&gt;','make_to_order'),('supply_method','&lt;&gt;','produce')]}">
+                        When you sell this product, OpenERP will trigger <b>a manufacturing
+                        order</b> using the bill of materials assigned to this product.
+                        The delivery order will be ready once the production is done.
+                    </p>
+</group>
             </field>
         </record>
 
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 13474351744..d04e6f17fe8 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -106,11 +106,31 @@
                                 <group name="procurement">
                                     <group>
                                         <field name="procure_method" groups="base.group_user"/>
+                                        <field name="supply_method" groups="base.group_user" invisible="1"/>
                                         <field name="cost_method" groups="product.group_costing_method"/>
                                         <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/>
                                     </group>
-                                    <group>
-                                        <field name="uom_po_id" groups="product.group_uom"/>
+                                    <group name="procurement_help" class="oe_grey" col="1">
+                                        <p attrs="{'invisible': [('type','&lt;&gt;','service'),('procure_method','&lt;&gt;','make_to_stock')]}">
+                                            When you sell this service, nothing special will be trigered
+                                            to deliver the customer.
+                                        </p>
+                                        <p attrs="{'invisible': [('type','&lt;&gt;','product'),('procure_method','&lt;&gt;','make_to_stock')]}">
+                                            When you sell this product, OpenERP will <b>use the available inventory</b>
+                                            for the delivery order.
+                                            <br/>
+                                            If there are not enough quantities available, the delivery order
+                                            will wait for new products. You should create others rules
+                                            (orderpoints, manual purchase orders) to fulfill the inventory.
+                                        </p>
+                                        <p attrs="{'invisible': [('type','&lt;&gt;','consu'),('procure_method','&lt;&gt;','make_to_stock')]}">
+                                            When you sell this product, a delivery order will be created.
+                                            OpenERP will consider that the <b>required quantities are always
+                                            available</b> as it's a consumable (the stock on hand may become negative).
+                                        </p>
+                                    </group>
+                                    <group groups="product.group_uom">
+                                        <field name="uom_po_id"/>
                                     </group>
                                 </group>
                                 <separator string="Notes for Suppliers"/>
diff --git a/addons/project_mrp/project_mrp_view.xml b/addons/project_mrp/project_mrp_view.xml
index ca1e1f893e7..51de9dd5cf3 100644
--- a/addons/project_mrp/project_mrp_view.xml
+++ b/addons/project_mrp/project_mrp_view.xml
@@ -36,9 +36,16 @@
             <field name="model">product.product</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
-                <xpath expr="//field[@name='procure_method']" position="after">
-                    <field name="supply_method" groups="base.group_user"/>
+                <xpath expr="//field[@name='supply_method']" position="attributes">
+                    <attribute name="invisible">False</attribute>
                 </xpath>
+                <group name="procurement_help" position="inside">
+                    <p attrs="{'invisible': [('type','&lt;&gt;','service'),('procure_method','&lt;&gt;','make_to_order'),('supply_method','&lt;&gt;','produce')]}">
+                        When you sell this service to a customer, <b>a task</b> will be 
+                        created to follow up the job to do. This task will appear
+                        in the project related to the contract of the sale order.
+                    </p>
+                </group>
             </field>
         </record>
     </data>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 53f27245e7e..796fd1351a9 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -572,6 +572,20 @@
                      <separator string="Suppliers"/>
                      <field name="seller_ids" context="{'uom_id': uom_id}"/>
                 </group>
+                <group name="procurement_help" position="inside">
+                    <p attrs="{'invisible': [('type','&lt;&gt;','service'),('procure_method','&lt;&gt;','make_to_order'),('supply_method','&lt;&gt;','buy')]}">
+                        When you sell this service to a customer, <b>a draft purchase order</b>
+                        will be created in order to subcontract the job 
+                        <i attrs="{'invisible': [('seller_id','=',False)]}">to 
+                        <field name="seller_id" class="oe_inline"/></i>.
+                    </p>
+                    <p attrs="{'invisible': [('type','=','service'),('procure_method','&lt;&gt;','make_to_order'),('supply_method','&lt;&gt;','buy')]}">
+                        When you sell this product, OpenERP will trigger <b>a draft
+                        purchase order</b> to buy the required quantities to the supplier.
+                        The delivery order will be ready after having received the
+                        products.
+                    </p>
+                </group>
             </field>
         </record>
     </data>

From 091b2d4892444b291d48a3c48e014f05543961d2 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Mon, 17 Sep 2012 16:53:45 +0200
Subject: [PATCH 70/94] [FIX] typo

bzr revid: abo@openerp.com-20120917145345-atyfzfq6juls0siu
---
 addons/event/event_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index e2ff2e67e87..0bf0e9e743b 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -166,7 +166,7 @@
                                         <field name="nb_register" />
                                         <field name="state"/>
                                         <button name="registration_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
-                                        <button name="button_reg_close" string="Attented the Event" states="open" type="object" icon="gtk-jump-to"/>
+                                        <button name="button_reg_close" string="Attended the Event" states="open" type="object" icon="gtk-jump-to"/>
                                         <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
                                     </tree>
                                     <form string="Registration">

From 2ee0b276cc598f95b31e42a69ea938ee75c1882e Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 17 Sep 2012 17:05:48 +0200
Subject: [PATCH 71/94] [FIX] account: accounting creation from bank statement
 fixed (no partner was assigned on receivable/payable account.move.line)

bzr revid: qdp-launchpad@openerp.com-20120917150548-l081zgzoxz0c8qw5
---
 addons/account/account_bank_statement.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 095d461ff3b..2dc7f96768f 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -304,7 +304,7 @@ class account_bank_statement(osv.osv):
             'date': st_line.date,
             'ref': st_line.ref,
             'move_id': move_id,
-            'partner_id': partner_id,
+            'partner_id': par_id,
             'account_id': acc_id,
             'credit': credit,
             'debit': debit,

From bfaaf55f9f52c57cca39ade6423f8eeb8fccc896 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 17 Sep 2012 18:33:01 +0200
Subject: [PATCH 72/94] [IMP] events form view cleaned

bzr revid: fp@tinyerp.com-20120917163301-8b1hf7cklxmx4pcn
---
 addons/event/event.py       | 10 ++++++++--
 addons/event/event_view.xml | 40 +++++++++++++++++++------------------
 2 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index 747981f854b..44def4f0c76 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -207,6 +207,8 @@ class event_event(osv.osv):
         'main_speaker_id': fields.many2one('res.partner','Main Speaker', readonly=False, states={'done': [('readonly', True)]}, help="Speaker who will be giving speech at the event."),
         'address_id': fields.many2one('res.partner','Location Address', readonly=False, states={'done': [('readonly', True)]}),
         'street': fields.related('address_id','street',type='char',string='Street'),
+        'street2': fields.related('address_id','street2',type='char',string='Street2'),
+        'state_id': fields.related('address_id','state_id',type='many2one', relation="res.country.state", string='State'),
         'zip': fields.related('address_id','zip',type='char',string='zip'),
         'city': fields.related('address_id','city',type='char',string='city'),
         'speaker_confirmed': fields.boolean('Speaker Confirmed', readonly=False, states={'done': [('readonly', True)]}),
@@ -265,16 +267,20 @@ class event_event(osv.osv):
     def on_change_address_id(self, cr, uid, ids, address_id, context=None):
         values = {
             'street' : False,
+            'street2' : False,
             'city' : False,
             'zip' : False,
+            'country_id' : False,
+            'state_id' : False,
         }
         if isinstance(address_id, (long, int)):
             address = self.pool.get('res.partner').browse(cr, uid, address_id, context=context)
-
             values.update({
                 'street' : address.street,
-
+                'street2' : address.street2,
                 'city' : address.city,
+                'country_id' : address.country_id and address.country_id.id,
+                'state_id' : address.state_id and address.state_id.id,
                 'zip' : address.zip,
             })
 
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 2e50822cd7b..fd396053d5d 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -111,52 +111,54 @@
                     </header>
                     <sheet>
                         <div class="oe_right oe_button_box">
-                            <button name="%(event.act_event_list_register_event)d" type="action" string="Registration" icon="gtk-index" help="Register with this event"/>
+                            <button name="%(event.act_event_list_register_event)d" type="action" string="Registrations" help="Register with this event"/>
                         </div>
                         <div class="oe_title">
                             <label for="name" class="oe_edit_only"/>
                             <h1><field name="name"/></h1>
                         </div>
                         <div>
-                            <h2>From <field name="date_begin" class="oe_inline" /> to <field name="date_end" class="oe_inline"/>
-                            </h2>
                             <group>
                                 <group>
-                                    <label for="address_id" string="Location Address"/>
+                                    <label for="address_id" string="Location"/>
                                     <div>
-                                        <field name="address_id" widget="many2one_address_google_map" widget_option="{'placeholder':'.oe_google_map'}" on_change="on_change_address_id(address_id)" />
+                                        <field name="address_id" on_change="on_change_address_id(address_id)" />
                                         <field name="street" placeholder="Street..."/>
-                                        <div>
-                                            <field name="zip" class="oe_inline" placeholder="Zip"/>
-                                            <field name="city" class="oe_inline" placeholder="City"/>
+                                        <field name="street2"/>
+                                        <div class="address_format">
+                                            <field name="city" placeholder="City" style="width: 40%%"/>
+                                            <field name="state_id" class="oe_no_button" placeholder="State" style="width: 37%%" options='{"no_open": true}'/>
+                                            <field name="zip" placeholder="ZIP" style="width: 20%%"/>
                                         </div>
+                                        <field name="country_id" placeholder="Country" class="oe_no_button" options='{"no_open": true}'/>
                                     </div>
                                 </group>
                                 <group>
                                     <field name="type" on_change="onchange_event_type(type,context)"/>
-                                    <field name="register_min"/>
-                                    <field name="register_max"/>
-                                    <label for="register_current" string="Current Registrations" groups="base.group_user"/>
-                                    <div groups="base.group_user">
-                                       Confirmed: <field name="register_current" class="oe_inline"/>, Unconfirmed: <field name="register_prospect" class="oe_inline"/>
-                                    </div>
+                                    <field name="date_begin"/>
+                                    <field name="date_end"/>
                                 </group>
                             </group>
                         </div>
-                        <div class="oe_google_map" style="height: 200px"></div>
                         <notebook>
                             <page string="Event Description">
                                 <field name="note" colspan="4" nolabel="1"/>
                             </page>
-                            <page string="Internal Data">
+                            <page string="Registrations">
                                 <group>
+                                    <group>
+                                        <field name="register_min"/>
+                                        <field name="register_max"/>
+                                        <label for="register_current" string="Current Registrations" groups="base.group_user"/>
+                                        <div groups="base.group_user">
+                                             <field name="register_prospect" class="oe_inline"/> (confirmed: <field name="register_current" class="oe_inline"/>)
+                                        </div>
+                                        <field name="register_attended"/>
+                                    </group>
                                     <group>
                                         <field name="main_speaker_id" domain="[('speaker','=',True)]" context="{'default_speaker':1}"/>
                                         <field name="speaker_confirmed"/>
                                     </group>
-                                    <group>
-                                        <field name="register_attended"/>
-                                    </group>
                                 </group>
                                 <field name="registration_ids" colspan="4" nolabel="1" groups="event.group_event_manager,event.group_event_user">
                                     <tree string="Registration" editable="top">

From e918a9ecef18a073f73e09659e3bf826bbbec5e5 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 17 Sep 2012 18:49:39 +0200
Subject: [PATCH 73/94] [FIX] removed buggy dashboard on treasury

bzr revid: fp@tinyerp.com-20120917164939-6n0hsl364aw17rfo
---
 addons/account/account_view.xml       | 10 ----------
 addons/account/board_account_view.xml | 13 -------------
 2 files changed, 23 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 4ddeaf2f3b4..20aa198c63f 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -252,16 +252,6 @@
                 </tree>
             </field>
         </record>
-        <record id="view_treasory_graph" model="ir.ui.view">
-           <field name="name">account.treasury.graph</field>
-           <field name="model">account.account</field>
-           <field name="arch" type="xml">
-               <graph string="Treasury Analysis" type="bar">
-                  <field name="name"/>
-                  <field name="balance" operator="+"/>
-               </graph>
-         </field>
-      </record>
         <record id="action_account_form" model="ir.actions.act_window">
             <field name="name">Accounts</field>
             <field name="res_model">account.account</field>
diff --git a/addons/account/board_account_view.xml b/addons/account/board_account_view.xml
index 563c3f5fc6c..abbc81ade2b 100644
--- a/addons/account/board_account_view.xml
+++ b/addons/account/board_account_view.xml
@@ -12,16 +12,6 @@
             <field name="domain">[('year','=',time.strftime('%Y'))]</field>
         </record>
 
-        <record id="action_treasory_graph" model="ir.actions.act_window">
-            <field name="name">Treasury</field>
-            <field name="res_model">account.account</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">graph,tree</field>
-            <field name="domain">[('type','=','liquidity')]</field>
-            <field name="context">{'default_type': 'liquidity'}</field>
-            <field name="view_id" ref="account.view_treasory_graph"/>
-        </record>
-
         <record id="board_account_form" model="ir.ui.view">
             <field name="name">board.account.form</field>
             <field name="model">board.board</field>
@@ -31,9 +21,6 @@
                         <column>
                             <action name="%(action_company_analysis_tree)d" string="Company Analysis"/>
                         </column>
-                        <column>
-                            <action name="%(action_treasory_graph)d" string="Treasury"/>
-                        </column>
                     </board>
                 </form>
             </field>

From 77a85840ab621d8c18f46d8d1911d13b48a4a772 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Mon, 17 Sep 2012 19:28:18 +0200
Subject: [PATCH 74/94] [IMP] code cleaning

bzr revid: abo@openerp.com-20120917172818-v3hds9c2zj02uz7s
---
 addons/base_calendar/crm_meeting.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/base_calendar/crm_meeting.py b/addons/base_calendar/crm_meeting.py
index c339610e956..4ea4776ad9b 100644
--- a/addons/base_calendar/crm_meeting.py
+++ b/addons/base_calendar/crm_meeting.py
@@ -65,10 +65,10 @@ class crm_meeting(base_state, osv.Model):
     _defaults = {
         'state': 'open',
     }
-    
+
     def copy(self, cr, uid, id, default=None, context=None):
         default = default or {}
-        default.update({'attendee_ids' : []})
+        default['attendee_ids'] = False
         return super(crm_meeting, self).copy(cr, uid, id, default, context)
 
     # ----------------------------------------

From 4ab0705aca414f9745bd1adaafadf2e20cb7824f Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Tue, 18 Sep 2012 04:48:27 +0000
Subject: [PATCH 75/94] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120918044827-ox7fgnpk22mmhptp
---
 addons/base_calendar/i18n/mk.po               | 1520 +++++++++++++++++
 .../purchase_double_validation/i18n/es_EC.po  |    4 +-
 2 files changed, 1522 insertions(+), 2 deletions(-)
 create mode 100644 addons/base_calendar/i18n/mk.po

diff --git a/addons/base_calendar/i18n/mk.po b/addons/base_calendar/i18n/mk.po
new file mode 100644
index 00000000000..2f873ab5446
--- /dev/null
+++ b/addons/base_calendar/i18n/mk.po
@@ -0,0 +1,1520 @@
+# Macedonian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-09-17 15:05+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Macedonian <mk@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-09-18 04:48+0000\n"
+"X-Generator: Launchpad (build 15966)\n"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation Type"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_related:0
+#: selection:res.alarm,trigger_related:0
+msgid "The event starts"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Declined Invitations"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,exdate:0
+#: help:calendar.todo,exdate:0
+msgid ""
+"This property defines the list of date/time exceptions for a recurring "
+"calendar component."
+msgstr ""
+
+#. module: base_calendar
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,we:0
+#: field:calendar.todo,we:0
+msgid "Wed"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Monthly"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Unknown"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invited User"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,recurrency:0
+#: help:calendar.todo,recurrency:0
+msgid "Recurrent Meeting"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
+#: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_avail_alarm
+msgid "Alarms"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Sunday"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: field:calendar.attendee,role:0
+msgid "Role"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Invitation details"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Fourth"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:1006
+#, python-format
+msgid "Count cannot be negative"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,day:0
+#: selection:calendar.event,select1:0
+#: field:calendar.todo,day:0
+#: selection:calendar.todo,select1:0
+msgid "Date of month"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,class:0
+#: selection:calendar.todo,class:0
+msgid "Public"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid " "
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "March"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:418
+#: code:addons/base_calendar/base_calendar.py:1411
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,rrule_type:0
+#: field:calendar.todo,rrule_type:0
+msgid "Recurrency"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Friday"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,allday:0
+#: field:calendar.todo,allday:0
+msgid "All Day"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,select1:0
+#: field:calendar.todo,select1:0
+msgid "Option"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,availability:0
+#: selection:calendar.event,show_as:0
+#: selection:calendar.todo,show_as:0
+#: selection:res.users,availability:0
+msgid "Free"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,rsvp:0
+msgid "Indicats whether the favor of a reply is requested"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,alarm_id:0
+msgid "Basic Alarm"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,delegated_to:0
+msgid "The users that the original request was delegated to"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,ref:0
+msgid "Event Ref"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Show Time as"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,tu:0
+#: field:calendar.todo,tu:0
+msgid "Tue"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Third"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Yearly"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Last"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Room"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Accepted Invitations"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_interval:0
+#: selection:res.alarm,trigger_interval:0
+msgid "Days"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:1194
+#: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:96
+#: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:143
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,role:0
+msgid "Chair Person"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,action:0
+msgid "Procedure"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:1004
+#, python-format
+msgid "Interval cannot be negative"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,state:0
+#: selection:calendar.todo,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:143
+#, python-format
+msgid "%s must have an email  address to send mail"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_interval:0
+#: selection:res.alarm,trigger_interval:0
+msgid "Minutes"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,action:0
+msgid "Display"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation type"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,state:0
+msgid "Status of the attendee's participation"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_related:0
+#: selection:res.alarm,trigger_related:0
+msgid "The event ends"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Group By..."
+msgstr ""
+
+#. module: base_calendar
+#: help:base_calendar.invite.attendee,email:0
+msgid "Provide external email address who will receive this invitation."
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,partner_id:0
+msgid "Partner related to contact"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,cutype:0
+msgid "Specify the type of Invitation"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,event_end_date:0
+#: field:calendar.attendee,event_end_date:0
+msgid "Event End Date"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,role:0
+msgid "Optional Participation"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,date_deadline:0
+#: field:calendar.todo,date_deadline:0
+msgid "Deadline"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:389
+#: code:addons/base_calendar/base_calendar.py:1004
+#: code:addons/base_calendar/base_calendar.py:1006
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,active:0
+#: help:calendar.todo,active:0
+msgid ""
+"If the active field is set to          true, it will allow you to hide the "
+"event alarm information without removing it."
+msgstr ""
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,partner_id:0
+#: view:calendar.attendee:0
+#: field:calendar.attendee,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,organizer:0
+#: field:calendar.event,organizer_id:0
+#: field:calendar.todo,organizer:0
+#: field:calendar.todo,organizer_id:0
+msgid "Organizer"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+#: field:calendar.event,user_id:0
+#: field:calendar.todo,user_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: model:res.request.link,name:base_calendar.request_link_meeting
+msgid "Event"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_occurs:0
+#: selection:res.alarm,trigger_occurs:0
+msgid "Before"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: selection:calendar.event,state:0
+#: selection:calendar.todo,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,attendee_ids:0
+#: field:calendar.event,attendee_ids:0
+#: field:calendar.todo,attendee_ids:0
+msgid "Attendees"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:1411
+#, python-format
+msgid "Group by date not supported, use the calendar view instead"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Confirm"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_todo
+msgid "Calendar Task"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,su:0
+#: field:calendar.todo,su:0
+msgid "Sun"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,cutype:0
+msgid "Invite Type"
+msgstr ""
+
+#. module: base_calendar
+#: view:res.alarm:0
+msgid "Reminder details"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,parent_ids:0
+msgid "Delegrated From"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,select1:0
+#: selection:calendar.todo,select1:0
+msgid "Day of month"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event,location:0
+#: field:calendar.todo,location:0
+msgid "Location"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,class:0
+#: selection:calendar.todo,class:0
+msgid "Public for Employees"
+msgstr ""
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,send_mail:0
+msgid "Send mail?"
+msgstr ""
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,email:0
+#: selection:calendar.alarm,action:0
+#: field:calendar.attendee,email:0
+msgid "Email"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Event Detail"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,state:0
+msgid "Run"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,exdate:0
+#: field:calendar.todo,exdate:0
+msgid "Exception Date/Times"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,end_date:0
+#: field:calendar.todo,end_date:0
+msgid "Repeat Until"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.actions.act_window,help:base_calendar.action_res_alarm_view
+msgid ""
+"Create specific calendar alarms that may be assigned to calendar events or "
+"meetings."
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,show_as:0
+#: field:calendar.todo,show_as:0
+msgid "Show as"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Visibility"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,rsvp:0
+msgid "Required Reply?"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,base_calendar_url:0
+#: field:calendar.todo,base_calendar_url:0
+msgid "Caldav URL"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,recurrent_uid:0
+#: field:calendar.todo,recurrent_uid:0
+msgid "Recurrent ID"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "July"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: selection:calendar.attendee,state:0
+msgid "Accepted"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,th:0
+#: field:calendar.todo,th:0
+msgid "Thu"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,child_ids:0
+msgid "Delegrated To"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "To"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Required Reply"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,role:0
+msgid "Participation required"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,create_date:0
+#: field:calendar.todo,create_date:0
+msgid "Created"
+msgstr ""
+
+#. module: base_calendar
+#: sql_constraint:ir.model:0
+msgid "Each model must be unique!"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Daily"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,class:0
+#: field:calendar.todo,class:0
+msgid "Mark as"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: field:calendar.attendee,partner_address_id:0
+msgid "Contact"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,rrule_type:0
+#: help:calendar.todo,rrule_type:0
+msgid "Let the event automatically repeat at that interval"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Delegate"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: selection:base_calendar.invite.attendee,type:0
+msgid "Partner Contacts"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "First"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Privacy"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,vtimezone:0
+#: field:calendar.todo,vtimezone:0
+msgid "Timezone"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Subject"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,state:0
+msgid "Needs Action"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "September"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "December"
+msgstr ""
+
+#. module: base_calendar
+#: help:base_calendar.invite.attendee,send_mail:0
+msgid "Check this if you want to send an Email to Invited Person"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Availability"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Individual"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,count:0
+#: help:calendar.todo,count:0
+msgid "Repeat x times"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,user_id:0
+msgid "Owner"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Delegation Info"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Start Date"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,cn:0
+msgid "Common name"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: selection:calendar.attendee,state:0
+msgid "Declined"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "My Role"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "My Events"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Decline"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Group"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,class:0
+#: selection:calendar.todo,class:0
+msgid "Private"
+msgstr ""
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,contact_ids:0
+msgid "Contacts"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_res_alarm
+msgid "Basic Alarm Information"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,fr:0
+#: field:calendar.todo,fr:0
+msgid "Fri"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_interval:0
+#: selection:res.alarm,trigger_interval:0
+msgid "Hours"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Invitation Detail"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,member:0
+msgid "Member"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "From"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,rrule:0
+#: field:calendar.todo,rrule:0
+msgid "Recurrent Rule"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,attach:0
+msgid "Attachment"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation From"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "End of Recurrency"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Reminder"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: model:ir.actions.act_window,name:base_calendar.action_view_event
+#: model:ir.ui.menu,name:base_calendar.menu_events
+msgid "Events"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.actions.act_window,name:base_calendar.action_view_calendar_invite_attendee_wizard
+#: model:ir.model,name:base_calendar.model_base_calendar_invite_attendee
+msgid "Invite Attendees"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,email:0
+msgid "Email of Invited Person"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,repeat:0
+#: field:calendar.event,count:0
+#: field:calendar.todo,count:0
+#: field:res.alarm,repeat:0
+msgid "Repeat"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,dir:0
+msgid ""
+"Reference to the URIthat points to the directory information corresponding "
+"to the attendee."
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "August"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Monday"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_model
+msgid "Models"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "June"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,event_date:0
+#: field:calendar.attendee,event_date:0
+#: view:calendar.event:0
+msgid "Event Date"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,end_type:0
+#: selection:calendar.todo,end_type:0
+msgid "Number of repetitions"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "The"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: field:calendar.attendee,delegated_from:0
+msgid "Delegated From"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event,date:0
+msgid "Date"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "November"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,member:0
+msgid "Indicate the groups that the attendee belongs to"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+msgid "Data"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,end_type:0
+#: field:calendar.todo,end_type:0
+msgid "Recurrence termination"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,mo:0
+#: field:calendar.todo,mo:0
+msgid "Mon"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitations To Review"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "October"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Uncertain"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,language:0
+msgid "Language"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,trigger_occurs:0
+#: field:res.alarm,trigger_occurs:0
+msgid "Triggers"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "January"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Delegated Invitations"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,trigger_interval:0
+#: field:res.alarm,trigger_interval:0
+msgid "Interval"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Wednesday"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,name:0
+#: view:calendar.event:0
+msgid "Summary"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,active:0
+#: field:calendar.event,active:0
+#: field:calendar.todo,active:0
+#: field:res.alarm,active:0
+msgid "Active"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:389
+#, python-format
+msgid "You cannot duplicate a calendar attendee."
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Choose day in the month where repeat the meeting"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,action:0
+msgid "Action"
+msgstr ""
+
+#. module: base_calendar
+#: help:base_calendar.invite.attendee,type:0
+msgid "Select whom you want to Invite"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.alarm,duration:0
+#: help:res.alarm,duration:0
+msgid ""
+"Duration' and 'Repeat' are both optional, but if one occurs, so MUST the "
+"other"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Required to Join"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,role:0
+msgid "Participation role for the calendar user"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: field:calendar.attendee,delegated_to:0
+msgid "Delegated To"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.alarm,action:0
+msgid "Defines the action to be invoked when an alarm is triggered"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,end_type:0
+#: selection:calendar.todo,end_type:0
+msgid "End date"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Search Events"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Recurrency Option"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Weekly"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.alarm,active:0
+#: help:res.alarm,active:0
+msgid ""
+"If the active field is set to true, it will allow you to hide the event "
+"alarm information without removing it."
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,recurrent_id:0
+#: field:calendar.todo,recurrent_id:0
+msgid "Recurrent ID date"
+msgstr ""
+
+#. module: base_calendar
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,state:0
+#: view:calendar.attendee:0
+#: field:calendar.attendee,state:0
+#: view:calendar.event:0
+#: field:calendar.event,state:0
+#: field:calendar.todo,state:0
+msgid "State"
+msgstr ""
+
+#. module: base_calendar
+#: view:res.alarm:0
+msgid "Reminder Details"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "To Review"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,state:0
+msgid "Done"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,interval:0
+#: help:calendar.todo,interval:0
+msgid "Repeat every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: field:base_calendar.invite.attendee,user_ids:0
+msgid "Users"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: view:calendar.event:0
+msgid "Cancel"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Tuesday"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.alarm,description:0
+msgid ""
+"Provides a more complete                             description of the "
+"calendar component, than that                             provided by the "
+"\"SUMMARY\" property"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Responsible User"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:1466
+#: selection:calendar.attendee,availability:0
+#: selection:calendar.event,show_as:0
+#: selection:calendar.todo,show_as:0
+#: selection:res.users,availability:0
+#, python-format
+msgid "Busy"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_event
+msgid "Calendar Event"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,state:0
+#: selection:calendar.event,state:0
+#: selection:calendar.todo,state:0
+msgid "Tentative"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,interval:0
+#: field:calendar.todo,interval:0
+msgid "Repeat every"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,recurrency:0
+#: field:calendar.todo,recurrency:0
+msgid "Recurrent"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,location:0
+#: help:calendar.todo,location:0
+msgid "Location of Event"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.actions.act_window,name:base_calendar.action_view_attendee_form
+#: model:ir.ui.menu,name:base_calendar.menu_attendee_invitations
+msgid "Event Invitations"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Thursday"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,exrule:0
+#: field:calendar.todo,exrule:0
+msgid "Exception Rule"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,language:0
+msgid ""
+"To specify the language for text values in aproperty or property parameter."
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Details"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,exrule:0
+#: help:calendar.todo,exrule:0
+msgid ""
+"Defines a rule or repeating pattern of time to exclude from the recurring "
+"rule."
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,month_list:0
+#: field:calendar.todo,month_list:0
+msgid "Month"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: view:calendar.event:0
+msgid "Invite People"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Confirmed Events"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,dir:0
+msgid "URI Reference"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,description:0
+#: view:calendar.event:0
+#: field:calendar.event,description:0
+#: field:calendar.event,name:0
+#: field:calendar.todo,description:0
+#: field:calendar.todo,name:0
+msgid "Description"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "May"
+msgstr ""
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,type:0
+#: view:calendar.attendee:0
+msgid "Type"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Search Invitations"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_occurs:0
+#: selection:res.alarm,trigger_occurs:0
+msgid "After"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,state:0
+msgid "Stop"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_values
+msgid "ir.values"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: selection:calendar.attendee,state:0
+msgid "Delegated"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,sa:0
+#: field:calendar.todo,sa:0
+msgid "Sat"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Choose day where repeat the meeting"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,trigger_related:0
+#: field:res.alarm,trigger_related:0
+msgid "Related to"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,sent_by:0
+msgid "Specify the user that is acting on behalf of the calendar user"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "End Date"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "February"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Resource"
+msgstr ""
+
+#. module: base_calendar
+#: field:res.alarm,name:0
+msgid "Name"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_alarm
+msgid "Event alarm information"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.alarm,name:0
+msgid ""
+"Contains the text to be                      used as the message subject for "
+"email                      or contains the text to be used for display"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,alarm_id:0
+#: field:calendar.event,base_calendar_alarm_id:0
+#: field:calendar.todo,alarm_id:0
+#: field:calendar.todo,base_calendar_alarm_id:0
+msgid "Alarm"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,sent_by_uid:0
+msgid "Sent By User"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "April"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Recurrency period"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,week_list:0
+#: field:calendar.todo,week_list:0
+msgid "Weekday"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,byday:0
+#: field:calendar.todo,byday:0
+msgid "By day"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,model_id:0
+msgid "Model"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,action:0
+msgid "Audio"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,id:0
+#: field:calendar.todo,id:0
+msgid "ID"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,role:0
+msgid "For information Purpose"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+msgid "Invite"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_attendee
+msgid "Attendee information"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,res_id:0
+msgid "Resource ID"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:418
+#, python-format
+msgid "Couldn't Invite because date is not specified!"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,sent_by:0
+msgid "Sent By"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,sequence:0
+#: field:calendar.todo,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,alarm_id:0
+#: help:calendar.todo,alarm_id:0
+msgid "Set an alarm at this time, before the event occurs"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base_calendar.invite.attendee,type:0
+msgid "Internal User"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Accept"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Saturday"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation To"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Second"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,availability:0
+#: field:res.users,availability:0
+msgid "Free/Busy"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,duration:0
+#: field:calendar.alarm,trigger_duration:0
+#: field:calendar.event,duration:0
+#: field:calendar.todo,date:0
+#: field:calendar.todo,duration:0
+#: field:res.alarm,duration:0
+#: field:res.alarm,trigger_duration:0
+msgid "Duration"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base_calendar.invite.attendee,type:0
+msgid "External Email"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,trigger_date:0
+msgid "Trigger Date"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.alarm,attach:0
+msgid ""
+"* Points to a sound resource,                     which is rendered when the "
+"alarm is triggered for audio,\n"
+"                    * File which is intended to be sent as message "
+"attachments for email,\n"
+"                    * Points to a procedure resource, which is invoked when  "
+"                    the alarm is triggered for procedure."
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Fifth"
+msgstr ""
diff --git a/addons/purchase_double_validation/i18n/es_EC.po b/addons/purchase_double_validation/i18n/es_EC.po
index 6e219bbddcf..0e130e12f24 100644
--- a/addons/purchase_double_validation/i18n/es_EC.po
+++ b/addons/purchase_double_validation/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-17 04:38+0000\n"
-"X-Generator: Launchpad (build 15944)\n"
+"X-Launchpad-Export-Date: 2012-09-18 04:48+0000\n"
+"X-Generator: Launchpad (build 15966)\n"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0

From c8aca44f581841ab7a319da4a5a277fabf106036 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 18 Sep 2012 12:12:47 +0200
Subject: [PATCH 76/94] [IMP] changed pager of view form

bzr revid: nicolas.vanhoren@openerp.com-20120918101247-fcdngisvfos4nsn1
---
 addons/web/static/src/js/view_form.js | 9 ++++++---
 addons/web/static/src/xml/base.xml    | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 5b7314a00f2..0b3f924270a 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -422,9 +422,12 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
     },
     do_update_pager: function(hide_index) {
         var index = hide_index ? '-' : this.dataset.index + 1;
-        this.$pager.find('button').prop('disabled', this.dataset.ids.length < 2).end()
-                   .find('span.oe_pager_index').html(index).end()
-                   .find('span.oe_pager_count').html(this.dataset.ids.length);
+        this.$pager.find('button').prop('disabled', this.dataset.ids.length < 2);
+        if (this.dataset.ids.length <= 1) {
+            $(".oe_form_pager_state", this.$pager).html("");
+        } else {
+            $(".oe_form_pager_state", this.$pager).html(_.str.sprintf(_t("%d / %d"), index, this.dataset.ids.length));
+        }
     },
     parse_on_change: function (on_change, widget) {
         var self = this;
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 5c58c3a1d3c..aafac1019fd 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -742,7 +742,7 @@
 <t t-name="FormView.pager">
     <div class="oe_form_pager">
         <t t-if="widget.options.pager !== false" t-call="ViewPager">
-            <span class="oe_pager_index">0</span><span class="oe_pager_separator"> / </span><span class="oe_pager_count">0</span>
+            <span class="oe_form_pager_state"></span>
         </t>
     </div>
 </t>

From cd7bf7b2d248a4f744c38b03fb8d5d22318e1e84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 18 Sep 2012 14:21:39 +0200
Subject: [PATCH 77/94] [CLEAN] mail: vote backend: cleaned code.

bzr revid: tde@openerp.com-20120918122139-543zxiuxytdzlqtk
---
 addons/mail/mail_message.py | 35 ++++++++++++++++++-----------------
 addons/mail/mail_thread.py  |  2 +-
 addons/mail/mail_vote.py    | 19 +++++++++++--------
 3 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 42553decb1f..4b7c0c645e3 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -131,7 +131,6 @@ class mail_message(osv.Model):
             type='boolean', string='Unread',
             help='Functional field to search for unread messages linked to uid'),
         'vote_user_ids': fields.many2many('res.users', 'mail_vote', 'message_id', 'user_id', 'Votes'),
-
     }
 
     def _needaction_domain_get(self, cr, uid, context=None):
@@ -148,23 +147,25 @@ class mail_message(osv.Model):
         'author_id': lambda self, cr, uid, ctx={}: self._get_default_author(cr, uid, ctx),
         'body': '',
     }
-    
-    #---------------------------------------------------
-    #Mail Vote system (Like or Unlike comments
-    #-----------------------------------------------------
+
+    #------------------------------------------------------
+    # Vote/Like
+    #------------------------------------------------------
+
     def vote_toggle(self, cr, uid, ids, user_ids=None, context=None):
         '''
         Toggles when Comment is liked or unlike.
         create vote entries if current user like comment..
         '''
-        vote_pool = self.pool.get('mail.vote')
-        if not user_ids: user_ids = [uid]
-        for message in self.browse(cr, uid, ids, context):
-            voters_ids = [user.id for user in message.vote_user_ids if user.id == uid]
-            if not voters_ids:
-                self.write(cr, uid, ids, {'vote_user_ids': [(4, user_id) for user_id in user_ids]}, context=context)
-            else:
-                self.write(cr, uid, ids, {'vote_user_ids': [(3, user_id) for user_id in user_ids]}, context=context)
+        if not user_ids:
+            user_ids = [uid]
+        for message in self.read(cr, uid, ids, ['vote_user_ids'], context=context):
+            for user_id in user_ids:
+                has_voted = user_id in message['vote_user_ids']
+                if not has_voted:
+                    self.write(cr, uid, ids, {'vote_user_ids': [(4, user_id)]}, context=context)
+                else:
+                    self.write(cr, uid, ids, {'vote_user_ids': [(3, user_id)]}, context=context)
         return True
 
     #------------------------------------------------------
@@ -174,12 +175,12 @@ class mail_message(osv.Model):
     def _message_dict_get(self, cr, uid, msg, context=None):
         """ Return a dict representation of the message browse record. """
         vote_pool = self.pool.get('mail.vote')
-        has_voted = False;
-        vote_ids = []
-        vote_ids = vote_pool.name_get(cr, uid, [user.id for user in msg.vote_user_ids], context=context)
+        has_voted = False
+        vote_ids = self.pool.get('res.users').name_get(cr, uid, [user.id for user in msg.vote_user_ids], context=context)
         for user_id in msg.vote_user_ids:
             if (user_id.id == uid):
-                has_voted = True;
+                has_voted = True
+                break
         attachment_ids = [{'id': attach[0], 'name': attach[1]} for attach in self.pool.get('ir.attachment').name_get(cr, uid, [x.id for x in msg.attachment_ids], context=context)]
         author_id = self.pool.get('res.partner').name_get(cr, uid, [msg.author_id.id], context=context)[0]
         author_user_id = self.pool.get('res.users').name_get(cr, uid, [msg.author_id.user_ids[0].id], context=context)[0]
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index d45637ff56f..abee20a35f8 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -176,7 +176,7 @@ class mail_thread(osv.AbstractModel):
     #------------------------------------------------------
     # Automatic subscription when creating
     #------------------------------------------------------
-    
+
     def create(self, cr, uid, vals, context=None):
         """ Override to subscribe the current user. """
         thread_id = super(mail_thread, self).create(cr, uid, vals, context=context)
diff --git a/addons/mail/mail_vote.py b/addons/mail/mail_vote.py
index 81ca4e4e75e..3d69734f198 100644
--- a/addons/mail/mail_vote.py
+++ b/addons/mail/mail_vote.py
@@ -20,17 +20,20 @@
 ##############################################################################
 
 from osv import osv, fields
-from tools.translate import _
+
 
 class mail_vote(osv.Model):
-    '''
-    Mail vote feature allow users to like and unlike particular  message or Document's message comment.
-    It counts the number of votes per document.
-    '''
+    ''' Mail vote feature allow users to like and unlike messages attached
+        to a document. This allows for example to build a ranking-based
+        displaying of messages, for FAQ. '''
+
     _name = 'mail.vote'
     _description = 'Mail Vote'
     _columns = {
-            'message_id': fields.many2one('mail.message', 'Message', required=True),
-            'user_id': fields.many2one('res.users', 'User', required=True),
+            'message_id': fields.many2one('mail.message', 'Message', required=True,
+                select=1),
+            'user_id': fields.many2one('res.users', 'User', required=True,
+                select=1),
         }
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 20eee8405a2d8f272f5174c4af1c580cbc4741bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 18 Sep 2012 14:22:12 +0200
Subject: [PATCH 78/94] [IMP] mail: vote: cleaned security rights, available
 for everybody. Will need to be fixed.

bzr revid: tde@openerp.com-20120918122212-vr4h1eo7z9ew02q3
---
 addons/mail/security/ir.model.access.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/security/ir.model.access.csv b/addons/mail/security/ir.model.access.csv
index 1b6db48cb74..2ec74086a34 100644
--- a/addons/mail/security/ir.model.access.csv
+++ b/addons/mail/security/ir.model.access.csv
@@ -10,4 +10,4 @@ access_mail_alias_user,mail.alias,model_mail_alias,base.group_user,1,1,1,0
 access_mail_alias_system,mail.alias,model_mail_alias,base.group_system,1,1,1,1
 access_mail_mail_user,mail.mail,model_mail_mail,base.group_user,1,1,1,0
 access_mail_mail_manager,mail.mail,model_mail_mail,group_mail_manager,1,1,1,1
-access_mail_vote,mail.vote,model_mail_vote,base.group_user,1,1,1,1
+access_mail_vote_all,mail.vote.all,model_mail_vote,,1,1,1,1

From 6c846100f9c836c2cec56fdad1efd3cfe677391b Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 18 Sep 2012 14:22:26 +0200
Subject: [PATCH 79/94] [FIX] problem when creating any record

bzr revid: nicolas.vanhoren@openerp.com-20120918122226-8gh4f383vgntogc7
---
 addons/web/static/src/js/view_form.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 0b3f924270a..8c8e08dbfdd 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -421,12 +421,11 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
         this.do_update_pager();
     },
     do_update_pager: function(hide_index) {
-        var index = hide_index ? '-' : this.dataset.index + 1;
         this.$pager.find('button').prop('disabled', this.dataset.ids.length < 2);
-        if (this.dataset.ids.length <= 1) {
+        if (hide_index || this.dataset.ids.length <= 1) {
             $(".oe_form_pager_state", this.$pager).html("");
         } else {
-            $(".oe_form_pager_state", this.$pager).html(_.str.sprintf(_t("%d / %d"), index, this.dataset.ids.length));
+            $(".oe_form_pager_state", this.$pager).html(_.str.sprintf(_t("%d / %d"), this.dataset.index + 1, this.dataset.ids.length));
         }
     },
     parse_on_change: function (on_change, widget) {

From 76d1e4dad506ebf09b1deaf0b144dc31a943b47c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 18 Sep 2012 14:23:15 +0200
Subject: [PATCH 80/94] [CLEAN] mail: vote: cleaned frond-end. Improved XML of
 vote template; this template is now directly called when rendering the
 message. Re-binded the vote event, cleaned function called on voting and
 rendering system. Added a records var on thread, holding the message values.
 Cleaned CSS.

bzr revid: tde@openerp.com-20120918122315-t41hgufdz71qil1z
---
 addons/mail/static/src/css/mail.css | 18 +++---
 addons/mail/static/src/js/mail.js   | 85 +++++++++++------------------
 addons/mail/static/src/xml/mail.xml | 38 +++++--------
 3 files changed, 54 insertions(+), 87 deletions(-)

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index d0e706191f7..2f9b35f1c95 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -261,15 +261,10 @@
 }
 
 /*--------------------------------------------------------------*/
-/* Mail Vote System (Like or Unlike Comment)
+/* mail.vote
 /*--------------------------------------------------------------*/
 
-.oe_mail_vote_image{
-    height='12px';
-    width='16px';	
-}
-
-button.oe_mail_msg_vote_like{
+.openerp .oe_mail_msg_content button.oe_mail_msg_vote {
     height:21px;
     width: 30px;
     padding: 1px;
@@ -277,18 +272,19 @@ button.oe_mail_msg_vote_like{
     margin-top: -4px;
 }
 
-button.oe_mail_msg_vote_like:hover{
-    background: #8A89BA;
+.openerp .oe_mail_msg_content button.oe_mail_msg_vote_true {
+    background:#DC5F59;
 }
 
-button.oe_mail_msg_vote_like span {
+.openerp .oe_mail_msg_content button.oe_mail_msg_vote span {
     color: white;
 }
 
-span.oe_mail_vote_string{
+.openerp .oe_mail_msg_content span.oe_mail_vote_count{
     color: #807FB4;
 }
 
+
 /* ------------------------------------------------------------ */
 /* mail.compose.message form view & OpenERP hacks
 /* ------------------------------------------------------------ */
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 9cb107ca338..2f5f95fbb62 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -291,6 +291,7 @@ openerp.mail = function(session) {
                 truncate_limit: options.truncate_limit || 250,
             }
             // datasets and internal vars
+            this.records = {};
             this.ds_thread = new session.web.DataSetSearch(this, this.context.default_model);
             this.ds_notification = new session.web.DataSetSearch(this, 'mail.notification');
             this.ds_message = new session.web.DataSetSearch(this, 'mail.message');
@@ -309,56 +310,6 @@ openerp.mail = function(session) {
             return display_done && compose_done;
         },
 
-        //Mail vote Functionality...
-        add_vote_event: function(element){
-            self = this;
-            vote_button = element.find('.oe_mail_msg_vote_like');
-            if (vote_button)
-            	vote_button.click(function(){
-                    self.subscribe_vote($(this).attr('data-id'));
-                });
-            return
-        },
-
-       // Fetch Records using updated message_id
-        
-        fetch_voters: function (message_id) {
-            var self= this
-            this.ds_message.call('message_read', [[parseInt(message_id)]]).then(function(results){
-            	_.each(results, function(result){
-            		self.render_vote(result);
-            	});
-            });
-        },
-        // Like and unlike..
-        subscribe_vote: function(message_id){
-            var self = this;
-            return this.ds_message.call('vote_toggle', [[parseInt(message_id)]]).then(function(result){
-                self.fetch_voters(message_id);
-            });
-        },
-        // Find parent element using current message id.
-        
-        find_parent_element: function(elements, message_id){
-            parent_element = false;
-            _.each($(elements), function(element){
-                if ($(element).attr("data-id") == message_id){
-                    parent_element = element;
-                }
-            });
-            return parent_element;
-         },
-
-        // Render vote Display template.
-        render_vote: function(record){
-        	var self = this;
-            vote_element = session.web.qweb.render('VoteDisplay', {});
-            // Get all element from record..
-            vote_element = session.web.qweb.render('VoteDisplay', {'message_id': record.id, 'vote_count': record.vote_user_ids.length, 'has_voted': record.has_voted});
-            parent_element = self.find_parent_element(".oe_mail_msg_vote", record.id);
-            $(parent_element).html(vote_element).appendTo(this.add_vote_event($(parent_element)));
-        },
-
         /** Customize the display
          * - show_header_compose: show the composition form in the header */
         do_customize_display: function() {
@@ -405,6 +356,8 @@ openerp.mail = function(session) {
                     'default_parent_id': parseInt(msg_id),
                     'default_content_subtype': 'html'} );
             });
+            // event: click on 'Vote' button
+            this.$el.on('click', 'button.oe_mail_msg_vote', this.on_vote);
         },
 
         on_message_delete: function (event) {
@@ -423,6 +376,16 @@ openerp.mail = function(session) {
             return this.ds_notification.call('set_message_read', [parseInt(msg_id)]);
         },
 
+        on_vote: function (event) {
+            event.stopPropagation();
+            var self = this;
+            var message_id = $(event.srcElement).parent().data().msg_id;
+            var vote_node = $(event.srcElement).parents('li').eq(0);
+            if (! message_id) { return false; }
+            return this.ds_message.call('vote_toggle', [[parseInt(message_id)]]).pipe(
+                self.toggle_vote(message_id, vote_node));
+        },
+
         /**
          * Override-hack of do_action: automatically reload the chatter.
          * Normally it should be called only when clicking on 'Post/Send'
@@ -542,6 +505,8 @@ openerp.mail = function(session) {
                 attach['url'] = mail.ChatterUtils.get_attachment_url(this.session, attach);
             }
             record.is_author = mail.ChatterUtils.is_author(this, record.author_user_id[0]);
+            // add to internal storage
+            this.records[record.id] = record;
             // render, add the expand feature
             var rendered = session.web.qweb.render('mail.thread.message', {'record': record, 'thread': this, 'options': this.options});
             $(rendered).appendTo(this.$el.children('div.oe_mail_thread_display:first'));
@@ -553,9 +518,23 @@ openerp.mail = function(session) {
                 moreClass: 'oe_mail_expand',
                 lessClass: 'oe_mail_reduce',
                 });
-            
-            //Render Votes.
-            this.render_vote(record);
+        },
+
+        // Render vote Display template.
+        toggle_vote: function (message_id, vote_node) {
+            var self = this;
+            var record = this.records[message_id];
+            if (record.has_voted) {
+                var idx = _.map(record.vote_user_ids, function (x) { return x[0]; }).indexOf(message_id);
+                record.vote_user_ids.splice(idx, 1);
+            }
+            else {
+                record.vote_user_ids.push([this.session.uid, 'Current user']);
+            }
+            record.has_voted = ! record.has_voted;
+            var vote_element = session.web.qweb.render('mail.thread.message.vote', {'record': record});
+            vote_node.empty();
+            vote_node.html(vote_element);
         },
 
         /** Display 'show more' button */
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 088edee0f64..a09641e1992 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -106,25 +106,6 @@
         </div>
     </ul>
 
-    <!-- Vote system (Like or Unlike -->
-    <t t-name="VoteDisplay">
-        <t t-if='vote_count'>
-             <span class="oe_left oe_mail_vote_string">Votes :<t t-esc="vote_count"/></span>
-        </t>
-        <li>
-        <t t-if="!has_voted">
-            <button class="oe_mail_msg_vote_like" t-att-data-id="message_id" title="Click to Vote.">
-                <span>+1</span>
-            </button>
-        </t>
-        <t t-if="has_voted">
-            <button class="oe_mail_msg_vote_like" t-att-data-id="message_id" title="Click to Unvote." style="background:#DC5F59; padding:1px">
-                <span>-1</span>
-            </button>
-        </t>
-        </li>
-    </t>
-
     <!-- default layout -->
     <li t-name="mail.thread.message" class="oe_mail oe_mail_thread_msg">
         <div t-attf-class="oe_mail_msg_#{record.type} oe_semantic_html_override">
@@ -161,12 +142,10 @@
                         </li>
                         <li><a t-attf-href="#model=res.partner&amp;id=#{record.author_id[0]}"><t t-raw="record.author_id[1]"/></a></li>
                         <li><span t-att-title="record.date"><t t-raw="record.timerelative"/></span></li>
-                        <li> <span t-att-data-id="record.id" class="oe_mail_msg_vote"></span> </li>
+                        <t t-call="mail.thread.message.vote"/>
+                        <!-- <li><span t-att-data-id="record.id" class="oe_mail_msg_vote"></span></li> -->
                         <li t-if="options.show_reply"><a class="oe_mail_msg_reply">Reply</a></li>
                         <li t-if="options.show_reply_by_email"><a class="oe_mail_msg_reply_by_email" t-attf-data-msg_id="{record.id}">Reply</a></li>
-                        <!-- uncomment when merging vote
-                        <li><a href="#">Like</a></li>
-                        -->
                         <li t-if="record.attachment_ids.length > 0">
                             <a class="oe_mail_msg_view_attachments">
                                 <t t-if="record.attachment_ids.length == 1">1 Attachment</t>
@@ -200,4 +179,17 @@
         </ul>
     </t>
 
+    <!-- mail.thread.message.vote
+        Template used to display Like/Unlike in a mail.message
+    -->
+    <li t-name="mail.thread.message.vote">
+        <t t-if='record.vote_user_ids.length > 0'>
+             <span class="oe_left oe_mail_vote_count"><t t-esc="record.vote_user_ids.length"/> votes</span>
+        </t>
+        <button t-attf-class="oe_mail_msg_vote oe_mail_msg_vote_#{record.has_voted}" t-attf-data-msg_id="{record.id}">
+            <t t-if="! record.has_voted"><span>+1</span></t>
+            <t t-if="record.has_voted"><span>-1</span></t>
+        </button>
+    </li>
+
 </template>

From 09ab484e0b2a7316e3480d3b20a2d484702036ca Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 18 Sep 2012 14:43:32 +0200
Subject: [PATCH 81/94] [IMP] refactoring in m2o for future development

bzr revid: nicolas.vanhoren@openerp.com-20120918124332-mj764gxrk2ssjzjd
---
 addons/web/static/src/js/view_form.js | 67 +++++++++++++++------------
 1 file changed, 38 insertions(+), 29 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 8c8e08dbfdd..d5eaf21c5e2 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2753,11 +2753,8 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
             this.render_editable();
         this.render_value();
     },
-    render_editable: function() {
-        var self = this;
-        this.$input = this.$el.find("input");
-
-        self.$input.tipsy({
+    init_error_displayer: function() {
+        this.$input.tipsy({
             title: function() {
                 return QWeb.render('Tipsy.alert', {
                     message: "No element was selected, you should create or select one from the dropdown list."
@@ -2770,9 +2767,21 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
             opacity: 1,
             offset: 4,
         });
+    },
+    hide_error_displayer: function() {
+        this.$input.tipsy("hide");
+    },
+    show_error_displayer: function() {
+        this.$input.tipsy("show");
+    },
+    render_editable: function() {
+        var self = this;
+        this.$input = this.$el.find("input");
+
+        this.init_error_displayer();
 
         self.$input.on('focus', function() {
-            self.$input.tipsy("hide");
+            self.hide_error_displayer();
         });
 
         this.$drop_down = this.$el.find(".oe_m2o_drop_down_button");
@@ -2826,10 +2835,10 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
                 }
             }
         });
-        self.tip_def = $.Deferred();
-        self.untip_def = $.Deferred();
-        var tip_delay = 200;
-        var tip_duration = 15000;
+        self.ed_def = $.Deferred();
+        self.uned_def = $.Deferred();
+        var ed_delay = 200;
+        var ed_duration = 15000;
         var anyoneLoosesFocus = function() {
             var used = false;
             if (self.floating) {
@@ -2849,25 +2858,25 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
                 }
                 self.floating = false;
             }
-            if (used && self.get("value") === false && ! self.no_tipsy) {
-                self.tip_def.reject();
-                self.untip_def.reject();
-                self.tip_def = $.Deferred();
-                self.tip_def.then(function() {
-                    self.$input.tipsy("show");
+            if (used && self.get("value") === false && ! self.no_ed) {
+                self.ed_def.reject();
+                self.uned_def.reject();
+                self.ed_def = $.Deferred();
+                self.ed_def.then(function() {
+                    self.show_error_displayer();
                 });
                 setTimeout(function() {
-                    self.tip_def.resolve();
-                    self.untip_def.reject();
-                    self.untip_def = $.Deferred();
-                    self.untip_def.then(function() {
-                        self.$input.tipsy("hide");
+                    self.ed_def.resolve();
+                    self.uned_def.reject();
+                    self.uned_def = $.Deferred();
+                    self.uned_def.then(function() {
+                        self.hide_error_displayer();
                     });
-                    setTimeout(function() {self.untip_def.resolve();}, tip_duration);
-                }, tip_delay);
+                    setTimeout(function() {self.uned_def.resolve();}, ed_duration);
+                }, ed_delay);
             } else {
-                self.no_tipsy = false;
-                self.tip_def.reject();
+                self.no_ed = false;
+                self.ed_def.reject();
             }
         };
         var ignore_blur = false;
@@ -3007,13 +3016,13 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
         this.$input.focus();
     },
     _quick_create: function() {
-        this.no_tipsy = true;
-        this.tip_def.reject();
+        this.no_ed = true;
+        this.ed_def.reject();
         return instance.web.form.CompletionFieldMixin._quick_create.apply(this, arguments);
     },
     _search_create_popup: function() {
-        this.no_tipsy = true;
-        this.tip_def.reject();
+        this.no_ed = true;
+        this.ed_def.reject();
         return instance.web.form.CompletionFieldMixin._search_create_popup.apply(this, arguments);
     },
 });

From 4b896c36af9f94f66e998331c7504d7fdcd41b8c Mon Sep 17 00:00:00 2001
From: Odowan Kenobi <odo@openerp.com>
Date: Tue, 18 Sep 2012 15:04:36 +0200
Subject: [PATCH 82/94] [REF] allow to intercept the signals sent to workflows
 (through buttons) in objects. This is done by adding a function named
 _workflow_signal() in orm that can be inherited in dedicated objects.
 Courtesy from Olivier Dony

bzr revid: qdp-launchpad@openerp.com-20120918130436-ll7potrsya23lc36
---
 openerp/osv/orm.py |  6 ++++++
 openerp/osv/osv.py | 12 +++++++-----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 48689c3c26e..3eafd247f59 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -3792,6 +3792,12 @@ class BaseModel(object):
         for res_id in ids:
             getattr(wf_service, trigger)(uid, self._name, res_id, cr)
 
+    def _workflow_signal(self, cr, uid, ids, signal, context=None):
+        """Send given workflow signal""" 
+        wf_service = netsvc.LocalService("workflow")
+        for res_id in ids:
+            wf_service.trg_validate(uid, self._name, res_id, signal, cr)
+
     def unlink(self, cr, uid, ids, context=None):
         """
         Delete records with given ids
diff --git a/openerp/osv/osv.py b/openerp/osv/osv.py
index 877e804314c..94f179c7897 100644
--- a/openerp/osv/osv.py
+++ b/openerp/osv/osv.py
@@ -184,16 +184,18 @@ class object_proxy(object):
             cr.close()
         return res
 
-    def exec_workflow_cr(self, cr, uid, obj, method, *args):
-        wf_service = netsvc.LocalService("workflow")
-        return wf_service.trg_validate(uid, obj, args[0], method, cr)
+    def exec_workflow_cr(self, cr, uid, obj, signal, *args):
+        object = pooler.get_pool(cr.dbname).get(obj)
+        if not object:
+            raise except_osv('Object Error', 'Object %s doesn\'t exist' % str(obj))
+        return object._workflow_signal(cr, uid, [args[0]], signal)
 
     @check
-    def exec_workflow(self, db, uid, obj, method, *args):
+    def exec_workflow(self, db, uid, obj, signal, *args):
         cr = pooler.get_db(db).cursor()
         try:
             try:
-                res = self.exec_workflow_cr(cr, uid, obj, method, *args)
+                res = self.exec_workflow_cr(cr, uid, obj, signal, *args)
                 cr.commit()
             except Exception:
                 cr.rollback()

From 2c09f43b7efe7d7696d87029b1107ce563c4dfc3 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 18 Sep 2012 16:31:01 +0200
Subject: [PATCH 83/94] [IMP] Added helper for buttons in dialogs

bzr revid: nicolas.vanhoren@openerp.com-20120918143101-wbdyaou23l8wx9zd
---
 addons/web/static/src/js/chrome.js | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 3114aaf315f..d5b45a87bf5 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -79,6 +79,9 @@ instance.web.Dialog = instance.web.Widget.extend({
             }
         }
         if (options) {
+            if (options.buttons) {
+                this.params_buttons = true;
+            }
             _.extend(this.dialog_options, options);
         }
     },
@@ -123,7 +126,13 @@ instance.web.Dialog = instance.web.Widget.extend({
         if (! this.dialog_inited)
             this.init_dialog();
         var o = this.get_options(options);
+        if (! this.no_erase_buttons) {
+            this.$buttons.appendTo($("body"));
+        }
         instance.web.dialog(this.$el, o).dialog('open');
+        if (! this.no_erase_buttons) {
+            this.$buttons.appendTo(this.$el.dialog("widget"));
+        }
         if (o.height === 'auto' && o.max_height) {
             this.$el.css({ 'max-height': o.max_height, 'overflow-y': 'auto' });
         }
@@ -133,6 +142,10 @@ instance.web.Dialog = instance.web.Widget.extend({
         this.renderElement();
         var o = this.get_options(options);
         instance.web.dialog(this.$el, o);
+        if (! this.params_buttons) {
+            this.$buttons = $('<div class="ui-dialog-buttonpane ui-widget-content ui-helper-clearfix" />');
+            this.$el.dialog("widget").append(this.$buttons);
+        }
         var res = this.start();
         this.dialog_inited = true;
         return res;

From d9d3aab5151b1651d6eb36057f121ebee4af76f0 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 18 Sep 2012 16:49:24 +0200
Subject: [PATCH 84/94] [FIX] Problem with popups

bzr revid: nicolas.vanhoren@openerp.com-20120918144924-2y72o7tauxspk4la
---
 addons/web/static/src/js/chrome.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index d5b45a87bf5..9fdfb50307f 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -126,11 +126,11 @@ instance.web.Dialog = instance.web.Widget.extend({
         if (! this.dialog_inited)
             this.init_dialog();
         var o = this.get_options(options);
-        if (! this.no_erase_buttons) {
+        if (! this.params_buttons) {
             this.$buttons.appendTo($("body"));
         }
         instance.web.dialog(this.$el, o).dialog('open');
-        if (! this.no_erase_buttons) {
+        if (! this.params_buttons) {
             this.$buttons.appendTo(this.$el.dialog("widget"));
         }
         if (o.height === 'auto' && o.max_height) {

From 74410c8985a78d87d10341174d95d853415e5e52 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 18 Sep 2012 16:59:25 +0200
Subject: [PATCH 85/94] [IMP] replaced tipsy in m2o by a dialog

bzr revid: nicolas.vanhoren@openerp.com-20120918145925-avk5z92hqesqdqq9
---
 addons/web/static/src/js/view_form.js | 45 ++++++++++++++++++---------
 addons/web/static/src/xml/base.xml    | 10 ++++++
 2 files changed, 40 insertions(+), 15 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index d5eaf21c5e2..c188abc853e 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2616,6 +2616,7 @@ instance.web.form.CompletionFieldMixin = {
 
         var dataset = new instance.web.DataSet(this, this.field.relation, self.build_context());
         var blacklist = this.get_search_blacklist();
+        this.last_query = search_val;
 
         return this.orderer.add(dataset.name_search(
                 search_val, new instance.web.CompoundDomain(self.build_domain(), [["id", "not in", blacklist]]),
@@ -2723,6 +2724,32 @@ instance.web.form.CompletionFieldMixin = {
     },
 };
 
+instance.web.form.M2ODialog = instance.web.Dialog.extend({
+    template: "M2ODialog",
+    init: function(parent) {
+        this._super(parent, {
+            title: _.str.sprintf(_t("Add %s"), parent.string),
+            width: 312,
+        });
+    },
+    start: function() {
+        var self = this;
+        this.$buttons.html(QWeb.render("M2ODialog.buttons"));
+        this.$("input").val(this.getParent().last_query);
+        this.$buttons.find(".oe_form_m2o_qc_button").click(function(){
+            self.getParent()._quick_create(self.$("input").val());
+            self.destroy();
+        });
+        this.$buttons.find(".oe_form_m2o_sc_button").click(function(){
+            self.getParent()._search_create_popup("form", undefined, self.getParent()._create_context(self.$("input").val()));
+            self.destroy();
+        });
+        this.$buttons.find(".oe_form_m2o_cancel_button").click(function(){
+            self.destroy();
+        });
+    },
+});
+
 instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instance.web.form.CompletionFieldMixin, instance.web.form.ReinitializeFieldMixin, {
     template: "FieldMany2One",
     init: function(field_manager, node) {
@@ -2754,25 +2781,13 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
         this.render_value();
     },
     init_error_displayer: function() {
-        this.$input.tipsy({
-            title: function() {
-                return QWeb.render('Tipsy.alert', {
-                    message: "No element was selected, you should create or select one from the dropdown list."
-                });
-            },
-            trigger:'manual',
-            fade: true,
-            gravity: 's',
-            html: true,
-            opacity: 1,
-            offset: 4,
-        });
+        // nothing
     },
     hide_error_displayer: function() {
-        this.$input.tipsy("hide");
+        // doesn't work
     },
     show_error_displayer: function() {
-        this.$input.tipsy("show");
+        new instance.web.form.M2ODialog(this).open();
     },
     render_editable: function() {
         var self = this;
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index aafac1019fd..4cc2629822d 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1700,4 +1700,14 @@
         <div class="oe_throbber_message" style="color:white"></div>
     </div>
 </t>
+<t t-name="M2ODialog">
+    <div>
+        Name: <input class="oe_form_m2o_input_name" type="text"/>
+    </div>
+</t>
+<t t-name="M2ODialog.buttons">
+    <button class="oe_form_m2o_qc_button oe_button oe_highlight">Quick Add</button>
+    <button class="oe_form_m2o_sc_button oe_button">Add All Info...</button>
+    <button class="oe_form_m2o_cancel_button oe_button">Cancel</button>
+</t>
 </templates>

From 2ae49751eb9e97b4ec9820a07258f5d07a527d31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 18 Sep 2012 17:05:17 +0200
Subject: [PATCH 86/94] [TEST] mail: added tests for the vote feature.

bzr revid: tde@openerp.com-20120918150517-c08jw61c9fpasisc
---
 addons/mail/tests/test_mail.py | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/addons/mail/tests/test_mail.py b/addons/mail/tests/test_mail.py
index 1fab5dd1732..57a59e2595f 100644
--- a/addons/mail/tests/test_mail.py
+++ b/addons/mail/tests/test_mail.py
@@ -647,3 +647,33 @@ class test_mail(TestMailMockups):
         msg1.refresh()
         self.assertEqual(5, len(group_pigs.message_ids), 'group should contain 5 messages')
         self.assertEqual(2, len(msg1.child_ids), 'msg1 should have 2 children now')
+
+    def test_60_vote(self):
+        """ Test designed for the vote/unvote feature. """
+        cr, uid = self.cr, self.uid
+        group_pigs = self.mail_group.browse(cr, uid, self.group_pigs_id)
+        user_admin = self.res_users.browse(cr, uid, uid)
+        msg1 = group_pigs.message_post(body='My Body', subject='1')
+        msg1 = self.mail_message.browse(cr, uid, msg1)
+
+        # Create user Bert Tartopoils
+        user_bert_id = self.res_users.create(cr, uid, {'name': 'Bert', 'login': 'bert'})
+        user_bert = self.res_users.browse(cr, uid, user_bert_id)
+
+        # Test: msg1 and msg2 have void vote_user_ids
+        self.assertFalse(msg1.vote_user_ids, 'newly created message msg1 has not void vote_user_ids')
+        # Do: Admin vote for msg1
+        self.mail_message.vote_toggle(cr, uid, [msg1.id])
+        msg1.refresh()
+        # Test: msg1 has Admin as voter
+        self.assertEqual(set(msg1.vote_user_ids), set([user_admin]), 'after voting, Admin is not the voter')
+        # Do: Bert vote for msg1
+        self.mail_message.vote_toggle(cr, uid, [msg1.id], [user_bert_id])
+        msg1.refresh()
+        # Test: msg1 has Admin and Bert as voters
+        self.assertEqual(set(msg1.vote_user_ids), set([user_admin, user_bert]), 'after voting, Admin and Bert are not the voters')
+        # Do: Admin unvote for msg1
+        self.mail_message.vote_toggle(cr, uid, [msg1.id])
+        msg1.refresh()
+        # Test: msg1 has Bert as voter
+        self.assertEqual(set(msg1.vote_user_ids), set([user_bert]), 'after unvoting for Admin, Bert is not the voter')

From 21833581643ac28af36e778f479c0bdbcc461285 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 18 Sep 2012 17:05:44 +0200
Subject: [PATCH 87/94] [CLEAN] mail: vote: cleaned before merging.

bzr revid: tde@openerp.com-20120918150544-2pgwh1mhi5yyqi22
---
 addons/mail/mail_message.py         |  19 ++++++++-----------
 addons/mail/mail_vote.py            |   8 ++++----
 addons/mail/static/src/img/vote.gif | Bin 892 -> 0 bytes
 addons/mail/static/src/js/mail.js   |   2 +-
 4 files changed, 13 insertions(+), 16 deletions(-)
 delete mode 100644 addons/mail/static/src/img/vote.gif

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 4b7c0c645e3..1d5d85e36e0 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -130,7 +130,8 @@ class mail_message(osv.Model):
         'unread': fields.function(_get_unread, fnct_search=_search_unread,
             type='boolean', string='Unread',
             help='Functional field to search for unread messages linked to uid'),
-        'vote_user_ids': fields.many2many('res.users', 'mail_vote', 'message_id', 'user_id', 'Votes'),
+        'vote_user_ids': fields.many2many('res.users', 'mail_vote', 'message_id', 'user_id', string='Votes',
+            help='Users that voted for this message'),
     }
 
     def _needaction_domain_get(self, cr, uid, context=None):
@@ -153,19 +154,16 @@ class mail_message(osv.Model):
     #------------------------------------------------------
 
     def vote_toggle(self, cr, uid, ids, user_ids=None, context=None):
-        '''
-        Toggles when Comment is liked or unlike.
-        create vote entries if current user like comment..
-        '''
+        ''' Toggles voting '''
         if not user_ids:
             user_ids = [uid]
         for message in self.read(cr, uid, ids, ['vote_user_ids'], context=context):
             for user_id in user_ids:
-                has_voted = user_id in message['vote_user_ids']
+                has_voted = user_id in message.get('vote_user_ids')
                 if not has_voted:
-                    self.write(cr, uid, ids, {'vote_user_ids': [(4, user_id)]}, context=context)
+                    self.write(cr, uid, message.get('id'), {'vote_user_ids': [(4, user_id)]}, context=context)
                 else:
-                    self.write(cr, uid, ids, {'vote_user_ids': [(3, user_id)]}, context=context)
+                    self.write(cr, uid, message.get('id'), {'vote_user_ids': [(3, user_id)]}, context=context)
         return True
 
     #------------------------------------------------------
@@ -174,11 +172,10 @@ class mail_message(osv.Model):
 
     def _message_dict_get(self, cr, uid, msg, context=None):
         """ Return a dict representation of the message browse record. """
-        vote_pool = self.pool.get('mail.vote')
         has_voted = False
         vote_ids = self.pool.get('res.users').name_get(cr, uid, [user.id for user in msg.vote_user_ids], context=context)
-        for user_id in msg.vote_user_ids:
-            if (user_id.id == uid):
+        for vote in vote_ids:
+            if vote[0] == uid:
                 has_voted = True
                 break
         attachment_ids = [{'id': attach[0], 'name': attach[1]} for attach in self.pool.get('ir.attachment').name_get(cr, uid, [x.id for x in msg.attachment_ids], context=context)]
diff --git a/addons/mail/mail_vote.py b/addons/mail/mail_vote.py
index 3d69734f198..1e439fe0aeb 100644
--- a/addons/mail/mail_vote.py
+++ b/addons/mail/mail_vote.py
@@ -30,10 +30,10 @@ class mail_vote(osv.Model):
     _name = 'mail.vote'
     _description = 'Mail Vote'
     _columns = {
-            'message_id': fields.many2one('mail.message', 'Message', required=True,
-                select=1),
-            'user_id': fields.many2one('res.users', 'User', required=True,
-                select=1),
+            'message_id': fields.many2one('mail.message', 'Message', select=1,
+                ondelete='cascade', required=True),
+            'user_id': fields.many2one('res.users', 'User', select=1,
+                ondelete='cascade', required=True),
         }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mail/static/src/img/vote.gif b/addons/mail/static/src/img/vote.gif
deleted file mode 100644
index 0e6b874770e1122b3f08f01d26bae9f08b94cfe6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 892
zcmZ?wbhEHb<Y(Yz_|5<VqN1Ym^75*xs@mGx*4Ebc_Vy7G5m{MT-QC>_7cRVe_wN7y
z|G^4JiO~=kZXuxflZBCi;Xi{8$YY>9!N3v8@Sju0!k~eniGy7zp};`#5CadBg-XW)
zha;V=k}f;~2O1ohWSp~PDnG_IFtaO6lF_`F(#WJ0K8@#t(X&(2OcGCB>Da7xoQcbW
V?}tRu!6p_1OTLJPi-`^l)&OE6GJpU8

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 2f5f95fbb62..57c777441e7 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -529,7 +529,7 @@ openerp.mail = function(session) {
                 record.vote_user_ids.splice(idx, 1);
             }
             else {
-                record.vote_user_ids.push([this.session.uid, 'Current user']);
+                record.vote_user_ids.push([this.session.uid, 'You']);
             }
             record.has_voted = ! record.has_voted;
             var vote_element = session.web.qweb.render('mail.thread.message.vote', {'record': record});

From 61ebb4042b5d7d0e98a1ac6be8cc63f917fd84de Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 18 Sep 2012 17:11:08 +0200
Subject: [PATCH 88/94] [IMP] kanban: many2many_tags => <field/>

bzr revid: chm@openerp.com-20120918151108-8fpv61vmlmbjkws7
---
 addons/base_calendar/base_calendar_view.xml |  2 +-
 addons/base_setup/res_partner_view.xml      |  2 +-
 addons/note/note_view.xml                   | 13 +++++++------
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index 89066ce74bb..0ea2be4f37f 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -418,7 +418,7 @@
                 <field name="type">ir.actions.act_window</field>
                 <field name="res_model">calendar.event</field>
                 <field name="view_type">form</field>
-                <field name="view_mode">tree,form,calendar</field>
+                <field name="view_mode">calendar,tree,form</field>
                 <field name="search_view_id" ref="view_calendar_event_filter"/>
             </record>
 
diff --git a/addons/base_setup/res_partner_view.xml b/addons/base_setup/res_partner_view.xml
index 5e54c0b8629..ad520799c1f 100644
--- a/addons/base_setup/res_partner_view.xml
+++ b/addons/base_setup/res_partner_view.xml
@@ -13,10 +13,10 @@
                         <t t-foreach="record.category_id.raw_value" t-as="category">
                             <span class="oe_tag" t-att-data-list_id="category"/>
                         </t>
+                        <field name="category_id"/>
                     </span>
                 </xpath>
             </field>
         </record>
-
     </data>
 </openerp>
diff --git a/addons/note/note_view.xml b/addons/note/note_view.xml
index 5617fae4376..e7636aa4b85 100644
--- a/addons/note/note_view.xml
+++ b/addons/note/note_view.xml
@@ -2,8 +2,6 @@
 <openerp>
   <data>
 
-    <menuitem name="Organizer" id="note_my_stuff" parent="mail.mail_feeds_main"/>
-
     <!-- memo Stage Form View -->
     <record model="ir.ui.view" id="view_note_stage_form">
       <field name="name">note.stage.form</field>
@@ -39,8 +37,6 @@
       <field name="domain">[('user_id','=',uid)]</field>
     </record>
 
-    <menuitem name="Categories" id="menu_notes_stage" parent="note_my_stuff" action="action_note_stage" sequence="40" groups="base.group_no_one"/>
-
     <!-- New memo Kanban View -->
     <record model="ir.ui.view" id="view_note_note_kanban">
       <field name="name">note.note.kanban</field>
@@ -85,7 +81,8 @@
                   <field name="name"/>
                 </div>
 
-                <div widget="many2many_tags" t-att-data="record.tag_ids.raw_value" model="note.tag"/>
+                <field name="tag_ids"/>
+
                 
                 <div class="oe_right">
                   <t t-foreach="record.message_follower_ids.raw_value" t-as="follower">
@@ -192,7 +189,11 @@
       <field name="context">{'search_default_open_true':True}</field>
     </record>
 
-    <menuitem name="Sticky notes" id="note_notes" parent="note_my_stuff" sequence="20" action="action_note_note"/>
+
+    <menuitem name="Organizer" id="note_my_stuff" parent="mail.mail_feeds_main"/>
+    <menuitem name="Categories" id="menu_notes_stage" parent="note_my_stuff" action="action_note_stage" sequence="40" groups="base.group_no_one"/>
+    <menuitem name="Sticky notes" id="note_notes" parent="note_my_stuff" sequence="10" action="action_note_note"/>
+    <menuitem name="Calendar" id="menu_events_organizer" parent="note_my_stuff" sequence="11" action="base_calendar.action_view_event"/>
 
   </data>
 </openerp>
\ No newline at end of file

From 8cb1f558a0f7d0c5eb43b75f153e2b374351999d Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 18 Sep 2012 17:15:01 +0200
Subject: [PATCH 89/94] [IMP] kanban: many2many_tags => <field/> other views

bzr revid: chm@openerp.com-20120918151501-4kkf7ve1m7wvj3le
---
 addons/base_setup/res_partner_view.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/addons/base_setup/res_partner_view.xml b/addons/base_setup/res_partner_view.xml
index ad520799c1f..57e8d70531d 100644
--- a/addons/base_setup/res_partner_view.xml
+++ b/addons/base_setup/res_partner_view.xml
@@ -10,9 +10,6 @@
             <field name="arch" type="xml">
                 <xpath expr="//div[@class='oe_kanban_partner_categories']" position="inside">
                     <span class="oe_kanban_list_many2many" data-model="res.partner.category">
-                        <t t-foreach="record.category_id.raw_value" t-as="category">
-                            <span class="oe_tag" t-att-data-list_id="category"/>
-                        </t>
                         <field name="category_id"/>
                     </span>
                 </xpath>

From b08efa691824370130be1f009472ba7f59096127 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 18 Sep 2012 17:17:48 +0200
Subject: [PATCH 90/94] [FIX] Apply inputs maxlength according to field's size

bzr revid: fme@openerp.com-20120918151748-gfzmmk61ih5g79yb
---
 addons/web/static/src/xml/base.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 4cc2629822d..232d4b618d7 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -919,6 +919,7 @@
                 t-att-tabindex="widget.node.attrs.tabindex"
                 t-att-autofocus="widget.node.attrs.autofocus"
                 t-att-placeholder="widget.node.attrs.placeholder"
+                t-att-maxlength="widget.field.size"
             /><img class="oe_field_translate oe_input_icon" t-if="widget.field.translate" t-att-src='_s + "/web/static/src/img/icons/terp-translate.png"' width="16" height="16" border="0"/>
         </t>
     </span>
@@ -933,6 +934,7 @@
                     t-att-tabindex="widget.node.attrs.tabindex"
                     t-att-autofocus="widget.node.attrs.autofocus"
                     t-att-placeholder="widget.node.attrs.placeholder"
+                t-att-maxlength="widget.field.size"
                 />
             </div>
         </t>
@@ -951,6 +953,7 @@
             t-att-tabindex="widget.node.attrs.tabindex"
             t-att-autofocus="widget.node.attrs.autofocus"
             t-att-placeholder="! widget.get('effective_readonly') ? widget.node.attrs.placeholder : ''"
+            t-att-maxlength="widget.field.size"
         ></textarea><img class="oe_field_translate oe_input_icon"
                         t-if="widget.field.translate and !widget.get('effective_readonly')"
                         t-att-src='_s + "/web/static/src/img/icons/terp-translate.png"' width="16" height="16" border="0"

From d98d41d236a9f7124675c28b473b7df3f2127b46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Tue, 18 Sep 2012 18:17:51 +0200
Subject: [PATCH 91/94] [FIX] css fixes for editable list

bzr revid: fva@openerp.com-20120918161751-fz73pig39zxm7hso
---
 addons/web/static/src/css/base.css           | 22 +++++++++++++-------
 addons/web/static/src/css/base.sass          | 18 +++++++++++++++-
 addons/web_kanban/static/src/css/kanban.css  |  4 ++--
 addons/web_kanban/static/src/css/kanban.sass |  4 ++--
 4 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 16861a7853f..dab079aba7a 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -25,7 +25,6 @@
     display: none !important;
   }
 }
-
 .openerp.openerp_webclient_container {
   height: 100%;
   position: relative;
@@ -41,7 +40,7 @@
   text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5);
   /* http://www.quirksmode.org/dom/inputfile.html
    * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image
-   */ */
+   */
 }
 .openerp :-moz-placeholder {
   color: #afafb6 !important;
@@ -1154,7 +1153,7 @@
   color: white;
   padding: 2px 4px;
   margin: 1px 6px 0 0;
-  border: 1px solid lightGray;
+  border: 1px solid lightgrey;
   text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
   -moz-border-radius: 4px;
   -webkit-border-radius: 4px;
@@ -1179,7 +1178,7 @@
   transform: scale(1.1);
 }
 .openerp .oe_secondary_submenu .oe_active {
-  border-top: 1px solid lightGray;
+  border-top: 1px solid lightgrey;
   border-bottom: 1px solid #dedede;
   text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
   -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 3px rgba(40, 40, 40, 0.2);
@@ -1521,6 +1520,7 @@
   font-size: 1px;
   letter-spacing: -1px;
   color: transparent;
+  font-weight: normal;
   -moz-box-shadow: none;
   -webkit-box-shadow: none;
   box-shadow: none;
@@ -2001,6 +2001,8 @@
 .openerp .oe_form .oe_subtotal_footer .oe_subtotal_footer_separator {
   width: 108px;
   border-top: 1px solid #cacaca;
+  margin-top: 4px;
+  padding-top: 4px;
   font-weight: bold;
   font-size: 18px;
 }
@@ -2043,7 +2045,7 @@
 }
 .openerp .oe_form .oe_form_label_help[for] span, .openerp .oe_form .oe_form_label[for] span {
   font-size: 80%;
-  color: darkGreen;
+  color: darkgreen;
   vertical-align: top;
   position: relative;
   top: -4px;
@@ -2638,20 +2640,24 @@
 }
 .openerp .oe_list_content td.oe_list_field_handle {
   width: 1em;
+  padding: 0 !important;
   cursor: ns-resize;
 }
 .openerp .oe_list_content td.oe_list_field_handle .oe_list_handle {
   font-size: 1px;
   letter-spacing: -1px;
   color: transparent;
+  font-weight: normal;
+  margin-right: 7px;
 }
 .openerp .oe_list_content td.oe_list_field_handle .oe_list_handle:before {
-  font: 21px "mnmliconsRegular";
-  content: "ö";
-  color: #404040;
+  font: 18px "entypoRegular";
+  content: "}";
+  color: #e0e0e0;
 }
 .openerp .oe_list_cannot_edit .oe_list_header_handle, .openerp .oe_list_cannot_edit .oe_list_field_handle {
   display: none !important;
+  padding: 0 !important;
 }
 .openerp .oe_list_cannot_delete .oe_list_record_delete {
   display: none !important;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index e3cb661d580..9d121457234 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -119,11 +119,22 @@ $sheet-max-width: 860px
     font-size: 1px
     letter-spacing: -1px
     color: transparent
+    font-weight: normal 
     &:before
         font: 21px "mnmliconsRegular"
         content: $icon-name
         color: $color
 
+@mixin text-to-entypo-icon($icon-name, $color: #404040, $size: 21px)
+    font-size: 1px
+    letter-spacing: -1px
+    color: transparent
+    font-weight: normal 
+    &:before
+        font: $size "entypoRegular"
+        content: $icon-name
+        color: $color
+
 // }}}
 
 @media print
@@ -1574,6 +1585,8 @@ $sheet-max-width: 860px
             .oe_subtotal_footer_separator
                 width: 108px
                 border-top: 1px solid #cacaca
+                margin-top: 4px
+                padding-top: 4px
                 font-weight: bold
                 font-size: 18px
             label:after
@@ -2068,13 +2081,16 @@ $sheet-max-width: 860px
             text-indent: -9001px
         td.oe_list_field_handle
             width: 1em
+            padding: 0 !important
             cursor: ns-resize
             .oe_list_handle
-                @include text-to-icon("ö")
+                @include text-to-entypo-icon("}",#E0E0E0,18px)
+                margin-right: 7px
 
     .oe_list_cannot_edit
         .oe_list_header_handle, .oe_list_field_handle
             display: none !important
+            padding: 0 !important
     .oe_list_cannot_delete
         .oe_list_record_delete
             display: none !important
diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css
index 48cf725ead3..6218d028576 100644
--- a/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@ -346,8 +346,8 @@
   position: relative;
   display: block;
   background: white;
-  border: 1px solid #d8d8d8;
-  border-bottom-color: #b9b9b9;
+  border: 1px solid rgba(0, 0, 0, 0.16);
+  border-bottom-color: rgba(0, 0, 0, 0.3);
   padding: 8px;
   display: block;
   -moz-border-radius: 4px;
diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass
index 95a63dbd1a2..a45515efdd0 100644
--- a/addons/web_kanban/static/src/css/kanban.sass
+++ b/addons/web_kanban/static/src/css/kanban.sass
@@ -311,8 +311,8 @@
         position: relative
         display: block
         background: white
-        border: 1px solid #d8d8d8
-        border-bottom-color: #b9b9b9
+        border: 1px solid rgba(0,0,0,0.16)
+        border-bottom-color: rgba(0,0,0,0.3)
         padding: 8px
         display: block
         @include radius(4px)

From c730c3cb784868ad5515e0e707939919d1af7e64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Tue, 18 Sep 2012 18:25:32 +0200
Subject: [PATCH 92/94] [FIX] css header alignment

bzr revid: fva@openerp.com-20120918162532-xte92rwm6jemy09f
---
 addons/web/static/src/css/base.css  | 3 +++
 addons/web/static/src/css/base.sass | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index dab079aba7a..10ee9dea2de 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1957,6 +1957,9 @@
   background-image: -o-linear-gradient(top, #fcfcfc, #dedede);
   background-image: linear-gradient(to bottom, #fcfcfc, #dedede);
 }
+.openerp .oe_form header > span {
+  margin-left: 4px;
+}
 .openerp .oe_form header ul {
   display: inline-block;
   float: right;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 9d121457234..1aa4726725c 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1551,6 +1551,8 @@ $sheet-max-width: 860px
             border-bottom: 1px solid #cacaca
             padding-left: 2px
             @include vertical-gradient(#fcfcfc, #dedede)
+            > span
+                margin-left: 4px
             ul
                 display: inline-block
                 float: right

From ab8722f1b4d4de2aacc7e42a77ce08cb141ab86e Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 18 Sep 2012 21:38:56 +0200
Subject: [PATCH 93/94] [IMP] kanban: field many2many_tags

bzr revid: chm@openerp.com-20120918193856-2lq5q8lnw3dtpqbe
---
 addons/base_setup/res_partner_view.xml                    | 2 +-
 addons/hr_recruitment/hr_recruitment_view.xml             | 4 +---
 addons/note/note_view.xml                                 | 2 ++
 addons/portal_project_issue/portal_project_issue_view.xml | 1 +
 addons/project_issue/project_issue_view.xml               | 4 +---
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/addons/base_setup/res_partner_view.xml b/addons/base_setup/res_partner_view.xml
index 57e8d70531d..15b80151831 100644
--- a/addons/base_setup/res_partner_view.xml
+++ b/addons/base_setup/res_partner_view.xml
@@ -9,7 +9,7 @@
             <field name="inherit_id" ref="base.res_partner_kanban_view"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[@class='oe_kanban_partner_categories']" position="inside">
-                    <span class="oe_kanban_list_many2many" data-model="res.partner.category">
+                    <span class="oe_kanban_list_many2many">
                         <field name="category_id"/>
                     </span>
                 </xpath>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 098a8aec210..08e5f31a2d2 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -314,9 +314,7 @@
                                 </div>
                                 <div class="oe_kanban_footer_left" style="margin-top:5px;">
                                     <div class="oe_left oe_tags">
-                                        <t t-foreach="record.categ_ids.raw_value" t-as="categ_id">
-                                            <span class="oe_tag" t-att-data-categ_id="categ_id"></span>
-                                        </t>
+                                        <field name="categ_ids"/>
                                     </div>
                                 </div>
                             </div>
diff --git a/addons/note/note_view.xml b/addons/note/note_view.xml
index ca684b42522..b356efc9549 100644
--- a/addons/note/note_view.xml
+++ b/addons/note/note_view.xml
@@ -82,7 +82,9 @@
                   <!-- title -->
                   <field name="name"/>
                 </div>
+                
                 <field name="tag_ids"/>
+
                 <div class="oe_right">
                   <t t-foreach="record.message_follower_ids.raw_value" t-as="follower">
                     <img t-if="record.current_partner_id.raw_value!=follower" t-att-src="kanban_image('res.partner', 'image_small', follower)" width="24" height="24" class="oe_kanban_avatar" t-att-data-member_id="follower"/>
diff --git a/addons/portal_project_issue/portal_project_issue_view.xml b/addons/portal_project_issue/portal_project_issue_view.xml
index 5d0b4ce081e..1030dedbdf8 100644
--- a/addons/portal_project_issue/portal_project_issue_view.xml
+++ b/addons/portal_project_issue/portal_project_issue_view.xml
@@ -27,6 +27,7 @@
                                             <t t-foreach="record.categ_ids.raw_value" t-as="categ_id">
                                                 <span class="oe_tag" t-att-data-categ_id="categ_id"></span>
                                             </t>
+                                            <field name="categ_ids"/>
                                         </div>
                                         <div class="oe_right">
                                             Creation: <field name="create_date"/>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index fea22c519a8..be7427fe8f4 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -269,9 +269,7 @@
                                     </div>
                                     <div class="oe_kanban_footer_left">
                                         <div class="oe_left oe_tags">
-                                            <t t-foreach="record.categ_ids.raw_value" t-as="categ_id">
-                                                <span class="oe_tag" t-att-data-categ_id="categ_id"></span>
-                                            </t>
+                                            <field name="categ_ids"/>
                                         </div>
                                         <div class="oe_right">
                                             <span class="oe_kanban_highlight">

From bd1dc47bbec6f980f3bee1d960bff8b15d8612fd Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Wed, 19 Sep 2012 04:37:39 +0000
Subject: [PATCH 94/94] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120919043739-2a9fz9y3pe1xv0ba
---
 addons/fetchmail/i18n/mk.po | 333 ++++++++++++++++++++++++++++++++++++
 1 file changed, 333 insertions(+)
 create mode 100644 addons/fetchmail/i18n/mk.po

diff --git a/addons/fetchmail/i18n/mk.po b/addons/fetchmail/i18n/mk.po
new file mode 100644
index 00000000000..741b3547812
--- /dev/null
+++ b/addons/fetchmail/i18n/mk.po
@@ -0,0 +1,333 @@
+# Macedonian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-09-18 16:07+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Macedonian <mk@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-09-19 04:37+0000\n"
+"X-Generator: Launchpad (build 15966)\n"
+
+#. module: fetchmail
+#: selection:fetchmail.server,state:0
+msgid "Confirmed"
+msgstr "Потврдено"
+
+#. module: fetchmail
+#: field:fetchmail.server,server:0
+msgid "Server Name"
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,script:0
+msgid "Script"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,priority:0
+msgid "Defines the order of processing, lower values mean higher priority"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,is_ssl:0
+msgid ""
+"Connections are encrypted with SSL/TLS through a dedicated port (default: "
+"IMAPS=993, POP3S=995)"
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,attach:0
+msgid "Keep Attachments"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,original:0
+msgid ""
+"Whether a full original copy of each email should be kept for referenceand "
+"attached to each processed message. This will usually double the size of "
+"your message database."
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,priority:0
+msgid "Server Priority"
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,state:0
+msgid "State"
+msgstr "Состојба"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "POP"
+msgstr "POP"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Fetch Now"
+msgstr ""
+
+#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
+#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
+msgid "Incoming Mail Servers"
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,port:0
+msgid "Port"
+msgstr ""
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "POP/IMAP Servers"
+msgstr "POP/IMAP сервери"
+
+#. module: fetchmail
+#: selection:fetchmail.server,type:0
+msgid "Local Server"
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,user:0
+msgid "Username"
+msgstr ""
+
+#. module: fetchmail
+#: model:ir.model,name:fetchmail.model_fetchmail_server
+msgid "POP/IMAP Server"
+msgstr ""
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Reset Confirmation"
+msgstr ""
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "SSL"
+msgstr ""
+
+#. module: fetchmail
+#: model:ir.model,name:fetchmail.model_mail_message
+msgid "Email Message"
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,date:0
+msgid "Last Fetch Date"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,action_id:0
+msgid ""
+"Optional custom server action to trigger for each incoming mail, on the "
+"record that was created or updated by this mail"
+msgstr ""
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "# of emails"
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,original:0
+msgid "Keep Original"
+msgstr ""
+
+#. module: fetchmail
+#: code:addons/fetchmail/fetchmail.py:155
+#, python-format
+msgid ""
+"Here is what we got instead:\n"
+" %s"
+msgstr ""
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+#: field:fetchmail.server,configuration:0
+msgid "Configuration"
+msgstr ""
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Incoming Mail Server"
+msgstr ""
+
+#. module: fetchmail
+#: code:addons/fetchmail/fetchmail.py:155
+#, python-format
+msgid "Connection test failed!"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,server:0
+msgid "Hostname or IP of the mail server"
+msgstr ""
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Server type IMAP."
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,name:0
+msgid "Name"
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,is_ssl:0
+msgid "SSL/TLS"
+msgstr ""
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Test & Confirm"
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,action_id:0
+msgid "Server Action"
+msgstr ""
+
+#. module: fetchmail
+#: field:mail.message,fetchmail_server_id:0
+msgid "Inbound Mail Server"
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,message_ids:0
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
+msgid "Messages"
+msgstr ""
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Search Incoming Mail Servers"
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,active:0
+msgid "Active"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,attach:0
+msgid ""
+"Whether attachments should be downloaded. If not enabled, incoming emails "
+"will be stripped of any attachments before being processed"
+msgstr ""
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Advanced Options"
+msgstr ""
+
+#. module: fetchmail
+#: selection:fetchmail.server,type:0
+msgid "IMAP Server"
+msgstr ""
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "IMAP"
+msgstr ""
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Server type POP."
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,password:0
+msgid "Password"
+msgstr ""
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Actions to Perform on Incoming Mails"
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,type:0
+msgid "Server Type"
+msgstr ""
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Login Information"
+msgstr ""
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Server Information"
+msgstr ""
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "If SSL required."
+msgstr ""
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Advanced"
+msgstr ""
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Server & Login"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,object_id:0
+msgid ""
+"Process each incoming mail as part of a conversation corresponding to this "
+"document type. This will create new documents for new conversations, or "
+"attach follow-up emails to the existing conversations (documents)."
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,object_id:0
+msgid "Create a New Record"
+msgstr ""
+
+#. module: fetchmail
+#: selection:fetchmail.server,state:0
+msgid "Not Confirmed"
+msgstr "Непотврдено"
+
+#. module: fetchmail
+#: selection:fetchmail.server,type:0
+msgid "POP Server"
+msgstr ""
+
+#. module: fetchmail
+#: view:mail.message:0
+msgid "Mail Server"
+msgstr ""
+
+#~ msgid "Confirm"
+#~ msgstr "Потврди"
+
+#~ msgid "Group By..."
+#~ msgstr "Групирај по..."
+
+#~ msgid "Type"
+#~ msgstr "Вид"
+
+#~ msgid ""
+#~ "Warning! Record for selected Model can not be created\n"
+#~ "Please choose valid Model"
+#~ msgstr ""
+#~ "Предупредување! Записот за избраниот Модел не може да се креира\n"
+#~ "Изберете валиден Модел"