From eab2e225a223d0919ee4dde65f4dfe7e269fa01c Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Fri, 6 Jul 2012 14:46:08 +0530
Subject: [PATCH 01/34] [FIX]: add date validation.

bzr revid: nco@tinyerp.com-20120706091608-f5o08ke6z84oilui
---
 addons/membership/membership.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/addons/membership/membership.py b/addons/membership/membership.py
index dc4eadbada9..f7007ac28e7 100644
--- a/addons/membership/membership.py
+++ b/addons/membership/membership.py
@@ -478,7 +478,14 @@ class Product(osv.osv):
         'membership_date_from': fields.date('Date from', help='Date from which membership becomes active.'),
         'membership_date_to': fields.date('Date to', help='Date until which membership remains active.'),
     }
-
+    def _check_end_date(self, cr, uid, ids, context=None):
+        for membership in self.browse(cr, uid, ids, context=context):
+            if membership.membership_date_to < membership.membership_date_from:
+                return False
+        return True
+    _constraints = [
+        (_check_end_date, 'Error ! Ending Date cannot be set before Beginning Date.', ['membership_date_to']),
+    ]
     _defaults = {
         'membership': False,
     }

From 55ce6a560fb31e86b3a0ae8d21ccaec9e48db3da Mon Sep 17 00:00:00 2001
From: "pankita shah (Open ERP)" <shp@tinyerp.com>
Date: Mon, 29 Oct 2012 18:12:26 +0530
Subject: [PATCH 02/34] [FIX] when user select lead and get draft mode

bzr revid: shp@tinyerp.com-20121029124226-cjn6s3sj434rm5q7
---
 addons/crm/crm_lead.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 9ee5aeb2301..00ee7582c4d 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -50,7 +50,7 @@ class crm_lead(base_stage, format_address, osv.osv):
     def _get_default_stage_id(self, cr, uid, context=None):
         """ Gives default stage_id """
         section_id = self._get_default_section_id(cr, uid, context=context)
-        return self.stage_find(cr, uid, [], section_id, [('state', '=', 'draft'), ('type', '=', 'both')], context=context)
+        return self.stage_find(cr, uid, [], section_id, [('state', '=', 'draft'),'|', ('type', '=', 'lead'),('type', '=', 'both'),], context=context)
 
     def _resolve_section_id_from_context(self, cr, uid, context=None):
         """ Returns ID of section based on the value of 'section_id'
@@ -340,7 +340,7 @@ class crm_lead(base_stage, format_address, osv.osv):
             cases = self.browse(cr, uid, cases, context=context)
         # collect all section_ids
         section_ids = []
-        types = ['both']
+        types = ['lead','opportunity','both']
         if section_id:
             section_ids.append(section_id)
         for lead in cases:

From 084a4217a7022fbf9ecaca6bbfed135798fe856c Mon Sep 17 00:00:00 2001
From: "pankita shah (Open ERP)" <shp@tinyerp.com>
Date: Mon, 29 Oct 2012 18:53:13 +0530
Subject: [PATCH 03/34] [FIX] fixed when select type opportunuty then
 opportunuty in draft mode

bzr revid: shp@tinyerp.com-20121029132313-5ctreoq9nv2fxvxc
---
 addons/crm/crm_lead.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 00ee7582c4d..da0a3f7d756 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -50,7 +50,7 @@ class crm_lead(base_stage, format_address, osv.osv):
     def _get_default_stage_id(self, cr, uid, context=None):
         """ Gives default stage_id """
         section_id = self._get_default_section_id(cr, uid, context=context)
-        return self.stage_find(cr, uid, [], section_id, [('state', '=', 'draft'),'|', ('type', '=', 'lead'),('type', '=', 'both'),], context=context)
+        return self.stage_find(cr, uid, [], section_id, [('state', '=', 'draft'),'|', ('type', '=', 'lead'),'|',('type', '=', 'both'),('type','=','opportunity')], context=context)
 
     def _resolve_section_id_from_context(self, cr, uid, context=None):
         """ Returns ID of section based on the value of 'section_id'

From 97208c971b9155cffa57f403109bc92104af9938 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Mon, 29 Oct 2012 18:37:14 +0100
Subject: [PATCH 04/34] [IMP] avoid tabs (4 spaces) in the middle of help text

bzr revid: abo@openerp.com-20121029173714-qpr4rrhll576jxmm
---
 addons/crm/crm_lead.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index da0a3f7d756..0366045b90f 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -224,11 +224,7 @@ class crm_lead(base_stage, format_address, osv.osv):
                                 multi='day_close', type="float", store=True),
         'state': fields.related('stage_id', 'state', type="selection", store=True,
                 selection=crm.AVAILABLE_STATES, string="Status", readonly=True,
-                help='The Status is set to \'Draft\', when a case is created.\
-                      If the case is in progress the Status is set to \'Open\'.\
-                      When the case is over, the Status is set to \'Done\'.\
-                      If the case needs to be reviewed then the Status is \
-                      set to \'Pending\'.'),
+                help='The Status is set to \'Draft\', when a case is created. If the case is in progress the Status is set to \'Open\'. When the case is over, the Status is set to \'Done\'. If the case needs to be reviewed then the Status is  set to \'Pending\'.'),
 
         # Only used for type opportunity
         'probability': fields.float('Success Rate (%)',group_operator="avg"),

From 7a8d6753021ea86f72ab2a7aca374e70620aa03c Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Mon, 29 Oct 2012 19:11:56 +0100
Subject: [PATCH 05/34] [IMP] code style remove mutable default remove useless
 whitespaces

bzr revid: abo@openerp.com-20121029181156-ao52q3uun3ilp2qk
---
 addons/crm/crm_lead.py       |  4 ++-
 addons/crm/crm_lead_view.xml | 66 ++++++++++++++++++------------------
 2 files changed, 36 insertions(+), 34 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 0366045b90f..4074856ad81 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -324,7 +324,7 @@ class crm_lead(base_stage, format_address, osv.osv):
         cases = self.browse(cr, uid, ids2, context=context)
         return self._action(cr, uid, cases, False, context=context)
 
-    def stage_find(self, cr, uid, cases, section_id, domain=[], order='sequence', context=None):
+    def stage_find(self, cr, uid, cases, section_id, domain=None, order='sequence', context=None):
         """ Override of the base.stage method
             Parameter of the stage search taken from the lead:
             - type: stage type must be the same or 'both'
@@ -332,6 +332,8 @@ class crm_lead(base_stage, format_address, osv.osv):
               be a default stage; if not set, stages must be default
               stages
         """
+        if domain == None:
+            domain = []
         if isinstance(cases, (int, long)):
             cases = self.browse(cr, uid, cases, context=context)
         # collect all section_ids
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index b6890a7de07..a05af900bb9 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -14,9 +14,9 @@
         <record id="action_crm_lead_unread" model="ir.values">
             <field name="name">action_crm_lead_unread</field>
             <field name="action_id" ref="actions_server_crm_lead_unread"/>
-            <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_crm_lead_unread'))" />
+            <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_crm_lead_unread'))"/>
             <field name="key">action</field>
-            <field name="model_id" ref="model_crm_lead" />
+            <field name="model_id" ref="model_crm_lead"/>
             <field name="model">crm.lead</field>
             <field name="key2">client_action_multi</field>
         </record>
@@ -32,9 +32,9 @@
         <record id="action_crm_lead_read" model="ir.values">
             <field name="name">action_crm_lead_read</field>
             <field name="action_id" ref="actions_server_crm_lead_read"/>
-            <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_crm_lead_read'))" />
+            <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_crm_lead_read'))"/>
             <field name="key">action</field>
-            <field name="model_id" ref="model_crm_lead" />
+            <field name="model_id" ref="model_crm_lead"/>
             <field name="model">crm.lead</field>
             <field name="key2">client_action_multi</field>
         </record>
@@ -143,7 +143,7 @@
                     <div class="oe_right oe_button_box" name="buttons">
                         <button type="action"
                             name="%(act_crm_opportunity_crm_phonecall_new)d"
-                            string="Phone Calls" />
+                            string="Phone Calls"/>
                     </div>
                     <div class="oe_title">
                         <label for="name" class="oe_edit_only" string="Lead Description"/>
@@ -167,13 +167,13 @@
                             </div>
                         </group>
                         <group>
-                            <label for="contact_name" />
+                            <label for="contact_name"/>
                             <div>
                                 <field name="contact_name" class="oe_inline"/>,
                                 <field name="title" placeholder="Title" domain="[('domain', '=', 'contact')]" class="oe_inline" options='{"no_open": True}'/>
                             </div>
                             <field name="email_from" widget="email"/>
-                            <field name="function" />
+                            <field name="function"/>
                             <field name="phone"/>
                             <field name="mobile"/>
                             <field name="fax"/>
@@ -209,14 +209,14 @@
                             <group string="Categorization">
                                 <field name="company_id"
                                     groups="base.group_multi_company"
-                                    widget="selection" colspan="2" />
+                                    widget="selection" colspan="2"/>
                                 <field name="type_id" widget="selection"/>
                                 <field name="channel_id" widget="selection"/>
                                 <field name="referred"/>
                                 <field name="state" groups="base.group_no_one"/>
                             </group>
                             <group string="Mailings">
-                                <field name="opt_out" />
+                                <field name="opt_out"/>
                             </group>
                         </group>
                     </page>
@@ -253,12 +253,12 @@
                     <field name="create_date" groups="base.group_no_one"/>
                     <field name="name"/>
                     <field name="contact_name"/>
-                    <field name="country_id" invisible="context.get('invisible_country', True)" />
+                    <field name="country_id" invisible="context.get('invisible_country', True)"/>
                     <field name="email_from"/>
                     <field name="phone"/>
                     <field name="stage_id"/>
                     <field name="user_id" invisible="1"/>
-                    <field name="section_id" invisible="context.get('invisible_section', True)" />
+                    <field name="section_id" invisible="context.get('invisible_section', True)"/>
                     <field name="state" invisible="1"/>
                     <field name="type_id" invisible="1"/>
                     <field name="referred" invisible="1"/>
@@ -276,8 +276,8 @@
             <field name="arch" type="xml">
                 <calendar string="Leads Generation"
                     date_start="date_action" color="user_id">
-                    <field name="name" />
-                    <field name="partner_name" />
+                    <field name="name"/>
+                    <field name="partner_name"/>
                 </calendar>
             </field>
         </record>
@@ -354,14 +354,14 @@
             <field name="arch" type="xml">
                 <search string="Search Leads">
                     <field name="name" string="Lead / Customer" filter_domain="['|','|',('partner_name','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/>
-                    <field name="categ_ids" string="Category" filter_domain="[('categ_ids','ilike',self)]" />
+                    <field name="categ_ids" string="Category" filter_domain="[('categ_ids','ilike',self)]"/>
                     <field name="create_date"/>
                     <filter icon="terp-mail-message-new" string="Unread Messages" help="Unread messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <separator/>
                     <filter icon="terp-check" string="New" name="new" help="New Leads" domain="[('state','=','draft')]"/>
                     <filter icon="terp-camera_test" string="In Progress" name="open" domain="[('state','=','open')]"/>
                     <separator/>
-                    <filter string="Unassigned Leads" icon="terp-personal-" domain="[('user_id','=', False)]" help="Unassigned Leads" />
+                    <filter string="Unassigned Leads" icon="terp-personal-" domain="[('user_id','=', False)]" help="Unassigned Leads"/>
                     <separator/>
                     <filter string="Leads Assigned to Me or My Team(s)" icon="terp-personal+" context="{'invisible_section': False}"
                             domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
@@ -373,8 +373,8 @@
                         <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}"/>
                         <filter string="Referrer" icon="terp-personal" domain="[]" context="{'group_by':'referred'}"/>
-                        <filter string="Campaign" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'type_id'}" />
-                        <filter string="Channel" icon="terp-call-start" domain="[]" context="{'group_by':'channel_id'}" />
+                        <filter string="Campaign" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'type_id'}"/>
+                        <filter string="Channel" icon="terp-call-start" domain="[]" context="{'group_by':'channel_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
                         <filter string="Creation" help="Create date" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
@@ -415,7 +415,7 @@
                                 name="action_makeMeeting"
                                 type="object"
                                 context="{'search_default_attendee_id': active_id, 'default_attendee_id' : active_id}"
-                                />
+                               />
                         </div>
                         <div class="oe_title">
                             <label for="name" class="oe_edit_only"/>
@@ -452,7 +452,7 @@
                                 <label for="section_id"/>
                                 <div>
                                     <field name="section_id" widget="selection"/>
-                                    <button name="case_escalate" string="Escalate" type="object" states="draft,open,pending" />
+                                    <button name="case_escalate" string="Escalate" type="object" states="draft,open,pending"/>
                                 </div>
                             </group>
                             <group>
@@ -485,12 +485,12 @@
                                 </group>
 
                                 <group>
-                                    <label for="contact_name" />
+                                    <label for="contact_name"/>
                                     <div>
                                         <field name="contact_name" class="oe_inline"/>
                                         <field name="title" placeholder="Title" domain="[('domain', '=', 'contact')]" options='{"no_open": True}' class="oe_inline"/>
                                     </div>
-                                    <field name="function" />
+                                    <field name="function"/>
                                     <field name="mobile"/>
                                     <field name="fax"/>
                                 </group>
@@ -500,7 +500,7 @@
                                     <field name="channel_id" widget="selection"/>
                                 </group>
                                 <group string="Mailings">
-                                    <field name="opt_out" />
+                                    <field name="opt_out"/>
                                 </group>
                                 <group string="Misc">
                                     <field name="active"/>
@@ -542,15 +542,15 @@
                     <field name="create_date" groups="base.group_no_one"/>
                     <field name="name" string="Opportunity"/>
                     <field name="partner_id" string="Customer"/>
-                    <field name="country_id" invisible="context.get('invisible_country', True)" />
+                    <field name="country_id" invisible="context.get('invisible_country', True)"/>
                     <field name="date_action"/>
-                    <field name="title_action" />
+                    <field name="title_action"/>
                     <field name="channel_id" invisible="1"/>
                     <field name="type_id" invisible="1"/>
                     <field name="stage_id"/>
                     <field name="planned_revenue" sum="Expected Revenues"/>
                     <field name="probability" widget="progressbar" avg="Avg. of Probability"/>
-                    <field name="section_id" invisible="context.get('invisible_section', True)" />
+                    <field name="section_id" invisible="context.get('invisible_section', True)"/>
                     <field name="user_id"/>
                     <field name="priority" invisible="1"/>
                     <field name="state" groups="base.group_no_one"/>
@@ -568,30 +568,30 @@
                 <search string="Search Opportunities">
                     <field name="name" string="Opportunity / Customer"
                         filter_domain="['|','|','|',('partner_id','ilike',self),('partner_name','ilike',self),('email_from','ilike',self),('name', 'ilike', self)]"/>
-                    <field name="categ_ids" string="Category" filter_domain="[('categ_ids','ilike', self)]" />
+                    <field name="categ_ids" string="Category" filter_domain="[('categ_ids','ilike', self)]"/>
                     <filter icon="terp-mail-message-new" string="Unread Messages" help="Unread messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <separator/>
                     <filter icon="terp-check" string="New" help="New Opportunities" name="new" domain="[('state','=','draft')]"/>
                     <filter icon="terp-camera_test" string="In Progress" help="Open Opportunities" name="open" domain="[('state','=','open')]"/>
                     <separator/>
-                    <filter string="Unassigned Opportunities" icon="terp-personal-" domain="[('user_id','=', False)]" help="Unassigned Opportunities" />
+                    <filter string="Unassigned Opportunities" icon="terp-personal-" domain="[('user_id','=', False)]" help="Unassigned Opportunities"/>
                     <separator/>
                     <filter string="Opportunities Assigned to Me or My Team(s)"  icon="terp-personal+"
                             domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]" context="{'invisible_section': False}"
-                            help="Opportunities that are assigned to either me or one of the sale teams I manage" />
+                            help="Opportunities that are assigned to either me or one of the sale teams I manage"/>
                     <field name="user_id"/>
                     <field name="section_id" context="{'invisible_section': False, 'default_section_id': self}"/>
                     <field name="partner_id"/>
                     <group expand="0" string="Group By..." colspan="16">
-                        <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
+                        <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Team" help="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}"/>
                         <filter string="Customer" help="Partner" icon="terp-personal+" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}" />
-                        <filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
+                        <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
+                        <filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}"/>
                         <filter string="Campaign" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'type_id'}"/>
-                        <filter string="Channel" icon="terp-call-start" domain="[]" context="{'group_by':'channel_id'}" />
+                        <filter string="Channel" icon="terp-call-start" domain="[]" context="{'group_by':'channel_id'}"/>
                         <filter string="Creation" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
-                        <filter string="Exp.Closing" icon="terp-go-month" help="Expected Closing" domain="[]" context="{'group_by':'date_deadline'}" />
+                        <filter string="Exp.Closing" icon="terp-go-month" help="Expected Closing" domain="[]" context="{'group_by':'date_deadline'}"/>
                     </group>
                     <group string="Display">
                         <filter string="Show Sales Team" icon="terp-personal+" context="{'invisible_section': False}" domain="[]" help="Show Sales Team"/>

From 5569c20aa19a85dd78bde23863833d558c8d5291 Mon Sep 17 00:00:00 2001
From: "pankita shah (Open ERP)" <shp@tinyerp.com>
Date: Tue, 30 Oct 2012 12:37:26 +0530
Subject: [PATCH 06/34] [FIXED] remove opportunity condition

bzr revid: shp@tinyerp.com-20121030070726-5s6ou598as1p4shb
---
 addons/crm/crm_lead.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 4074856ad81..0906bc4786a 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -50,7 +50,7 @@ class crm_lead(base_stage, format_address, osv.osv):
     def _get_default_stage_id(self, cr, uid, context=None):
         """ Gives default stage_id """
         section_id = self._get_default_section_id(cr, uid, context=context)
-        return self.stage_find(cr, uid, [], section_id, [('state', '=', 'draft'),'|', ('type', '=', 'lead'),'|',('type', '=', 'both'),('type','=','opportunity')], context=context)
+        return self.stage_find(cr, uid, [], section_id, [('state', '=', 'draft'),'|', ('type', '=', 'lead'),'|',('type', '=', 'both')], context=context)
 
     def _resolve_section_id_from_context(self, cr, uid, context=None):
         """ Returns ID of section based on the value of 'section_id'

From 2a03bc48b9b5ec6e108bf24b0576831876738ead Mon Sep 17 00:00:00 2001
From: "pankita shah (Open ERP)" <shp@tinyerp.com>
Date: Tue, 30 Oct 2012 15:00:57 +0530
Subject: [PATCH 07/34] [IMP] or condition

bzr revid: shp@tinyerp.com-20121030093057-ybd2uhr926dnyt9u
---
 addons/crm/crm_lead.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 0906bc4786a..aa3a5bfc24c 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -50,7 +50,7 @@ class crm_lead(base_stage, format_address, osv.osv):
     def _get_default_stage_id(self, cr, uid, context=None):
         """ Gives default stage_id """
         section_id = self._get_default_section_id(cr, uid, context=context)
-        return self.stage_find(cr, uid, [], section_id, [('state', '=', 'draft'),'|', ('type', '=', 'lead'),'|',('type', '=', 'both')], context=context)
+        return self.stage_find(cr, uid, [], section_id, [('state', '=', 'draft'),'|', ('type', '=', 'lead'),('type', '=', 'both')], context=context)
 
     def _resolve_section_id_from_context(self, cr, uid, context=None):
         """ Returns ID of section based on the value of 'section_id'
@@ -338,7 +338,7 @@ class crm_lead(base_stage, format_address, osv.osv):
             cases = self.browse(cr, uid, cases, context=context)
         # collect all section_ids
         section_ids = []
-        types = ['lead','opportunity','both']
+        types = ['lead','both']
         if section_id:
             section_ids.append(section_id)
         for lead in cases:

From ccddcef5da063165ba075487ef980f09b90ea687 Mon Sep 17 00:00:00 2001
From: "pankita shah (Open ERP)" <shp@tinyerp.com>
Date: Wed, 31 Oct 2012 17:47:20 +0530
Subject: [PATCH 08/34] [FIX] set the domain

bzr revid: shp@tinyerp.com-20121031121720-8w2kml7l5mihdjop
---
 addons/crm/crm_lead.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index aa3a5bfc24c..717ad673fe1 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -50,7 +50,7 @@ class crm_lead(base_stage, format_address, osv.osv):
     def _get_default_stage_id(self, cr, uid, context=None):
         """ Gives default stage_id """
         section_id = self._get_default_section_id(cr, uid, context=context)
-        return self.stage_find(cr, uid, [], section_id, [('state', '=', 'draft'),'|', ('type', '=', 'lead'),('type', '=', 'both')], context=context)
+        return self.stage_find(cr, uid, [], section_id, [('state', '=', 'draft')], context=context)
 
     def _resolve_section_id_from_context(self, cr, uid, context=None):
         """ Returns ID of section based on the value of 'section_id'
@@ -338,7 +338,9 @@ class crm_lead(base_stage, format_address, osv.osv):
             cases = self.browse(cr, uid, cases, context=context)
         # collect all section_ids
         section_ids = []
-        types = ['lead','both']
+        types = ['both']
+        if not cases :
+            types += ['lead', 'opportunity']
         if section_id:
             section_ids.append(section_id)
         for lead in cases:

From b0b9b6191571917e97029c8d186ba7c0a00d90f5 Mon Sep 17 00:00:00 2001
From: "pankita shah (Open ERP)" <shp@tinyerp.com>
Date: Wed, 7 Nov 2012 18:26:15 +0530
Subject: [PATCH 09/34] [FiX] get types fron context

bzr revid: shp@tinyerp.com-20121107125615-3hwvihesuqyblta4
---
 addons/crm/crm_lead.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 717ad673fe1..43585d17d35 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -332,15 +332,14 @@ class crm_lead(base_stage, format_address, osv.osv):
               be a default stage; if not set, stages must be default
               stages
         """
-        if domain == None:
-            domain = []
         if isinstance(cases, (int, long)):
             cases = self.browse(cr, uid, cases, context=context)
         # collect all section_ids
         section_ids = []
         types = ['both']
         if not cases :
-            types += ['lead', 'opportunity']
+            type = context.get('default_type')
+            types += [type]
         if section_id:
             section_ids.append(section_id)
         for lead in cases:

From caa54bb76f6be34848fb1d6eb789cce16767802e Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Mon, 19 Nov 2012 04:37:24 +0000
Subject: [PATCH 10/34] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20121119043724-mjkn4taco62obn62
---
 openerp/addons/base/i18n/fa.po | 200 ++++++++++++++++-----------------
 1 file changed, 100 insertions(+), 100 deletions(-)

diff --git a/openerp/addons/base/i18n/fa.po b/openerp/addons/base/i18n/fa.po
index 347abf02cbf..38baf159866 100644
--- a/openerp/addons/base/i18n/fa.po
+++ b/openerp/addons/base/i18n/fa.po
@@ -3,14 +3,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:44+0000\n"
-"PO-Revision-Date: 2012-11-13 02:22+0000\n"
+"PO-Revision-Date: 2012-11-18 22:57+0000\n"
 "Last-Translator: fshahy <fshahy@gmail.com>\n"
 "Language-Team: OpenERP Iran <info@openerp-iran.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-14 04:40+0000\n"
-"X-Generator: Launchpad (build 16251)\n"
+"X-Launchpad-Export-Date: 2012-11-19 04:37+0000\n"
+"X-Generator: Launchpad (build 16278)\n"
 "X-Poedit-Country: IRAN, ISLAMIC REPUBLIC OF\n"
 "X-Poedit-Language: Persian\n"
 
@@ -27,7 +27,7 @@ msgstr "پیکربندی های دیگر"
 #. module: base
 #: selection:ir.property,type:0
 msgid "DateTime"
-msgstr ""
+msgstr "تاریخ و ساعت"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_project_mailgate
@@ -973,7 +973,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.act_menu_create
 #: view:wizard.ir.model.menu.create:0
 msgid "Create Menu"
-msgstr "پدیدن منو"
+msgstr "ایجاد منو"
 
 #. module: base
 #: model:res.country,name:base.in
@@ -1144,7 +1144,7 @@ msgstr ""
 #. module: base
 #: selection:ir.property,type:0
 msgid "Char"
-msgstr ""
+msgstr "کاراکتر"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -1362,7 +1362,7 @@ msgstr "ir.exports"
 #: code:addons/base/module/wizard/base_update_translations.py:38
 #, python-format
 msgid "No language with code \"%s\" exists"
-msgstr ""
+msgstr "هیچ زبانی با کد %s وجود ندارد"
 
 #. module: base
 #: model:ir.module.module,description:base.module_document
@@ -1809,7 +1809,7 @@ msgstr "همکاران"
 #. module: base
 #: field:res.partner.category,parent_left:0
 msgid "Left parent"
-msgstr ""
+msgstr "گره پدر سمت چپ"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_project_mrp
@@ -2635,7 +2635,7 @@ msgstr ""
 #: code:addons/base/res/res_company.py:155
 #, python-format
 msgid "Fax: "
-msgstr ""
+msgstr "فکس: "
 
 #. module: base
 #: model:res.country,name:base.si
@@ -2961,7 +2961,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_wiki_quality_manual
 msgid "Wiki: Quality Manual"
-msgstr ""
+msgstr "ویکی: راهنمای کیفیت"
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
@@ -2974,7 +2974,7 @@ msgstr "گاهشمار"
 #. module: base
 #: field:res.partner.address,partner_id:0
 msgid "Partner Name"
-msgstr ""
+msgstr "نام همکار"
 
 #. module: base
 #: field:workflow.activity,signal_send:0
@@ -2989,7 +2989,7 @@ msgstr "بخش منابع انسانی"
 #. module: base
 #: model:ir.ui.menu,name:base.menu_dashboard_admin
 msgid "Administration Dashboard"
-msgstr ""
+msgstr "داشبورد مدیر"
 
 #. module: base
 #: code:addons/orm.py:4408
@@ -3072,7 +3072,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_contract
 msgid "Employee Contracts"
-msgstr ""
+msgstr "قرارداد کارمند"
 
 #. module: base
 #: model:ir.module.module,description:base.module_wiki_faq
@@ -3136,7 +3136,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_survey
 msgid "Survey"
-msgstr ""
+msgstr "نظرسنجی"
 
 #. module: base
 #: view:base.language.import:0
@@ -3258,7 +3258,7 @@ msgstr ""
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Portugese / Português"
-msgstr ""
+msgstr "پرتغالی / Português"
 
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_sir
@@ -3365,7 +3365,7 @@ msgstr ""
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Japanese / 日本語"
-msgstr ""
+msgstr "ژاپنی / 日本語"
 
 #. module: base
 #: field:ir.actions.report.xml,auto:0
@@ -3428,7 +3428,7 @@ msgstr ""
 #: model:ir.module.category,name:base.module_category_generic_modules_accounting
 #: view:res.company:0
 msgid "Accounting"
-msgstr ""
+msgstr "حسابداری"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_payment
@@ -3497,7 +3497,7 @@ msgstr "res.partner.event"
 #: model:ir.model,name:base.model_ir_filters
 #: model:ir.ui.menu,name:base.menu_ir_filters
 msgid "Filters"
-msgstr ""
+msgstr "فیلترها"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.open_module_tree
@@ -3548,7 +3548,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_point_of_sale
 msgid "Point Of Sale"
-msgstr ""
+msgstr "نقطه فروش"
 
 #. module: base
 #: code:addons/base/module/module.py:302
@@ -3582,7 +3582,7 @@ msgstr ""
 #. module: base
 #: selection:ir.sequence,implementation:0
 msgid "Standard"
-msgstr ""
+msgstr "استاندارد"
 
 #. module: base
 #: model:ir.model,name:base.model_maintenance_contract
@@ -3615,7 +3615,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.category,name:base.module_category_human_resources
 msgid "Human Resources"
-msgstr ""
+msgstr "منابع انسانی"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_country
@@ -3675,7 +3675,7 @@ msgstr "مالیات بر ارزش افزوده"
 #. module: base
 #: field:res.users,new_password:0
 msgid "Set password"
-msgstr ""
+msgstr "تنظیم کلمه عبور"
 
 #. module: base
 #: view:res.lang:0
@@ -3970,7 +3970,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_it
 msgid "Italy - Accounting"
-msgstr ""
+msgstr "ایتالیا - حسابداری"
 
 #. module: base
 #: field:ir.actions.act_window,help:0
@@ -4021,12 +4021,12 @@ msgstr "Xor"
 #. module: base
 #: model:ir.module.category,name:base.module_category_localization_account_charts
 msgid "Account Charts"
-msgstr ""
+msgstr "نمودار حساب ها"
 
 #. module: base
 #: view:res.request:0
 msgid "Request Date"
-msgstr ""
+msgstr "تاریخ درخواست"
 
 #. module: base
 #: code:addons/base/module/wizard/base_export_language.py:52
@@ -4175,7 +4175,7 @@ msgstr "چکیده"
 #. module: base
 #: model:ir.module.category,name:base.module_category_hidden_dependency
 msgid "Dependency"
-msgstr ""
+msgstr "وابستگی"
 
 #. module: base
 #: field:multi_company.default,expression:0
@@ -4280,7 +4280,7 @@ msgstr ""
 #: model:ir.module.module,shortdesc:base.module_marketing
 #: model:ir.ui.menu,name:base.marketing_menu
 msgid "Marketing"
-msgstr ""
+msgstr "بازاریابی"
 
 #. module: base
 #: view:res.partner.bank:0
@@ -4325,7 +4325,7 @@ msgstr ""
 #. module: base
 #: field:ir.attachment,url:0
 msgid "Url"
-msgstr ""
+msgstr "آدرس وب"
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -4455,7 +4455,7 @@ msgstr ""
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Hebrew / עִבְרִי"
-msgstr ""
+msgstr "عبری / עִבְרִי"
 
 #. module: base
 #: model:res.country,name:base.bo
@@ -4494,7 +4494,7 @@ msgstr "قواعد"
 #. module: base
 #: field:ir.mail_server,smtp_host:0
 msgid "SMTP Server"
-msgstr ""
+msgstr "سرور SMTP"
 
 #. module: base
 #: code:addons/base/module/module.py:256
@@ -4585,12 +4585,12 @@ msgstr "کنیا"
 #: model:ir.actions.act_window,name:base.action_translation
 #: model:ir.ui.menu,name:base.menu_action_translation
 msgid "Translated Terms"
-msgstr ""
+msgstr "کلمات ترجمه شده"
 
 #. module: base
 #: view:res.partner.event:0
 msgid "Event"
-msgstr ""
+msgstr "رخداد"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_custom_reports
@@ -4779,7 +4779,7 @@ msgstr "موریتیوس"
 #: view:ir.model.access:0
 #: view:ir.rule:0
 msgid "Full Access"
-msgstr ""
+msgstr "دسترسی کامل"
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -4816,7 +4816,7 @@ msgstr "برپاسازی شد"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Ukrainian / українська"
-msgstr ""
+msgstr "اکراینی / українська"
 
 #. module: base
 #: model:res.country,name:base.sn
@@ -4910,7 +4910,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.category,name:base.module_category_localization
 msgid "Localization"
-msgstr ""
+msgstr "بومی سازی"
 
 #. module: base
 #: model:ir.module.module,description:base.module_sale_mrp
@@ -4975,7 +4975,7 @@ msgstr "منوی مادر"
 #. module: base
 #: field:res.partner.bank,owner_name:0
 msgid "Account Owner Name"
-msgstr ""
+msgstr "نام صاحب حساب"
 
 #. module: base
 #: field:ir.rule,perm_unlink:0
@@ -5003,7 +5003,7 @@ msgstr "جداساز شمارگانی"
 #: view:ir.module.module:0
 #, python-format
 msgid "Install"
-msgstr ""
+msgstr "نصب"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_res_groups
@@ -5019,7 +5019,7 @@ msgstr ""
 #. module: base
 #: field:ir.filters,name:0
 msgid "Filter Name"
-msgstr ""
+msgstr "نام فیلتر"
 
 #. module: base
 #: view:res.partner:0
@@ -5126,7 +5126,7 @@ msgstr "فیلد"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_project_long_term
 msgid "Long Term Projects"
-msgstr ""
+msgstr "پروژه های بلند مدت"
 
 #. module: base
 #: model:res.country,name:base.ve
@@ -5362,7 +5362,7 @@ msgstr "وب"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_lunch
 msgid "Lunch Orders"
-msgstr ""
+msgstr "سفارش های نهار"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -5515,7 +5515,7 @@ msgstr "جزایر اسوالبار و یان ماین"
 #. module: base
 #: model:ir.module.category,name:base.module_category_hidden_test
 msgid "Test"
-msgstr ""
+msgstr "تست"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_kanban
@@ -5534,7 +5534,7 @@ msgstr "گروه‌بندی برمبنای"
 #: view:res.config:0
 #: view:res.config.installer:0
 msgid "title"
-msgstr ""
+msgstr "عنوان"
 
 #. module: base
 #: field:base.language.install,state:0
@@ -5560,12 +5560,12 @@ msgstr ""
 #. module: base
 #: model:ir.model,name:base.model_base_language_install
 msgid "Install Language"
-msgstr ""
+msgstr "نصب زبان"
 
 #. module: base
 #: view:ir.translation:0
 msgid "Translation"
-msgstr ""
+msgstr "ترجمه"
 
 #. module: base
 #: selection:res.request,state:0
@@ -5605,7 +5605,7 @@ msgstr "ویژگی هنگام ستردن برای فیلدهای many2one"
 #. module: base
 #: model:ir.module.category,name:base.module_category_accounting_and_finance
 msgid "Accounting & Finance"
-msgstr ""
+msgstr "حسابداری و مالی"
 
 #. module: base
 #: field:ir.actions.server,write_id:0
@@ -5615,7 +5615,7 @@ msgstr "شناسه نوشتن"
 #. module: base
 #: model:ir.ui.menu,name:base.menu_product
 msgid "Products"
-msgstr ""
+msgstr "محصولات"
 
 #. module: base
 #: help:res.users,name:0
@@ -5846,7 +5846,7 @@ msgstr ""
 #. module: base
 #: view:ir.attachment:0
 msgid "Month"
-msgstr ""
+msgstr "ماه"
 
 #. module: base
 #: model:res.country,name:base.my
@@ -5890,7 +5890,7 @@ msgstr ""
 #. module: base
 #: selection:ir.actions.todo,type:0
 msgid "Launch Automatically"
-msgstr ""
+msgstr "بارگذاری خودکار"
 
 #. module: base
 #: model:ir.module.module,description:base.module_mail
@@ -6286,7 +6286,7 @@ msgstr "بانک‌ها"
 #. module: base
 #: view:res.log:0
 msgid "Unread"
-msgstr ""
+msgstr "خوانده نشده"
 
 #. module: base
 #: field:res.users,id:0
@@ -6492,7 +6492,7 @@ msgstr ""
 #. module: base
 #: model:ir.ui.menu,name:base.menu_main_pm
 msgid "Project"
-msgstr ""
+msgstr "پروژه"
 
 #. module: base
 #: field:ir.ui.menu,web_icon_hover_data:0
@@ -6557,7 +6557,7 @@ msgstr "قرارداد نگهداری"
 #: model:res.groups,name:base.group_user
 #: field:res.partner,employee:0
 msgid "Employee"
-msgstr ""
+msgstr "کارمند"
 
 #. module: base
 #: field:ir.model.access,perm_create:0
@@ -6591,7 +6591,7 @@ msgstr ""
 #: view:res.partner:0
 #: view:res.partner.address:0
 msgid "Edit"
-msgstr ""
+msgstr "ویرایش"
 
 #. module: base
 #: field:ir.actions.client,params:0
@@ -6601,7 +6601,7 @@ msgstr ""
 #. module: base
 #: field:res.users,view:0
 msgid "Interface"
-msgstr ""
+msgstr "رابط"
 
 #. module: base
 #: view:ir.actions.server:0
@@ -6771,12 +6771,12 @@ msgstr "روی چند سند"
 #: view:res.partner:0
 #: field:res.partner,user_id:0
 msgid "Salesman"
-msgstr ""
+msgstr "مسول فروش"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_accountant
 msgid "Accounting and Finance"
-msgstr ""
+msgstr "حسابداری و مالی"
 
 #. module: base
 #: code:addons/base/module/module.py:429
@@ -6818,7 +6818,7 @@ msgstr ""
 #. module: base
 #: view:res.widget.wizard:0
 msgid "Add"
-msgstr ""
+msgstr "افزودن"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_ec
@@ -6892,7 +6892,7 @@ msgstr ""
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Hindi / हिंदी"
-msgstr ""
+msgstr "هندی / हिंदी"
 
 #. module: base
 #: help:res.users,company_id:0
@@ -7058,7 +7058,7 @@ msgstr "کد ISO"
 #: view:res.log:0
 #: field:res.log,read:0
 msgid "Read"
-msgstr ""
+msgstr "خواندن"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_association
@@ -7155,7 +7155,7 @@ msgstr "فیلدها"
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_employee_form
 msgid "Employees"
-msgstr ""
+msgstr "کارمندان"
 
 #. module: base
 #: field:ir.exports.line,name:0
@@ -7478,7 +7478,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.category,name:base.module_category_knowledge_management
 msgid "Knowledge Management"
-msgstr ""
+msgstr "مدیریت دانش"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.bank_account_update
@@ -7542,7 +7542,7 @@ msgstr ""
 #. module: base
 #: model:res.partner.bank.type,name:base.bank_normal
 msgid "Normal Bank Account"
-msgstr ""
+msgstr "حساب بانکی معمولی"
 
 #. module: base
 #: view:ir.actions.wizard:0
@@ -8182,7 +8182,7 @@ msgstr "اسلوونیایی / slovenščina"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_wiki
 msgid "Wiki"
-msgstr ""
+msgstr "ویکی"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_de
@@ -8368,7 +8368,7 @@ msgstr "_بستن"
 #. module: base
 #: field:multi_company.default,company_dest_id:0
 msgid "Default Company"
-msgstr ""
+msgstr "شرکت پیش فرض"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -8490,7 +8490,7 @@ msgstr ""
 #. module: base
 #: field:ir.module.module,complexity:0
 msgid "Complexity"
-msgstr ""
+msgstr "پیچیدگی"
 
 #. module: base
 #: selection:ir.actions.act_window,target:0
@@ -8507,7 +8507,7 @@ msgstr ""
 #: code:addons/orm.py:4085
 #, python-format
 msgid "UserError"
-msgstr ""
+msgstr "خطای کاربر"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_analytic_default
@@ -8539,7 +8539,7 @@ msgstr ""
 #. module: base
 #: model:ir.ui.menu,name:base.menu_crm_case_job_req_main
 msgid "Recruitment"
-msgstr ""
+msgstr "استخدام"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_gr
@@ -8583,12 +8583,12 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_mrp_repair
 msgid "Repairs Management"
-msgstr ""
+msgstr "مدیریت تعمیرات"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_asset
 msgid "Assets Management"
-msgstr ""
+msgstr "مدیریت دارایی"
 
 #. module: base
 #: view:ir.model.access:0
@@ -8930,7 +8930,7 @@ msgstr ""
 #. module: base
 #: view:ir.actions.report.xml:0
 msgid "Report"
-msgstr ""
+msgstr "گزارش"
 
 #. module: base
 #: code:addons/base/ir/ir_mail_server.py:218
@@ -8956,7 +8956,7 @@ msgstr "تارنما"
 #. module: base
 #: selection:ir.mail_server,smtp_encryption:0
 msgid "None"
-msgstr ""
+msgstr "هیچکدام"
 
 #. module: base
 #: view:ir.module.category:0
@@ -8981,7 +8981,7 @@ msgstr ""
 #. module: base
 #: view:ir.ui.view:0
 msgid "Architecture"
-msgstr ""
+msgstr "معماری"
 
 #. module: base
 #: model:res.country,name:base.ml
@@ -9177,7 +9177,7 @@ msgstr ""
 #: model:ir.model,name:base.model_ir_model
 #: model:ir.ui.menu,name:base.ir_model_model_menu
 msgid "Models"
-msgstr ""
+msgstr "مدل ها"
 
 #. module: base
 #: code:addons/base/ir/ir_cron.py:292
@@ -9188,7 +9188,7 @@ msgstr ""
 #. module: base
 #: selection:ir.actions.todo,type:0
 msgid "Launch Manually"
-msgstr ""
+msgstr "بارگذاری دستی"
 
 #. module: base
 #: model:res.country,name:base.be
@@ -9396,7 +9396,7 @@ msgstr ""
 #. module: base
 #: selection:publisher_warranty.contract.wizard,state:0
 msgid "Finished"
-msgstr ""
+msgstr "تمام شده"
 
 #. module: base
 #: model:res.country,name:base.de
@@ -9627,7 +9627,7 @@ msgstr ""
 #. module: base
 #: selection:ir.module.module,complexity:0
 msgid "Expert"
-msgstr ""
+msgstr "متخصص"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_holidays
@@ -9647,7 +9647,7 @@ msgstr ""
 #: view:res.partner.address:0
 #: view:workflow.activity:0
 msgid "Group By..."
-msgstr ""
+msgstr "گروه بتدی بر اساس ..."
 
 #. module: base
 #: view:ir.model.fields:0
@@ -9791,7 +9791,7 @@ msgstr "دقیقه‌ها"
 #. module: base
 #: view:res.currency:0
 msgid "Display"
-msgstr ""
+msgstr "نمایش"
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -9812,7 +9812,7 @@ msgstr ""
 #. module: base
 #: model:ir.actions.report.xml,name:base.preview_report
 msgid "Preview Report"
-msgstr ""
+msgstr "پیش نمایش گزارش"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_purchase_analytic_plans
@@ -9897,7 +9897,7 @@ msgstr "هفته‌ها"
 #: code:addons/base/res/res_company.py:157
 #, python-format
 msgid "VAT: "
-msgstr ""
+msgstr "مالیات بر ارزش افزوده "
 
 #. module: base
 #: model:res.country,name:base.af
@@ -10922,7 +10922,7 @@ msgstr ""
 #. module: base
 #: view:ir.model.data:0
 msgid "Updatable"
-msgstr ""
+msgstr "قابل به روز رسانی"
 
 #. module: base
 #: view:res.lang:0
@@ -10954,7 +10954,7 @@ msgstr "عربی / الْعَرَبيّة"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
 msgid "Hello"
-msgstr ""
+msgstr "سلام"
 
 #. module: base
 #: view:ir.actions.configuration.wizard:0
@@ -10969,7 +10969,7 @@ msgstr "توضیح"
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
 msgid "HR Manager"
-msgstr ""
+msgstr "مدیر منابع انسانی"
 
 #. module: base
 #: view:ir.filters:0
@@ -11161,7 +11161,7 @@ msgstr "باز کردن پنجره‌"
 #. module: base
 #: field:ir.actions.act_window,auto_search:0
 msgid "Auto Search"
-msgstr ""
+msgstr "جستجوی خودکار"
 
 #. module: base
 #: field:ir.actions.act_window,filter:0
@@ -11260,7 +11260,7 @@ msgstr "مشتریان مهم"
 #. module: base
 #: view:res.lang:0
 msgid "Update Terms"
-msgstr ""
+msgstr "به روز رسانی کلمات"
 
 #. module: base
 #: model:ir.module.module,description:base.module_project_messages
@@ -11277,7 +11277,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr
 msgid "Employee Directory"
-msgstr ""
+msgstr "دایرکتوری کارمندان"
 
 #. module: base
 #: view:ir.cron:0
@@ -11527,7 +11527,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_mail
 msgid "Emails Management"
-msgstr ""
+msgstr "مدیریت پست الکترونیک"
 
 #. module: base
 #: field:ir.actions.server,trigger_name:0
@@ -11597,7 +11597,7 @@ msgstr "مرجع جدول"
 #: code:addons/base/ir/ir_mail_server.py:443
 #, python-format
 msgid "Mail delivery failed"
-msgstr ""
+msgstr "ارسال پست الکترونیک موفق نبود"
 
 #. module: base
 #: field:ir.actions.act_window,res_model:0
@@ -11909,7 +11909,7 @@ msgstr "منتظر"
 #. module: base
 #: field:ir.actions.report.xml,report_file:0
 msgid "Report file"
-msgstr ""
+msgstr "فایل گزارش"
 
 #. module: base
 #: model:ir.model,name:base.model_workflow_triggers
@@ -11925,7 +11925,7 @@ msgstr ""
 #. module: base
 #: view:ir.mail_server:0
 msgid "Connection Information"
-msgstr ""
+msgstr "اطلاعات تماس"
 
 #. module: base
 #: view:ir.attachment:0
@@ -12134,7 +12134,7 @@ msgstr "دسته‌بندی"
 #: selection:ir.attachment,type:0
 #: selection:ir.property,type:0
 msgid "Binary"
-msgstr ""
+msgstr "باینری"
 
 #. module: base
 #: field:ir.actions.server,sms:0
@@ -12171,7 +12171,7 @@ msgstr ""
 #. module: base
 #: view:workflow.activity:0
 msgid "Conditions"
-msgstr ""
+msgstr "شروط"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_other_form
@@ -12296,7 +12296,7 @@ msgstr "استونی"
 #: model:ir.module.module,shortdesc:base.module_board
 #: model:ir.ui.menu,name:base.menu_dashboard
 msgid "Dashboards"
-msgstr ""
+msgstr "داشبوردها"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_procurement
@@ -12306,7 +12306,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_payroll_account
 msgid "Payroll Accounting"
-msgstr ""
+msgstr "حسابداری حقوق و دستمزد"
 
 #. module: base
 #: help:ir.attachment,type:0
@@ -12433,7 +12433,7 @@ msgstr "تعداد تماس‌ها"
 #: code:addons/base/res/res_bank.py:189
 #, python-format
 msgid "BANK"
-msgstr ""
+msgstr "بانک"
 
 #. module: base
 #: view:base.module.upgrade:0
@@ -12867,7 +12867,7 @@ msgstr ""
 #. module: base
 #: view:ir.filters:0
 msgid "Current User"
-msgstr ""
+msgstr "کاربر فعلی"
 
 #. module: base
 #: field:res.company,company_registry:0
@@ -13065,7 +13065,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_publisher_warranty_contract_form
 #: model:ir.ui.menu,name:base.menu_publisher_warranty_contract
 msgid "Contracts"
-msgstr ""
+msgstr "قراردادها"
 
 #. module: base
 #: field:base.language.export,state:0
@@ -13113,7 +13113,7 @@ msgstr ""
 #. module: base
 #: field:res.partner.bank,bank_name:0
 msgid "Bank Name"
-msgstr ""
+msgstr "نام بانک"
 
 #. module: base
 #: model:res.country,name:base.ki
@@ -13192,7 +13192,7 @@ msgstr "فایل CSV"
 #: code:addons/base/res/res_company.py:154
 #, python-format
 msgid "Phone: "
-msgstr ""
+msgstr "تلفن: "
 
 #. module: base
 #: field:res.company,account_no:0
@@ -13367,7 +13367,7 @@ msgstr ""
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Diagram"
-msgstr ""
+msgstr "دیاگرام"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_es
@@ -13970,7 +13970,7 @@ msgstr ""
 #: model:ir.ui.menu,name:base.menu_config_address_book
 #: model:ir.ui.menu,name:base.menu_procurement_management_supplier
 msgid "Address Book"
-msgstr ""
+msgstr "دفترچه آدرس"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_ma

From 66afff1b52b7ab6ab8c340e18960fb6367cfb714 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Mon, 19 Nov 2012 04:37:43 +0000
Subject: [PATCH 11/34] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20121117043708-z0u57016sd0wlp40
bzr revid: launchpad_translations_on_behalf_of_openerp-20121118043740-7rflvcr80m8nk6lf
bzr revid: launchpad_translations_on_behalf_of_openerp-20121119043743-wa4nnbhzv39ixzag
---
 addons/account_check_writing/i18n/lt.po | 199 ++++++++++
 addons/account_voucher/i18n/nl.po       |  10 +-
 addons/hr_timesheet/i18n/de.po          |  62 ++--
 addons/l10n_be_hr_payroll/i18n/de.po    | 163 +++++++++
 addons/l10n_multilang/i18n/ar.po        | 172 +++++++++
 addons/l10n_pe/i18n/ar.po               |  47 +++
 addons/mrp_jit/i18n/sl.po               |  29 +-
 addons/sale/i18n/lv.po                  | 460 +++++++++++++++++++-----
 8 files changed, 1007 insertions(+), 135 deletions(-)
 create mode 100644 addons/account_check_writing/i18n/lt.po
 create mode 100644 addons/l10n_be_hr_payroll/i18n/de.po
 create mode 100644 addons/l10n_multilang/i18n/ar.po
 create mode 100644 addons/l10n_pe/i18n/ar.po

diff --git a/addons/account_check_writing/i18n/lt.po b/addons/account_check_writing/i18n/lt.po
new file mode 100644
index 00000000000..35e98d451ad
--- /dev/null
+++ b/addons/account_check_writing/i18n/lt.po
@@ -0,0 +1,199 @@
+# Lithuanian 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:35+0000\n"
+"PO-Revision-Date: 2012-11-16 06:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Lithuanian <lt@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-11-17 04:37+0000\n"
+"X-Generator: Launchpad (build 16278)\n"
+
+#. module: account_check_writing
+#: selection:res.company,check_layout:0
+msgid "Check on Top"
+msgstr ""
+
+#. module: account_check_writing
+#: model:ir.actions.act_window,help:account_check_writing.action_write_check
+msgid ""
+"The check payment form allows you to track the payment you do to your "
+"suppliers specially by check. When you select a supplier, the payment method "
+"and an amount for the payment, OpenERP will propose to reconcile your "
+"payment with the open supplier invoices or bills.You can print the check"
+msgstr ""
+
+#. module: account_check_writing
+#: view:account.voucher:0
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_bottom
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_middle
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_top
+msgid "Print Check"
+msgstr ""
+
+#. module: account_check_writing
+#: selection:res.company,check_layout:0
+msgid "Check in middle"
+msgstr ""
+
+#. module: account_check_writing
+#: help:res.company,check_layout:0
+msgid ""
+"Check on top is compatible with Quicken, QuickBooks and Microsoft Money. "
+"Check in middle is compatible with Peachtree, ACCPAC and DacEasy. Check on "
+"bottom is compatible with Peachtree, ACCPAC and DacEasy only"
+msgstr ""
+
+#. module: account_check_writing
+#: selection:res.company,check_layout:0
+msgid "Check on bottom"
+msgstr ""
+
+#. module: account_check_writing
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: account_check_writing
+#: help:account.journal,allow_check_writing:0
+msgid "Check this if the journal is to be used for writing checks."
+msgstr ""
+
+#. module: account_check_writing
+#: field:account.journal,allow_check_writing:0
+msgid "Allow Check writing"
+msgstr ""
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Description"
+msgstr "Aprašas"
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_account_journal
+msgid "Journal"
+msgstr "Žurnalas"
+
+#. module: account_check_writing
+#: model:ir.actions.act_window,name:account_check_writing.action_write_check
+#: model:ir.ui.menu,name:account_check_writing.menu_action_write_check
+msgid "Write Checks"
+msgstr ""
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Discount"
+msgstr ""
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Original Amount"
+msgstr ""
+
+#. module: account_check_writing
+#: view:res.company:0
+msgid "Configuration"
+msgstr ""
+
+#. module: account_check_writing
+#: field:account.voucher,allow_check:0
+msgid "Allow Check Writing"
+msgstr ""
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Payment"
+msgstr ""
+
+#. module: account_check_writing
+#: field:account.journal,use_preprint_check:0
+msgid "Use Preprinted Check"
+msgstr ""
+
+#. module: account_check_writing
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Due Date"
+msgstr ""
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: account_check_writing
+#: view:res.company:0
+msgid "Default Check Layout"
+msgstr ""
+
+#. module: account_check_writing
+#: constraint:account.journal:0
+msgid ""
+"Configuration error! The currency chosen should be shared by the default "
+"accounts too."
+msgstr ""
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+msgid "Balance Due"
+msgstr ""
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Check Amount"
+msgstr ""
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_account_voucher
+msgid "Accounting Voucher"
+msgstr ""
+
+#. module: account_check_writing
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr ""
+
+#. module: account_check_writing
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr ""
+
+#. module: account_check_writing
+#: field:account.voucher,amount_in_word:0
+msgid "Amount in Word"
+msgstr ""
+
+#. module: account_check_writing
+#: report:account.print.check.top:0
+msgid "Open Balance"
+msgstr ""
+
+#. module: account_check_writing
+#: field:res.company,check_layout:0
+msgid "Choose Check layout"
+msgstr ""
diff --git a/addons/account_voucher/i18n/nl.po b/addons/account_voucher/i18n/nl.po
index 87972b2d22c..84eb08244a6 100644
--- a/addons/account_voucher/i18n/nl.po
+++ b/addons/account_voucher/i18n/nl.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-05-10 18:01+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-11-17 09:57+0000\n"
+"Last-Translator: Stefan Rijnhart (Therp) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
-"X-Generator: Launchpad (build 16206)\n"
+"X-Launchpad-Export-Date: 2012-11-18 04:37+0000\n"
+"X-Generator: Launchpad (build 16278)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
@@ -846,7 +846,7 @@ msgstr ""
 #: view:account.voucher:0
 #: model:ir.model,name:account_voucher.model_account_voucher
 msgid "Accounting Voucher"
-msgstr "Betalingsintentie"
+msgstr "Journaalbon"
 
 #. module: account_voucher
 #: field:account.voucher,number:0
diff --git a/addons/hr_timesheet/i18n/de.po b/addons/hr_timesheet/i18n/de.po
index e60d95cb75f..a1ac73f5d7a 100644
--- a/addons/hr_timesheet/i18n/de.po
+++ b/addons/hr_timesheet/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 17:22+0000\n"
-"Last-Translator: Ferdinand-camptocamp <Unknown>\n"
+"PO-Revision-Date: 2012-11-18 00:40+0000\n"
+"Last-Translator: Felix Schubert <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
-"X-Generator: Launchpad (build 16206)\n"
+"X-Launchpad-Export-Date: 2012-11-19 04:37+0000\n"
+"X-Generator: Launchpad (build 16278)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -37,7 +37,7 @@ msgstr "Kein Mitarbeiter für diesen Benutzer definiert!"
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Group By..."
-msgstr "Gruppierung..."
+msgstr "Gruppieren nach"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,help:hr_timesheet.action_hr_timesheet_sign_in
@@ -66,7 +66,7 @@ msgstr "Analytisches Journal"
 #. module: hr_timesheet
 #: view:hr.sign.out.project:0
 msgid "Stop Working"
-msgstr "Beende Arbeit"
+msgstr "Arbeitsende"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_employee
@@ -172,13 +172,13 @@ msgstr "Warnung !"
 #: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:132
 #, python-format
 msgid "UserError"
-msgstr "BenutzerFehler"
+msgstr "Benutzer Fehler"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:77
 #, python-format
 msgid "No cost unit defined for this employee !"
-msgstr "Keine Kosten Einheit für diesen Mitarbeiter definiert!"
+msgstr "Kein Stundensatz für diesen Mitarbeiter definiert!"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -254,7 +254,7 @@ msgstr "Juli"
 #: field:hr.sign.in.project,date:0
 #: field:hr.sign.out.project,date_start:0
 msgid "Starting Date"
-msgstr "Anfangsdatum"
+msgstr "Start Datum"
 
 #. module: hr_timesheet
 #: view:hr.employee:0
@@ -271,8 +271,8 @@ msgstr ""
 #: help:hr.employee,product_id:0
 msgid "Specifies employee's designation as a product with type 'service'."
 msgstr ""
-"Spezifiziere ein Produkt mit dem Typ 'Dienstleistungen'  bei den "
-"Mitarbeitereinstellungen auf dem Aktenreiter 'Zeiterfassung'."
+"Definiert ein Produkt mit dem Typ \"Dienstleistung\" in den Einstellungen "
+"für den Mitarbeiter"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
@@ -318,7 +318,7 @@ msgstr "Aufgabenbeschreibung"
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "Invoice Analysis"
-msgstr "Statistik Rechnungen"
+msgstr "Rechnungsanalyse"
 
 #. module: hr_timesheet
 #: model:ir.actions.report.xml,name:hr_timesheet.report_user_timesheet
@@ -334,7 +334,7 @@ msgstr "Anmelden / Abmelden bei Projekt"
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_define_analytic_structure
 msgid "Define your Analytic Structure"
-msgstr "Definieren Sie die Strukture der Analysekonten"
+msgstr "Definiere die Struktur der Analytischen Konten"
 
 #. module: hr_timesheet
 #: view:hr.sign.in.project:0
@@ -348,14 +348,14 @@ msgid ""
 "Analytic journal is not defined for employee %s \n"
 "Define an employee for the selected user and assign an analytic journal!"
 msgstr ""
-"Analytisches Journal ist für diesen Mitarbeiter nicht definiert: %s\n"
-"Definiere einen Mitarbeiter für den ausgewählten Benutzer und weise dann "
-"noch ein analytisches Konto zu!"
+"Es wurde kein Analytisches Journal für diesen Mitarbeiter definiert: %s\n"
+"Weise einen Mitarbeiter dem ausgewählten Benutzer und ein analytisches Konto "
+"zu!"
 
 #. module: hr_timesheet
 #: view:hr.sign.in.project:0
 msgid "(Keep empty for current time)"
-msgstr "(Leer lassen für aktuelle Zeit)"
+msgstr "(Frei lassen für den aktuellen Zeitpunkt)"
 
 #. module: hr_timesheet
 #: view:hr.employee:0
@@ -369,9 +369,9 @@ msgid ""
 "analyse costs and revenues. In OpenERP, analytic accounts are also used to "
 "track customer contracts."
 msgstr ""
-"Um Erlöse und Kosten zu analysiren, benötigen Sie einen strukturierte "
-"Analyse Kontenplan. In OpenERP wird  damit auch die Entwicklung der "
-"Kundenkontrakte verfolgt."
+"Um Erlöse und Kosten zu analysieren, sollten Sie einen strukturierte "
+"analytischen Kontenplan erstellen. In OpenERP können damit auch "
+"Kundenverträge verfolgt werden."
 
 #. module: hr_timesheet
 #: field:hr.analytic.timesheet,line_id:0
@@ -424,7 +424,7 @@ msgstr ""
 #. module: hr_timesheet
 #: field:hr.sign.out.project,date:0
 msgid "Closing Date"
-msgstr "Ende Datum"
+msgstr "Enddatum"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -475,12 +475,12 @@ msgstr "Mitarbeiter Nr."
 #. module: hr_timesheet
 #: view:hr.sign.out.project:0
 msgid "General Information"
-msgstr "Grundinformation"
+msgstr "Allgemeine Informationen"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
 msgid "My Current Timesheet"
-msgstr ""
+msgstr "Meine Zeiterfassung"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -524,8 +524,8 @@ msgid ""
 "Through this menu you can register and follow your workings hours by project "
 "every day."
 msgstr ""
-"Mit diesem Menüpunkt können Sie sich registrieren und die Arbeitsstunden je "
-"Projekt und Tage verfoglen."
+"Mit diesem Menüpunkt können Sie die Arbeitsstunden pro Projekt und Tage "
+"verfolgen."
 
 #. module: hr_timesheet
 #: field:hr.sign.in.project,server_date:0
@@ -561,12 +561,12 @@ msgstr "Mai"
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Total time"
-msgstr "Gesamtzeit"
+msgstr "Gesamtdauer"
 
 #. module: hr_timesheet
 #: view:hr.sign.in.project:0
 msgid "(local time on the server side)"
-msgstr "(Ortszeit auf dem Server)"
+msgstr "(Ortszeit auf Serverseite)"
 
 #. module: hr_timesheet
 #: model:ir.model,name:hr_timesheet.model_hr_sign_in_project
@@ -585,7 +585,7 @@ msgstr "Februar"
 #. module: hr_timesheet
 #: model:ir.model,name:hr_timesheet.model_hr_sign_out_project
 msgid "Sign Out By Project"
-msgstr "Anmelden / Abmelden Projekte"
+msgstr "Anmelden / Abmelden Projekt"
 
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.users:0
@@ -617,7 +617,7 @@ msgid ""
 "No analytic account defined on the project.\n"
 "Please set one or we can not automatically fill the timesheet."
 msgstr ""
-"Kein Analytisches Konto für Projekt definiert.\n"
+"Kein Analytisches Konto für das Projekt definiert.\n"
 "Bitte definieren Sie ein Konto, damit wir automatisch die Zeiterfassung "
 "buchen können."
 
@@ -630,12 +630,12 @@ msgstr "Benutzer"
 #. module: hr_timesheet
 #: view:hr.sign.in.project:0
 msgid "Start Working"
-msgstr "Beginne Arbeit"
+msgstr "Arbeitsbeginn"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "Stats by user"
-msgstr "Arbeitszeiten nach Mitarbeitern"
+msgstr "Auswertung nach Mitarbeiter"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:42
diff --git a/addons/l10n_be_hr_payroll/i18n/de.po b/addons/l10n_be_hr_payroll/i18n/de.po
new file mode 100644
index 00000000000..6c95585909e
--- /dev/null
+++ b/addons/l10n_be_hr_payroll/i18n/de.po
@@ -0,0 +1,163 @@
+# German 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-11-18 21:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: German <de@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-11-19 04:37+0000\n"
+"X-Generator: Launchpad (build 16278)\n"
+
+#. module: l10n_be_hr_payroll
+#: help:hr.employee,disabled_spouse_bool:0
+msgid "if recipient spouse is declared disabled by law"
+msgstr ""
+"Wenn Ehepartner des Empfängers gesetzlich als Behindert anerkannt wurde"
+
+#. module: l10n_be_hr_payroll
+#: help:hr.employee,disabled_children_bool:0
+msgid "if recipient children is/are declared disabled by law"
+msgstr ""
+"Wenn Kind(er) des Empfängers gesetzlich als behindert anerkannt ist (sind)"
+
+#. module: l10n_be_hr_payroll
+#: field:hr.contract,misc_onss_deduction:0
+msgid "Miscellaneous exempt ONSS "
+msgstr "Diverse Ausnahmen (ONSS) "
+
+#. module: l10n_be_hr_payroll
+#: model:ir.model,name:l10n_be_hr_payroll.model_hr_employee
+msgid "Employee"
+msgstr "Angestellte/r"
+
+#. module: l10n_be_hr_payroll
+#: field:hr.employee,disabled_spouse_bool:0
+msgid "Disabled Spouse"
+msgstr "Als Behindert anerkannter Ehepartner"
+
+#. module: l10n_be_hr_payroll
+#: field:hr.contract,retained_net_amount:0
+msgid "Net retained "
+msgstr "Einbehalten Netto "
+
+#. module: l10n_be_hr_payroll
+#: field:hr.employee,resident_bool:0
+msgid "Nonresident"
+msgstr "Im Ausland wohnhaft"
+
+#. module: l10n_be_hr_payroll
+#: help:hr.employee,resident_bool:0
+msgid "if recipient lives in a foreign country"
+msgstr "Wenn Empfänger in anderem Land wohnhaft ist"
+
+#. module: l10n_be_hr_payroll
+#: view:hr.employee:0
+msgid "if spouse has professionnel income or not"
+msgstr "Ob Ehepartner berufliches Einkommen hat oder nicht"
+
+#. module: l10n_be_hr_payroll
+#: view:hr.contract:0
+msgid "Miscellaneous"
+msgstr "Verschiedenes"
+
+#. module: l10n_be_hr_payroll
+#: field:hr.contract,insurance_employee_deduction:0
+msgid "Insurance Group - by worker "
+msgstr "Vericherungsgruppe nach Mitarbeiter "
+
+#. module: l10n_be_hr_payroll
+#: selection:hr.employee,spouse_fiscal_status:0
+msgid "With Income"
+msgstr "Mit Einkommen"
+
+#. module: l10n_be_hr_payroll
+#: selection:hr.employee,spouse_fiscal_status:0
+msgid "Without Income"
+msgstr "Ohne Einkommen"
+
+#. module: l10n_be_hr_payroll
+#: field:hr.employee,disabled_children_number:0
+msgid "Number of disabled children"
+msgstr "Anzahl behinderter Kinder"
+
+#. module: l10n_be_hr_payroll
+#: field:hr.contract,additional_net_amount:0
+msgid "Net supplements"
+msgstr "Netto-Zulagen"
+
+#. module: l10n_be_hr_payroll
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+"Fehler ! Sie können keine rekursive Hierachie bei Mitarbeitern definieren."
+
+#. module: l10n_be_hr_payroll
+#: field:hr.contract,car_company_amount:0
+msgid "Company car employer"
+msgstr "Firmenfahrzeug des Arbeitgebers"
+
+#. module: l10n_be_hr_payroll
+#: field:hr.contract,misc_advantage_amount:0
+msgid "Benefits of various nature "
+msgstr "Geldwerte Vorteile verschiedener Art "
+
+#. module: l10n_be_hr_payroll
+#: field:hr.contract,car_employee_deduction:0
+msgid "Company Car Deduction for Worker"
+msgstr "Abzüge beim Mitarbeiter für Firmenfahrzeug"
+
+#. module: l10n_be_hr_payroll
+#: field:hr.employee,disabled_children_bool:0
+msgid "Disabled Children"
+msgstr "Behinderte Kinder"
+
+#. module: l10n_be_hr_payroll
+#: model:ir.model,name:l10n_be_hr_payroll.model_hr_contract
+msgid "Contract"
+msgstr "Vertrag"
+
+#. module: l10n_be_hr_payroll
+#: field:hr.contract,meal_voucher_amount:0
+msgid "Check Value Meal "
+msgstr "Verköstigungswert prüfen "
+
+#. module: l10n_be_hr_payroll
+#: field:hr.contract,travel_reimbursement_amount:0
+msgid "Reimbursement of travel expenses"
+msgstr "Erstattung von Reisespesen"
+
+#. module: l10n_be_hr_payroll
+#: constraint:hr.contract:0
+msgid "Error! contract start-date must be lower then contract end-date."
+msgstr ""
+"Fehler! Datum des Vertragsbeginns muss zeitlich vor dem  Datum des "
+"Vertragsendes sein."
+
+#. module: l10n_be_hr_payroll
+#: field:hr.employee,spouse_fiscal_status:0
+msgid "Tax status for spouse"
+msgstr "Steuerklasse des Ehepartners"
+
+#. module: l10n_be_hr_payroll
+#: view:hr.contract:0
+msgid "by Worker"
+msgstr "nach Mitarbeiter"
+
+#. module: l10n_be_hr_payroll
+#: view:hr.employee:0
+msgid "number of dependent children declared as disabled"
+msgstr "Anzahl anhängiger, als behindert anerkannter Kinder"
+
+#. module: l10n_be_hr_payroll
+#: field:hr.contract,meal_voucher_employee_deduction:0
+msgid "Check Value Meal - by worker "
+msgstr "Verköstigungswerte - nach Mitarbeitern "
diff --git a/addons/l10n_multilang/i18n/ar.po b/addons/l10n_multilang/i18n/ar.po
new file mode 100644
index 00000000000..6ff075befb6
--- /dev/null
+++ b/addons/l10n_multilang/i18n/ar.po
@@ -0,0 +1,172 @@
+# Arabic 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 01:06+0000\n"
+"PO-Revision-Date: 2012-11-16 19:54+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic <ar@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-11-17 04:37+0000\n"
+"X-Generator: Launchpad (build 16278)\n"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_fiscal_position_template
+msgid "Template for Fiscal Position"
+msgstr "قوالب للمركز المالي"
+
+#. module: l10n_multilang
+#: sql_constraint:account.account:0
+msgid "The code of the account must be unique per company !"
+msgstr "يجب ان يكون كود الحساب فريداً لكل شركة !"
+
+#. module: l10n_multilang
+#: constraint:account.account.template:0
+msgid ""
+"Configuration Error!\n"
+"You can not define children to an account with internal type different of "
+"\"View\"! "
+msgstr ""
+"خطأ في الإعدادات!\n"
+" لاتستطيع تعريف أطفال لحساب من نوع داخلي مختلف ل\"العرض\"! "
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_analytic_journal
+msgid "Analytic Journal"
+msgstr "يومية تحليلية"
+
+#. module: l10n_multilang
+#: constraint:account.account.template:0
+msgid "Error ! You can not create recursive account templates."
+msgstr "خطأ ! لا يمكنك انشاء قوالب الحاسب العودية."
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_journal
+msgid "Journal"
+msgstr "يومية"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_chart_template
+msgid "Templates for Account Chart"
+msgstr "القوالب لجدول الحساب"
+
+#. module: l10n_multilang
+#: sql_constraint:account.tax:0
+msgid "The description must be unique per company!"
+msgstr "وصف لكل شركة يجب ان تكون فريد!"
+
+#. module: l10n_multilang
+#: constraint:account.tax.code.template:0
+msgid "Error ! You can not create recursive Tax Codes."
+msgstr "خطأ ! لايمكنك إنشاء اكواد ضريبية متداخلة."
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_tax_template
+msgid "account.tax.template"
+msgstr "account.tax.template"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_tax
+msgid "account.tax"
+msgstr "account.tax"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_account
+msgid "Account"
+msgstr "حساب"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_wizard_multi_charts_accounts
+msgid "wizard.multi.charts.accounts"
+msgstr "wizard.multi.charts.accounts"
+
+#. module: l10n_multilang
+#: constraint:account.journal:0
+msgid ""
+"Configuration error! The currency chosen should be shared by the default "
+"accounts too."
+msgstr ""
+"خطأ في الإعدادات! يجب أن تكون العملة المختارة مشتركة للحسابات الإفتراضية "
+"أيضأً."
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_account_template
+msgid "Templates for Accounts"
+msgstr "قوالب للحسابات"
+
+#. module: l10n_multilang
+#: help:account.chart.template,spoken_languages:0
+msgid ""
+"State here the languages for which the translations of templates could be "
+"loaded at the time of installation of this localization module and copied in "
+"the final object when generating them from templates. You must provide the "
+"language codes separated by ';'"
+msgstr ""
+
+#. module: l10n_multilang
+#: constraint:account.account:0
+msgid "Error ! You can not create recursive accounts."
+msgstr "خطأ ! لا يمكن إنشاء حسابات تكرارية."
+
+#. module: l10n_multilang
+#: constraint:account.account:0
+msgid ""
+"Configuration Error! \n"
+"You can not select an account type with a deferral method different of "
+"\"Unreconciled\" for accounts with internal type \"Payable/Receivable\"! "
+msgstr ""
+"التكوين الخطأ!\n"
+"لا يمكنك اختيار  نوع الحساب باستخدام  طريقة التأجيل المختلفه \"عدم "
+"المساواه\" للحسابات من النوع الداخلي \"الدفع / القبض\" "
+
+#. module: l10n_multilang
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr "يجب ان يكون الاسم لليومية فريد لكل شركة!"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "حسابات تحليلية"
+
+#. module: l10n_multilang
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr "يجب ان يكون الكود لليومية فريد لكل شركة !"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_fiscal_position
+msgid "Fiscal Position"
+msgstr "الوضع المالي"
+
+#. module: l10n_multilang
+#: constraint:account.account:0
+msgid ""
+"Configuration Error! \n"
+"You can not define children to an account with internal type different of "
+"\"View\"! "
+msgstr ""
+"خطأ في الإعدادات!\n"
+"لا يمكنك تحديد فرع لحساب مع نوع داخلي مختلف من \"عرض\"! "
+
+#. module: l10n_multilang
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr "خطأ! لا يمكنك إنشاء حسابات تحليلية متكررة."
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_tax_code_template
+msgid "Tax Code Template"
+msgstr "قالب رمز الضريبة"
+
+#. module: l10n_multilang
+#: field:account.chart.template,spoken_languages:0
+msgid "Spoken Languages"
+msgstr "اللغات المنطوقة"
diff --git a/addons/l10n_pe/i18n/ar.po b/addons/l10n_pe/i18n/ar.po
new file mode 100644
index 00000000000..90dcc9a47f6
--- /dev/null
+++ b/addons/l10n_pe/i18n/ar.po
@@ -0,0 +1,47 @@
+# Arabic 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: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2012-11-16 18:58+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic <ar@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-11-17 04:37+0000\n"
+"X-Generator: Launchpad (build 16278)\n"
+
+#. module: l10n_pe
+#: model:ir.module.module,description:l10n_pe.module_meta_information
+msgid ""
+"\n"
+"    Peruvian Accounting : chart of Account\n"
+"    "
+msgstr ""
+
+#. module: l10n_pe
+#: model:ir.module.module,shortdesc:l10n_pe.module_meta_information
+msgid "Peruvian Chart of Account"
+msgstr ""
+
+#. module: l10n_pe
+#: model:ir.actions.todo,note:l10n_pe.config_call_account_template_in_minimal
+msgid ""
+"Generate Chart of Accounts from a Chart Template. You will be asked to pass "
+"the name of the company, the chart template to follow, the no. of digits to "
+"generate the code for your accounts and Bank account, currency to create "
+"Journals. Thus,the pure copy of chart Template is generated.\n"
+"\tThis is the same wizard that runs from Financial "
+"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
+"Chart of Accounts from a Chart Template."
+msgstr ""
+"إعداد شجرة الحسابات من قالب. ستم سؤالك عن اسم المنشأة، القالب المتبع، و "
+"إعداد أكواد الحسابات و البنوك، بالإضافة إلي يوميات العملة. و لذلك سيكون هناك "
+"قالب جديد. \n"
+"\tهذه لإعداد الحسابات."
diff --git a/addons/mrp_jit/i18n/sl.po b/addons/mrp_jit/i18n/sl.po
index dfdea2fbcd0..8527b96e315 100644
--- a/addons/mrp_jit/i18n/sl.po
+++ b/addons/mrp_jit/i18n/sl.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2010-11-27 05:28+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2012-11-18 21:54+0000\n"
+"Last-Translator: Dusan Laznik <laznik@mentis.si>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
-"X-Generator: Launchpad (build 16206)\n"
+"X-Launchpad-Export-Date: 2012-11-19 04:37+0000\n"
+"X-Generator: Launchpad (build 16278)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
@@ -46,3 +46,24 @@ msgid ""
 "    \n"
 "    "
 msgstr ""
+"\n"
+"    This module allows Just In Time computation of procurement orders.\n"
+"\n"
+"    If you install this module, you will not have to run the regular "
+"procurement \n"
+"    scheduler anymore (but you still need to run the minimum order point "
+"rule \n"
+"    scheduler, or for example let it run daily.)\n"
+"    All procurement orders will be processed immediately, which could in "
+"some\n"
+"    cases entail a small performance impact.\n"
+"\n"
+"    It may also increase your stock size because products are reserved as "
+"soon\n"
+"    as possible and the scheduler time range is not taken into account "
+"anymore. \n"
+"    In that case, you can not use priorities any more on the different "
+"picking.\n"
+"    \n"
+"    \n"
+"    "
diff --git a/addons/sale/i18n/lv.po b/addons/sale/i18n/lv.po
index 65d1f92d71c..a1b6b6a37c9 100644
--- a/addons/sale/i18n/lv.po
+++ b/addons/sale/i18n/lv.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-09-20 07:29+0000\n"
-"PO-Revision-Date: 2009-09-08 12:39+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2012-11-16 12:35+0000\n"
+"Last-Translator: Normunds (Alistek) <Unknown>\n"
 "Language-Team: Latvian <lv@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-10-30 05:08+0000\n"
-"X-Generator: Launchpad (build 16206)\n"
+"X-Launchpad-Export-Date: 2012-11-17 04:36+0000\n"
+"X-Generator: Launchpad (build 16278)\n"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:215
@@ -161,14 +161,14 @@ msgstr ""
 #. module: sale
 #: field:sale.order,date_confirm:0
 msgid "Confirmation Date"
-msgstr ""
+msgstr "Apstiprināšanas Datums"
 
 #. module: sale
 #: view:sale.order:0
 #: view:sale.order.line:0
 #: view:sale.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grupēt Pēc..."
 
 #. module: sale
 #: view:sale.order.line:0
@@ -209,7 +209,7 @@ msgstr ""
 #. module: sale
 #: field:sale.report,state:0
 msgid "Order State"
-msgstr "Pasūtījuma statuss"
+msgstr "Pasūtījuma Statuss"
 
 #. module: sale
 #: help:sale.config.settings,module_account_analytic_analysis:0
@@ -228,7 +228,7 @@ msgstr ""
 #: view:sale.order:0
 #: view:sale.order.line:0
 msgid "To Invoice"
-msgstr ""
+msgstr "Piestādīt Rēķinu"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -239,7 +239,7 @@ msgstr ""
 #. module: sale
 #: help:sale.order,date_confirm:0
 msgid "Date on which sales order is confirmed."
-msgstr ""
+msgstr "Datums, kurā pasūtījums tika apstiprināts."
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree5
@@ -247,12 +247,12 @@ msgstr ""
 #: view:sale.order:0
 #: view:sale.report:0
 msgid "Quotations"
-msgstr ""
+msgstr "Tāmējumi"
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "March"
-msgstr ""
+msgstr "Marts"
 
 #. module: sale
 #: code:addons/sale/sale.py:558
@@ -277,12 +277,12 @@ msgstr ""
 #: field:sale.report,company_id:0
 #: field:sale.shop,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Uzņēmums"
 
 #. module: sale
 #: field:sale.make.invoice,invoice_date:0
 msgid "Invoice Date"
-msgstr ""
+msgstr "Rēķina Datums"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_line_tree3
@@ -292,7 +292,7 @@ msgstr ""
 #. module: sale
 #: help:sale.advance.payment.inv,amount:0
 msgid "The amount to be invoiced in advance."
-msgstr ""
+msgstr "Priekšapmaksas rēķina summa."
 
 #. module: sale
 #: selection:sale.order,state:0
@@ -321,7 +321,7 @@ msgstr ""
 #. module: sale
 #: help:sale.order,amount_total:0
 msgid "The total amount."
-msgstr ""
+msgstr "Summa"
 
 #. module: sale
 #: view:sale.report:0
@@ -405,7 +405,7 @@ msgstr ""
 #. module: sale
 #: selection:sale.report,month:0
 msgid "September"
-msgstr ""
+msgstr "Septembris"
 
 #. module: sale
 #: field:sale.order,amount_tax:0
@@ -437,7 +437,7 @@ msgstr ""
 #. module: sale
 #: report:sale.order:0
 msgid "Net Total :"
-msgstr "Tīrais kopā:"
+msgstr "Neto Summa:"
 
 #. module: sale
 #: help:sale.config.settings,module_analytic_user_function:0
@@ -456,7 +456,7 @@ msgstr ""
 #: selection:sale.order.line,state:0
 #: selection:sale.report,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Atcelts"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -490,7 +490,7 @@ msgstr "Veikals"
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree2
 msgid "Sales in Exception"
-msgstr ""
+msgstr "Veiktas Izmaiņas"
 
 #. module: sale
 #: field:sale.order,partner_invoice_id:0
@@ -500,7 +500,7 @@ msgstr "Rēķina Adrese"
 #. module: sale
 #: help:sale.order,create_date:0
 msgid "Date on which sales order is created."
-msgstr ""
+msgstr "Datums, kurā izveidots pasūtījums."
 
 #. module: sale
 #: view:res.partner:0
@@ -516,7 +516,7 @@ msgstr "Veidot Rēķinu"
 #: view:sale.make.invoice:0
 #: view:sale.order.line.make.invoice:0
 msgid "Create Invoices"
-msgstr ""
+msgstr "Veidot Rēķinus"
 
 #. module: sale
 #: report:sale.order:0
@@ -537,13 +537,13 @@ msgstr ""
 #. module: sale
 #: field:sale.report,date_confirm:0
 msgid "Date Confirm"
-msgstr ""
+msgstr "Apstiprināšanas Datums"
 
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,nbr:0
 msgid "# of Lines"
-msgstr ""
+msgstr "Rindu skaits"
 
 #. module: sale
 #: help:sale.order,message_summary:0
@@ -561,7 +561,7 @@ msgstr ""
 #: view:sale.report:0
 #: field:sale.report,product_uom_qty:0
 msgid "# of Qty"
-msgstr ""
+msgstr "Daudz."
 
 #. module: sale
 #: report:sale.order:0
@@ -588,12 +588,12 @@ msgstr ""
 #: view:sale.order:0
 #, python-format
 msgid "Sales Order"
-msgstr ""
+msgstr "Pasūtījums"
 
 #. module: sale
 #: field:sale.order.line,product_uos_qty:0
 msgid "Quantity (UoS)"
-msgstr ""
+msgstr "Daudzums (Pārdošanas mērvienība)"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -603,7 +603,7 @@ msgstr ""
 #. module: sale
 #: field:sale.advance.payment.inv,amount:0
 msgid "Advance Amount"
-msgstr ""
+msgstr "Priekšapmaksas Summa"
 
 #. module: sale
 #: selection:sale.order.line,state:0
@@ -657,7 +657,7 @@ msgstr ""
 #: view:sale.report:0
 #: field:sale.report,year:0
 msgid "Year"
-msgstr ""
+msgstr "Gads"
 
 #. module: sale
 #: field:sale.config.settings,group_uom:0
@@ -710,12 +710,12 @@ msgstr "Rēķina pozīcijas"
 #: view:sale.report:0
 #: field:sale.report,price_total:0
 msgid "Total Price"
-msgstr ""
+msgstr "Cena Kopā"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree
 msgid "Old Quotations"
-msgstr ""
+msgstr "Vecie Tāmējumi"
 
 #. module: sale
 #: help:sale.config.settings,module_sale_journal:0
@@ -735,7 +735,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
 #: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
 msgid "Make Invoices"
-msgstr ""
+msgstr "Veidot Rēķinus"
 
 #. module: sale
 #: model:ir.actions.server,name:sale.actions_server_sale_order_read
@@ -766,7 +766,7 @@ msgstr ""
 #. module: sale
 #: field:sale.order,create_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Izveides Datums"
 
 #. module: sale
 #: selection:sale.order,state:0
@@ -777,7 +777,7 @@ msgstr ""
 #. module: sale
 #: help:sale.order,partner_invoice_id:0
 msgid "Invoice address for current sales order."
-msgstr ""
+msgstr "Pasūtījuma rēķina adrese"
 
 #. module: sale
 #: selection:sale.order,invoice_quantity:0
@@ -814,24 +814,24 @@ msgstr "Kopā:"
 #. module: sale
 #: view:sale.report:0
 msgid "My Sales"
-msgstr ""
+msgstr "Mana Pārdošana"
 
 #. module: sale
 #: code:addons/sale/sale.py:253
 #: code:addons/sale/sale.py:822
 #, python-format
 msgid "Invalid action !"
-msgstr "Nepareiza darbība!"
+msgstr "Nederīga darbība!"
 
 #. module: sale
 #: field:sale.order,fiscal_position:0
 msgid "Fiscal Position"
-msgstr "Fiskālā Pozīcija"
+msgstr "Nodokļu Profils"
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "July"
-msgstr ""
+msgstr "Jūlijs"
 
 #. module: sale
 #: field:account.config.settings,module_sale_analytic_plans:0
@@ -903,12 +903,12 @@ msgstr ""
 #. module: sale
 #: report:sale.order:0
 msgid "Quotation Date"
-msgstr ""
+msgstr "Tāmējuma Datums"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Order Date"
-msgstr ""
+msgstr "Pasūtījuma datums"
 
 #. module: sale
 #: help:sale.order,order_policy:0
@@ -946,7 +946,7 @@ msgstr ""
 #: view:sale.report:0
 #: field:sale.report,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Partneris"
 
 #. module: sale
 #: view:sale.advance.payment.inv:0
@@ -976,7 +976,7 @@ msgstr ""
 #. module: sale
 #: model:ir.model,name:sale.model_sale_make_invoice
 msgid "Sales Make Invoice"
-msgstr ""
+msgstr "Izrakstīt Rēķinu"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_order_tree5
@@ -1040,7 +1040,7 @@ msgstr ""
 #. module: sale
 #: selection:sale.report,month:0
 msgid "December"
-msgstr ""
+msgstr "Decembris"
 
 #. module: sale
 #: view:sale.config.settings:0
@@ -1050,13 +1050,13 @@ msgstr ""
 #. module: sale
 #: view:sale.order.line:0
 msgid "Shipped"
-msgstr ""
+msgstr "Piegādāts"
 
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mēnesis"
 
 #. module: sale
 #: model:email.template,subject:sale.email_template_edi_sale
@@ -1077,13 +1077,13 @@ msgstr ""
 #. module: sale
 #: view:sale.order.line:0
 msgid "Uninvoiced"
-msgstr ""
+msgstr "Nav piestādīts rēķins"
 
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,categ_id:0
 msgid "Category of Product"
-msgstr ""
+msgstr "Produkta Kategorija"
 
 #. module: sale
 #: code:addons/sale/sale.py:557
@@ -1109,7 +1109,7 @@ msgstr ""
 #. module: sale
 #: field:sale.shop,name:0
 msgid "Shop Name"
-msgstr ""
+msgstr "Tirdzniecības Punkta Nosaukums"
 
 #. module: sale
 #: code:addons/sale/sale.py:253
@@ -1121,7 +1121,7 @@ msgstr ""
 #. module: sale
 #: report:sale.order:0
 msgid "Taxes :"
-msgstr "Nodokļi"
+msgstr "Nodokļi:"
 
 #. module: sale
 #: code:addons/sale/sale.py:658
@@ -1137,7 +1137,7 @@ msgstr ""
 #. module: sale
 #: model:ir.model,name:sale.model_sale_advance_payment_inv
 msgid "Sales Advance Payment Invoice"
-msgstr ""
+msgstr "Priekšapmaksas Rēķins"
 
 #. module: sale
 #: model:ir.actions.client,name:sale.action_client_sale_menu
@@ -1147,13 +1147,13 @@ msgstr ""
 #. module: sale
 #: selection:sale.report,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "Apstrādē"
 
 #. module: sale
 #: code:addons/sale/sale.py:867
 #, python-format
 msgid "No Customer Defined !"
-msgstr ""
+msgstr "Klients nav Definēts!"
 
 #. module: sale
 #: view:sale.make.invoice:0
@@ -1226,7 +1226,7 @@ msgstr "Grupēt rēķinus"
 #. module: sale
 #: help:sale.order,amount_tax:0
 msgid "The tax amount."
-msgstr ""
+msgstr "Nodokļa summa."
 
 #. module: sale
 #: view:sale.order:0
@@ -1245,7 +1245,7 @@ msgstr ""
 #. module: sale
 #: selection:sale.report,month:0
 msgid "August"
-msgstr ""
+msgstr "Augusts"
 
 #. module: sale
 #: view:sale.order:0
@@ -1255,7 +1255,7 @@ msgstr ""
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorder0
 msgid "Drives procurement and invoicing"
-msgstr ""
+msgstr "Nodrošina iepirkumu un rēķinu piestādīšanas procesu"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_order_form
@@ -1275,7 +1275,7 @@ msgstr ""
 #. module: sale
 #: selection:sale.report,month:0
 msgid "June"
-msgstr ""
+msgstr "Jūnijs"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_email_templates
@@ -1313,12 +1313,12 @@ msgstr ""
 #: model:ir.model,name:sale.model_sale_shop
 #: view:sale.shop:0
 msgid "Sales Shop"
-msgstr ""
+msgstr "Tirdzniecības Kanāls"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_report
 msgid "Sales Orders Statistics"
-msgstr ""
+msgstr "Pasūtījumu Statistika"
 
 #. module: sale
 #: field:sale.order,date_order:0
@@ -1328,17 +1328,17 @@ msgstr ""
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line
 msgid "Sales Order Line"
-msgstr ""
+msgstr "Pasūtījuma Rinda"
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "November"
-msgstr ""
+msgstr "Novembris"
 
 #. module: sale
 #: view:sale.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Paplašinātie filtri..."
 
 #. module: sale
 #: code:addons/sale/wizard/sale_line_invoice.py:111
@@ -1356,7 +1356,7 @@ msgstr ""
 #. module: sale
 #: field:sale.advance.payment.inv,product_id:0
 msgid "Advance Product"
-msgstr ""
+msgstr "Priekšapmaksas Prece"
 
 #. module: sale
 #: selection:sale.order.line,state:0
@@ -1366,7 +1366,7 @@ msgstr "Kļūda"
 #. module: sale
 #: selection:sale.report,month:0
 msgid "October"
-msgstr ""
+msgstr "Oktobris"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_invoice0
@@ -1395,7 +1395,7 @@ msgstr ""
 #. module: sale
 #: selection:sale.report,month:0
 msgid "January"
-msgstr ""
+msgstr "Janvāris"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree4
@@ -1521,7 +1521,7 @@ msgstr ""
 #. module: sale
 #: model:process.node,note:sale.process_node_order0
 msgid "Confirmed sales order to invoice."
-msgstr ""
+msgstr "Apstiprinātie pasūtījumi rēķina piestādīšanai."
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_line_product_tree
@@ -1552,7 +1552,7 @@ msgstr ""
 #: view:sale.report:0
 #: field:sale.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "Diena"
 
 #. module: sale
 #: view:sale.order:0
@@ -1616,12 +1616,12 @@ msgstr ""
 #: model:process.node,name:sale.process_node_quotation0
 #: selection:sale.report,state:0
 msgid "Quotation"
-msgstr ""
+msgstr "Tāme"
 
 #. module: sale
 #: view:sale.order.line:0
 msgid "Search Uninvoiced Lines"
-msgstr ""
+msgstr "Meklēt Rindas, par kurām nav piestādīti Rēķini"
 
 #. module: sale
 #: model:ir.model,name:sale.model_account_config_settings
@@ -1656,7 +1656,7 @@ msgstr ""
 #. module: sale
 #: view:sale.order.line:0
 msgid "To Do"
-msgstr ""
+msgstr "Veicamais"
 
 #. module: sale
 #: report:sale.order:0
@@ -1694,7 +1694,7 @@ msgstr ""
 #: model:ir.ui.menu,name:sale.menu_report_product_all
 #: view:sale.report:0
 msgid "Sales Analysis"
-msgstr ""
+msgstr "Pārdošanu Analīze"
 
 #. module: sale
 #: help:sale.order,pricelist_id:0
@@ -1714,7 +1714,7 @@ msgstr "Izveidot Rēķinu"
 #. module: sale
 #: help:sale.order,amount_untaxed:0
 msgid "The amount without tax."
-msgstr ""
+msgstr "Summa bez nodokļiem."
 
 #. module: sale
 #: view:sale.order.line:0
@@ -1724,7 +1724,7 @@ msgstr ""
 #. module: sale
 #: help:sale.order,invoiced:0
 msgid "It indicates that an invoice has been paid."
-msgstr ""
+msgstr "Norāda, ka rēķins ir apmaksāts."
 
 #. module: sale
 #: code:addons/sale/sale.py:822
@@ -1776,7 +1776,7 @@ msgstr ""
 #. module: sale
 #: selection:sale.report,month:0
 msgid "May"
-msgstr ""
+msgstr "Maijs"
 
 #. module: sale
 #: code:addons/sale/sale.py:766
@@ -1823,7 +1823,7 @@ msgstr ""
 #. module: sale
 #: view:sale.order:0
 msgid "Other Information"
-msgstr ""
+msgstr "Cita Informācija"
 
 #. module: sale
 #: view:res.partner:0
@@ -1838,7 +1838,7 @@ msgstr "Sk."
 #. module: sale
 #: model:process.node,note:sale.process_node_invoice0
 msgid "To be reviewed by the accountant."
-msgstr ""
+msgstr "Pārbaudīt Grāmatvedim."
 
 #. module: sale
 #: view:sale.order:0
@@ -1853,7 +1853,7 @@ msgstr ""
 #. module: sale
 #: help:sale.order,partner_shipping_id:0
 msgid "Shipping address for current sales order."
-msgstr ""
+msgstr "Piegādes adrese pasūtījumam."
 
 #. module: sale
 #: selection:sale.order,state:0
@@ -1880,17 +1880,17 @@ msgstr "Klients"
 #. module: sale
 #: model:product.template,name:sale.advance_product_0_product_template
 msgid "Advance"
-msgstr ""
+msgstr "Priekšapmaksa"
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "February"
-msgstr ""
+msgstr "Februāris"
 
 #. module: sale
 #: field:sale.order,invoice_quantity:0
 msgid "Invoice on"
-msgstr ""
+msgstr "Rēķins pēc"
 
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
@@ -1911,7 +1911,7 @@ msgstr "Datums, kad tika pasūtīts"
 #. module: sale
 #: field:sale.order.line,product_uos:0
 msgid "Product UoS"
-msgstr ""
+msgstr "Produkta pārdošanas mērvienība"
 
 #. module: sale
 #: help:account.config.settings,group_analytic_account_for_sales:0
@@ -1921,22 +1921,22 @@ msgstr ""
 #. module: sale
 #: model:process.node,note:sale.process_node_quotation0
 msgid "Draft state of sales order"
-msgstr ""
+msgstr "Pasūtījuma melnraksta statuss"
 
 #. module: sale
 #: field:sale.order,origin:0
 msgid "Source Document"
-msgstr ""
+msgstr "Pamatojuma Dokuments"
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
-msgstr ""
+msgstr "Aprīlis"
 
 #. module: sale
 #: selection:sale.report,state:0
 msgid "Manual In Progress"
-msgstr ""
+msgstr "Manuāls Progresā"
 
 #. module: sale
 #: model:ir.actions.server,name:sale.actions_server_sale_order_unread
@@ -1978,7 +1978,7 @@ msgstr ""
 #: view:sale.order:0
 #: view:sale.order.line:0
 msgid "Search Sales Order"
-msgstr ""
+msgstr "Meklēt Pasūtījumu"
 
 #. module: sale
 #: view:sale.config.settings:0
@@ -2005,12 +2005,12 @@ msgstr ""
 #. module: sale
 #: model:process.transition,name:sale.process_transition_saleinvoice0
 msgid "From a sales order"
-msgstr ""
+msgstr "No pasūtījuma"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Ignore Exception"
-msgstr ""
+msgstr "Ignorēt Brīdinājumu"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_saleinvoice0
@@ -2035,7 +2035,7 @@ msgstr ""
 #. module: sale
 #: help:sale.order,project_id:0
 msgid "The analytic account related to a sales order."
-msgstr ""
+msgstr "Ar pasūtījumu saistītais analītiskais konts."
 
 #. module: sale
 #: report:sale.order:0
@@ -2086,7 +2086,7 @@ msgstr ""
 #. module: sale
 #: field:sale.order,client_order_ref:0
 msgid "Customer Reference"
-msgstr ""
+msgstr "Klienta Kods"
 
 #. module: sale
 #: view:sale.report:0
@@ -2113,7 +2113,7 @@ msgstr ""
 #. module: sale
 #: view:sale.order:0
 msgid "Total Tax Included"
-msgstr ""
+msgstr "Iekļauto Nodokļu Summa"
 
 #. module: sale
 #: field:sale.order,invoice_exists:0
@@ -2360,9 +2360,6 @@ msgstr ""
 #~ msgid "Assign"
 #~ msgstr "Piešķirt"
 
-#~ msgid "Delivery Order Only"
-#~ msgstr "Piegādes Pasūtījums Tikai"
-
 #~ msgid "Sales order lines"
 #~ msgstr "Tirdzniecības pasūtījuma pozīcijas"
 
@@ -2381,9 +2378,6 @@ msgstr ""
 #~ msgid "Shipping & Manual Invoice"
 #~ msgstr "Piegāde un Manuāls Rēķins"
 
-#~ msgid "UoM"
-#~ msgstr "mērv."
-
 #~ msgid "Sale Invoice"
 #~ msgstr "Rēķins"
 
@@ -2484,3 +2478,279 @@ msgstr ""
 
 #~ msgid "Invoice Based on Deliveries"
 #~ msgstr "Rēķins pēc Piegādes"
+
+#~ msgid "Sales by Salesman in last 90 days"
+#~ msgstr "Pārdošana pa Pārdevējiem pēdējās 90 dienās"
+
+#~ msgid "Configure Sales Order Logistics"
+#~ msgstr "Konfigurēt Pasūtījuma Loģistiku"
+
+#~ msgid "Allows you to compute delivery costs on your quotations."
+#~ msgstr "Ļauj aprēķināt piegādes izmaksas."
+
+#~ msgid ""
+#~ "If you don't have enough stock available to deliver all at once, do you "
+#~ "accept partial shipments or not?"
+#~ msgstr ""
+#~ "Vai piegādāt pasūtījumu pa daļām, ja noliktavā nav iespējams piegādāt visu "
+#~ "pasūtījumu vienlaicīgi?"
+
+#, python-format
+#~ msgid "The quotation '%s' has been converted to a sales order."
+#~ msgstr "Tāmējums \"%s\" tika pārveidots par pasūtījumu."
+
+#~ msgid "Dates"
+#~ msgstr "Datumi"
+
+#~ msgid "Sales by Salesman"
+#~ msgstr "Pārdošana pēc Pārdevējiem"
+
+#~ msgid "Conditions"
+#~ msgstr "Nosacījumi"
+
+#~ msgid "Sales Manager Dashboard"
+#~ msgstr "Pārdevēja Instrumentu Panelis"
+
+#~ msgid "Configure"
+#~ msgstr "Konfigurēt"
+
+#, python-format
+#~ msgid "Could not cancel this sales order !"
+#~ msgstr "Nevar atcelt pasūtījumu!"
+
+#~ msgid "Number Packages"
+#~ msgstr "Iepakojumu Skaits"
+
+#, python-format
+#~ msgid "(n/a)"
+#~ msgstr "(nav pieejams)"
+
+#~ msgid "Order Reference must be unique !"
+#~ msgstr "Pasūtījuma kodam ir jābūt unikālam!"
+
+#~ msgid "Lines to Invoice"
+#~ msgstr "Rindas, par kurām piestādīt Rēķinu."
+
+#~ msgid "Do you really want to create the invoice(s) ?"
+#~ msgstr "Vai tiešām vēlaties piestādīt rēķinu(-s)?"
+
+#~ msgid "All Quotations"
+#~ msgstr "Visi Tāmējumi"
+
+#, python-format
+#~ msgid "Could not cancel sales order line!"
+#~ msgstr "Nevar atcelt pasūtījuma rindu!"
+
+#~ msgid "Sales By Month"
+#~ msgstr "Pārdošana Pa Mēnešiem"
+
+#~ msgid "Procurement of sold material"
+#~ msgstr "Pārdoto preču piegāde"
+
+#~ msgid "  Year  "
+#~ msgstr "  Gads  "
+
+#~ msgid "Companies"
+#~ msgstr "Uzņēmumi"
+
+#~ msgid ""
+#~ "The name and address of the contact who requested the order or quotation."
+#~ msgstr "Pasūtītāja vārds un adrese."
+
+#~ msgid "Create Final Invoice"
+#~ msgstr "Veidot Gala Rēķinu"
+
+#~ msgid "Sales by Partner"
+#~ msgstr "Pārdošana pa Partneriem"
+
+#~ msgid "Sales Order Dates"
+#~ msgstr "Pasūtījumu Datumi"
+
+#~ msgid "Open Invoice"
+#~ msgstr "Atvērt Rēķinu"
+
+#~ msgid "on order"
+#~ msgstr "pie pasūtījuma"
+
+#~ msgid "Delivery Costs"
+#~ msgstr "Piegādes Izmaksas"
+
+#~ msgid "Deliveries to Invoice"
+#~ msgstr "Piegādes, par kurām piestādīt rēķinus"
+
+#~ msgid "Order date"
+#~ msgstr "Pasūtījuma datums"
+
+#~ msgid "Invoicing"
+#~ msgstr "Rēķinu izrakstīšana"
+
+#, python-format
+#~ msgid "The sales order '%s' has been cancelled."
+#~ msgstr "Pasūtījums \"%s\" ir atcelts."
+
+#~ msgid "Configuration Progress"
+#~ msgstr "Konfigurācijas Progress"
+
+#~ msgid "You invoice has been successfully created!"
+#~ msgstr "Rēķins ir veiksmīgi izveidots!"
+
+#~ msgid "Shipped Qty"
+#~ msgstr "Piegādātais Daudz."
+
+#~ msgid "Delivered"
+#~ msgstr "Piegādāts"
+
+#, python-format
+#~ msgid "The sales order '%s' has been set in draft state."
+#~ msgstr "Pasūtījums \"%s\" ir atzīmēts kā melnraksts."
+
+#, python-format
+#~ msgid "Warning !"
+#~ msgstr "Uzmanību!"
+
+#~ msgid "Procurement Order"
+#~ msgstr "Iepirkuma Pasūtījums"
+
+#~ msgid "UoM"
+#~ msgstr "Mērv."
+
+#, python-format
+#~ msgid "You must first cancel stock moves attached to this sales order line."
+#~ msgstr "Vispirms jāatceļ saistītie noliktavas grāmatojumi."
+
+#~ msgid "Sales Open Invoice"
+#~ msgstr "Atvērt Rēķinu"
+
+#~ msgid "Security Days"
+#~ msgstr "Rezerves Dienas"
+
+#, python-format
+#~ msgid "You cannot cancel a sales order line that has already been invoiced !"
+#~ msgstr "Nevar atcelt pasūtījuma rindu, par kuru jau ir piestādīts rēķins!"
+
+#~ msgid "Margins in Sales Orders"
+#~ msgstr "Uzcenojumi Pasūtījumiem"
+
+#~ msgid "Total Tax Excluded"
+#~ msgstr "Nodokļa Summa, kas nav Iekļauta"
+
+#~ msgid "Sales by Product Category"
+#~ msgstr "Pārdošana pa Produktu Kategorijām"
+
+#~ msgid "Procurement Method"
+#~ msgstr "Sagādes Veids"
+
+#~ msgid "Pick List"
+#~ msgstr "Komplektācijas Saraksts"
+
+#~ msgid "Sales per Customer in last 90 days"
+#~ msgstr "Pārdošana pa Klientiem pēdējās 90 dienās"
+
+#~ msgid "Invoice From The Picking"
+#~ msgstr "Veidot Rēķinu Pēc Komplektācijas"
+
+#, python-format
+#~ msgid "Picking Information !"
+#~ msgstr "Informācija par Komplektāciju"
+
+#, python-format
+#~ msgid "Could not cancel sales order !"
+#~ msgstr "Nevar atcelt pasūtījumu!"
+
+#~ msgid "Properties"
+#~ msgstr "Parametri"
+
+#~ msgid "Logistic"
+#~ msgstr "Loģistika"
+
+#~ msgid "   Month   "
+#~ msgstr "   Mēnesis   "
+
+#, python-format
+#~ msgid "Warning"
+#~ msgstr "Brīdinājums"
+
+#~ msgid "Sales by Month"
+#~ msgstr "Pārdošana pa Mēnešiem"
+
+#~ msgid "Delivery Lead Time"
+#~ msgstr "Piegādes laiks"
+
+#~ msgid "Image"
+#~ msgstr "Attēls"
+
+#~ msgid "Error! You can not create recursive companies."
+#~ msgstr "Kļūda! Jums nav tiesību veidot rekursīvus uzņēmumus."
+
+#~ msgid "Invoicing journals"
+#~ msgstr "Rēķinu žurnāli"
+
+#~ msgid "Ordered Date"
+#~ msgstr "Pasūtījuma Veikšanas Datums"
+
+#~ msgid "Configure Your Sales Management Application"
+#~ msgstr "Konfigurēt Tirdzniecības Vadības Moduli"
+
+#~ msgid "Sales Order Layout Improvement"
+#~ msgstr "Pasūtījuma Izkārtojuma Uzlabojums"
+
+#, python-format
+#~ msgid "You must first cancel all invoices attached to this sales order."
+#~ msgstr "Vispirms jāatceļ visi rēķini, kas saistīti ar pasūtījumu."
+
+#, python-format
+#~ msgid "Not enough stock !"
+#~ msgstr "Nav pietiekošs skaits noliktavā!"
+
+#~ msgid "Layout Sequence"
+#~ msgstr "Izkārtojuma Secība"
+
+#, python-format
+#~ msgid "Cannot delete Sales Order(s) which are already confirmed !"
+#~ msgstr "Nevar izdzēst jau apstiprināto(-s) Pasūtījumu(-s)!"
+
+#~ msgid "Accounting"
+#~ msgstr "Grāmatvedība"
+
+#~ msgid "You must assign a production lot for this product"
+#~ msgstr "Šim produktam ir jāpiesaista produkcijas lots"
+
+#~ msgid "State"
+#~ msgstr "Statuss"
+
+#~ msgid "Delivery Order Only"
+#~ msgstr "Veikt Tikai Piegādi"
+
+#~ msgid "Picking Default Policy"
+#~ msgstr "Komplektācijas Noteikumi"
+
+#~ msgid "References"
+#~ msgstr "Kodi"
+
+#~ msgid "Based on the shipped or on the ordered quantities."
+#~ msgstr "Balstīts uz piegādāto vai pasūtīto skaitu."
+
+#~ msgid "Related Picking"
+#~ msgstr "Saistītā Komplektēšana Noliktavā"
+
+#~ msgid "Create Pick List"
+#~ msgstr "Veidot Komplektēšanas Sarakstu"
+
+#~ msgid "Create Delivery Order"
+#~ msgstr "Veidot Piegādes Rīkojumu"
+
+#~ msgid "Create Procurement Order"
+#~ msgstr "Veidot Piegādes Pasūtījumu"
+
+#~ msgid "Picking List"
+#~ msgstr "Komplektēšanas Saraksts"
+
+#, python-format
+#~ msgid "You must first cancel all picking attached to this sales order."
+#~ msgstr "Vispirms jāatceļ visa komplektācija, kas saistīta ar pasūtījumu."
+
+#~ msgid "Picking Policy"
+#~ msgstr "Komplektācijas Noteikumi"
+
+#~ msgid "Picking List & Delivery Order"
+#~ msgstr "Komplektācijas Saraksts un Piegādes Pasūtījums"

From 28cbfd22b782198db100fd4eb40d95cf9c3a1fd0 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 19 Nov 2012 09:42:03 +0100
Subject: [PATCH 12/34] [FIX] editable listview: do not attempt to delete falsy
 ids (from the dataset)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

During the creation of a new record (in an editable list), the
prospective new record has a ``false`` id. In a non-o2m, the row under
creation can be selected (checkbox) and deleted (More > Delete),
leading to the request to ``DELETE false`` being sent to the ORM…
which said ORM does not wish to entertain.

Before actually performing the delete request (more precisely
forwarding said request to the listview itself), remove all false-ish
ids from the array.

Also, don't send a request to delete nothing.

bzr revid: xmo@openerp.com-20121119084203-0vz4v9myfizxz88u
---
 addons/web/static/src/js/view_list_editable.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js
index 1abe3caab39..c42f79d57f9 100644
--- a/addons/web/static/src/js/view_list_editable.js
+++ b/addons/web/static/src/js/view_list_editable.js
@@ -78,12 +78,16 @@ openerp.web.list_editable = function (instance) {
             _.extend(this.dataset, dataset);
         },
         do_delete: function (ids) {
+            var nonfalse = _.compact(ids);
             var _super = this._super.bind(this);
             var next = this.editor.is_editing()
                     ? this.cancel_edition(true)
                     : $.when();
             return next.then(function () {
-                return _super(ids);
+                if (_.isEmpty(nonfalse)) {
+                    return $.when();
+                }
+                return _super(nonfalse);
             });
         },
         editable: function () {

From e0ec6783e58940794712864d9b12262c652e7689 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 19 Nov 2012 09:45:33 +0100
Subject: [PATCH 13/34] [IMP] listview already checks non-empty ids array for
 deletion, so check not useful

bzr revid: xmo@openerp.com-20121119084533-6qnktzmh19kfwtoo
---
 addons/web/static/src/js/view_list_editable.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js
index c42f79d57f9..ec0bf2774fe 100644
--- a/addons/web/static/src/js/view_list_editable.js
+++ b/addons/web/static/src/js/view_list_editable.js
@@ -84,9 +84,6 @@ openerp.web.list_editable = function (instance) {
                     ? this.cancel_edition(true)
                     : $.when();
             return next.then(function () {
-                if (_.isEmpty(nonfalse)) {
-                    return $.when();
-                }
                 return _super(nonfalse);
             });
         },

From 4dcede9044328845e40a32db9672eaac82f31030 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Mon, 19 Nov 2012 11:07:34 +0100
Subject: [PATCH 14/34] [IMP] web: add 'widget: self' in rendering environment
 of openerp.web.Client

bzr revid: rco@openerp.com-20121119100734-dtprbdm9bypid8bk
---
 addons/web/static/src/js/chrome.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index b95550c74a0..07b0bf39f21 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -981,7 +981,7 @@ instance.web.Client = instance.web.Widget.extend({
     start: function() {
         var self = this;
         return instance.session.session_bind(this.origin).then(function() {
-            var $e = $(QWeb.render(self._template, {}));
+            var $e = $(QWeb.render(self._template, {widget: self}));
             self.replaceElement($e);
             $e.openerpClass();
             self.bind_events();

From 248f81277f8952fe884b4bc793ad07be407190a0 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 19 Nov 2012 11:43:32 +0100
Subject: [PATCH 15/34] [FIX] fields.html: behave as fields.text for empty
 values: store NULL

bzr revid: chm@openerp.com-20121119104332-bqm81nuik6pqsbf9
---
 openerp/osv/fields.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/openerp/osv/fields.py b/openerp/osv/fields.py
index 0d12a9a8bc3..c8cf5909ecc 100644
--- a/openerp/osv/fields.py
+++ b/openerp/osv/fields.py
@@ -234,6 +234,8 @@ class html(text):
     _type = 'html'
     _symbol_c = '%s'
     def _symbol_f(x):
+        if x is None or x == False:
+            return None
         return html_sanitize(x)
         
     _symbol_set = (_symbol_c, _symbol_f)

From 6bbac26ffb6f2131cad62df48b5afa3849ee8276 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Mon, 19 Nov 2012 12:02:06 +0100
Subject: [PATCH 16/34] [IMP] ir_confir_parameter: add parameter 'force' in
 method 'init' to reinitialize existing parameters This is useful when
 creating a new database from a dump (reinitialize database.uuid, etc.)

bzr revid: rco@openerp.com-20121119110206-la2yaohf7wmi9yx2
---
 openerp/addons/base/ir/ir_config_parameter.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/ir/ir_config_parameter.py b/openerp/addons/base/ir/ir_config_parameter.py
index 120fcfca554..3c88a3fbc31 100644
--- a/openerp/addons/base/ir/ir_config_parameter.py
+++ b/openerp/addons/base/ir/ir_config_parameter.py
@@ -51,12 +51,14 @@ class ir_config_parameter(osv.osv):
         ('key_uniq', 'unique (key)', 'Key must be unique.')
     ]
 
-    def init(self, cr):
+    def init(self, cr, force=False):
         """
         Initializes the parameters listed in _default_parameters.
+        It overrides existing parameters if force is ``True``.
         """
         for key, func in _default_parameters.iteritems():
-            ids = self.search(cr, SUPERUSER_ID, [('key','=',key)])
+            # force=True skips search and always performs the 'if' body (because ids=False)
+            ids = not force and self.search(cr, SUPERUSER_ID, [('key','=',key)])
             if not ids:
                 self.set_param(cr, SUPERUSER_ID, key, func())
 

From b7a5b07b3e4dc73c316a59dd3e2b0c7a2d884a2e Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 19 Nov 2012 12:11:10 +0100
Subject: [PATCH 17/34] [IMP] Update jQuery to version 1.8.3

bzr revid: fme@openerp.com-20121119111110-rjznfpj6fllfbgqj
---
 addons/web/__openerp__.py                     |   2 +-
 .../{jquery-1.8.2.js => jquery-1.8.3.js}      | 215 ++++++++++--------
 2 files changed, 121 insertions(+), 96 deletions(-)
 rename addons/web/static/lib/jquery/{jquery-1.8.2.js => jquery-1.8.3.js} (97%)

diff --git a/addons/web/__openerp__.py b/addons/web/__openerp__.py
index d83636de0f9..745df64a913 100644
--- a/addons/web/__openerp__.py
+++ b/addons/web/__openerp__.py
@@ -18,7 +18,7 @@ This module provides the core of the OpenERP Web Client.
         "static/lib/datejs/parser.js",
         "static/lib/datejs/sugarpak.js",
         "static/lib/datejs/extras.js",
-        "static/lib/jquery/jquery-1.8.2.js",
+        "static/lib/jquery/jquery-1.8.3.js",
         "static/lib/jquery.MD5/jquery.md5.js",
         "static/lib/jquery.form/jquery.form.js",
         "static/lib/jquery.validate/jquery.validate.js",
diff --git a/addons/web/static/lib/jquery/jquery-1.8.2.js b/addons/web/static/lib/jquery/jquery-1.8.3.js
similarity index 97%
rename from addons/web/static/lib/jquery/jquery-1.8.2.js
rename to addons/web/static/lib/jquery/jquery-1.8.3.js
index 035ab38245b..a86bf797a8b 100644
--- a/addons/web/static/lib/jquery/jquery-1.8.2.js
+++ b/addons/web/static/lib/jquery/jquery-1.8.3.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery JavaScript Library v1.8.2
+ * jQuery JavaScript Library v1.8.3
  * http://jquery.com/
  *
  * Includes Sizzle.js
@@ -9,7 +9,7 @@
  * Released under the MIT license
  * http://jquery.org/license
  *
- * Date: Thu Sep 20 2012 21:13:05 GMT-0400 (Eastern Daylight Time)
+ * Date: Tue Nov 13 2012 08:20:33 GMT-0500 (Eastern Standard Time)
  */
 (function( window, undefined ) {
 var
@@ -186,7 +186,7 @@ jQuery.fn = jQuery.prototype = {
 	selector: "",
 
 	// The current version of jQuery being used
-	jquery: "1.8.2",
+	jquery: "1.8.3",
 
 	// The default length of a jQuery object is 0
 	length: 0,
@@ -999,8 +999,10 @@ jQuery.Callbacks = function( options ) {
 					(function add( args ) {
 						jQuery.each( args, function( _, arg ) {
 							var type = jQuery.type( arg );
-							if ( type === "function" && ( !options.unique || !self.has( arg ) ) ) {
-								list.push( arg );
+							if ( type === "function" ) {
+								if ( !options.unique || !self.has( arg ) ) {
+									list.push( arg );
+								}
 							} else if ( arg && arg.length && type !== "string" ) {
 								// Inspect recursively
 								add( arg );
@@ -1149,14 +1151,7 @@ jQuery.extend({
 			deferred = {};
 
 		// Keep pipe for back-compat
-		//promise.pipe = promise.then;
-		promise.pipe = function() {
-            if (window.console) {
-                console.error && console.error("$.Deferred().pipe() is deprecated. Use .then() instead.");
-                console.trace && console.trace();
-            }
-            return promise.then.apply(this, arguments);
-        };
+		promise.pipe = promise.then;
 
 		// Add list-specific methods
 		jQuery.each( tuples, function( i, tuple ) {
@@ -1260,24 +1255,23 @@ jQuery.support = (function() {
 		clickFn,
 		div = document.createElement("div");
 
-	// Preliminary tests
+	// Setup
 	div.setAttribute( "className", "t" );
 	div.innerHTML = "  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>";
 
+	// Support tests won't run in some limited or non-browser environments
 	all = div.getElementsByTagName("*");
 	a = div.getElementsByTagName("a")[ 0 ];
-	a.style.cssText = "top:1px;float:left;opacity:.5";
-
-	// Can't get basic test support
-	if ( !all || !all.length ) {
+	if ( !all || !a || !all.length ) {
 		return {};
 	}
 
-	// First batch of supports tests
+	// First batch of tests
 	select = document.createElement("select");
 	opt = select.appendChild( document.createElement("option") );
 	input = div.getElementsByTagName("input")[ 0 ];
 
+	a.style.cssText = "top:1px;float:left;opacity:.5";
 	support = {
 		// IE strips leading whitespace when .innerHTML is used
 		leadingWhitespace: ( div.firstChild.nodeType === 3 ),
@@ -1319,7 +1313,7 @@ jQuery.support = (function() {
 		// Test setAttribute on camelCase class. If it works, we need attrFixes when doing get/setAttribute (ie6/7)
 		getSetAttribute: div.className !== "t",
 
-		// Tests for enctype support on a form(#6743)
+		// Tests for enctype support on a form (#6743)
 		enctype: !!document.createElement("form").enctype,
 
 		// Makes sure cloning an html5 element does not cause problems
@@ -2224,26 +2218,25 @@ jQuery.extend({
 		},
 		select: {
 			get: function( elem ) {
-				var value, i, max, option,
-					index = elem.selectedIndex,
-					values = [],
+				var value, option,
 					options = elem.options,
-					one = elem.type === "select-one";
-
-				// Nothing was selected
-				if ( index < 0 ) {
-					return null;
-				}
+					index = elem.selectedIndex,
+					one = elem.type === "select-one" || index < 0,
+					values = one ? null : [],
+					max = one ? index + 1 : options.length,
+					i = index < 0 ?
+						max :
+						one ? index : 0;
 
 				// Loop through all the selected options
-				i = one ? index : 0;
-				max = one ? index + 1 : options.length;
 				for ( ; i < max; i++ ) {
 					option = options[ i ];
 
-					// Don't return options that are disabled or in a disabled optgroup
-					if ( option.selected && (jQuery.support.optDisabled ? !option.disabled : option.getAttribute("disabled") === null) &&
-							(!option.parentNode.disabled || !jQuery.nodeName( option.parentNode, "optgroup" )) ) {
+					// oldIE doesn't update selected after form reset (#2551)
+					if ( ( option.selected || i === index ) &&
+							// Don't return options that are disabled or in a disabled optgroup
+							( jQuery.support.optDisabled ? !option.disabled : option.getAttribute("disabled") === null ) &&
+							( !option.parentNode.disabled || !jQuery.nodeName( option.parentNode, "optgroup" ) ) ) {
 
 						// Get the specific value for the option
 						value = jQuery( option ).val();
@@ -2258,11 +2251,6 @@ jQuery.extend({
 					}
 				}
 
-				// Fixes Bug #2551 -- select.val() broken in IE after form.reset()
-				if ( one && !values.length && options.length ) {
-					return jQuery( options[ index ] ).val();
-				}
-
 				return values;
 			},
 
@@ -3240,7 +3228,7 @@ jQuery.removeEvent = document.removeEventListener ?
 
 		if ( elem.detachEvent ) {
 
-			// #8545, #7054, preventing memory leaks for custom events in IE6-8 –
+			// #8545, #7054, preventing memory leaks for custom events in IE6-8
 			// detachEvent needed property on element, by name of that event, to properly expose it to GC
 			if ( typeof elem[ name ] === "undefined" ) {
 				elem[ name ] = null;
@@ -3732,7 +3720,8 @@ var cachedruns,
 				delete cache[ keys.shift() ];
 			}
 
-			return (cache[ key ] = value);
+			// Retrieve with (key + " ") to avoid collision with native Object.prototype properties (see Issue #157)
+			return (cache[ key + " " ] = value);
 		}, cache );
 	},
 
@@ -4266,13 +4255,13 @@ Expr = Sizzle.selectors = {
 		},
 
 		"CLASS": function( className ) {
-			var pattern = classCache[ expando ][ className ];
-			if ( !pattern ) {
-				pattern = classCache( className, new RegExp("(^|" + whitespace + ")" + className + "(" + whitespace + "|$)") );
-			}
-			return function( elem ) {
-				return pattern.test( elem.className || (typeof elem.getAttribute !== strundefined && elem.getAttribute("class")) || "" );
-			};
+			var pattern = classCache[ expando ][ className + " " ];
+
+			return pattern ||
+				(pattern = new RegExp( "(^|" + whitespace + ")" + className + "(" + whitespace + "|$)" )) &&
+				classCache( className, function( elem ) {
+					return pattern.test( elem.className || (typeof elem.getAttribute !== strundefined && elem.getAttribute("class")) || "" );
+				});
 		},
 
 		"ATTR": function( name, operator, check ) {
@@ -4518,7 +4507,7 @@ Expr = Sizzle.selectors = {
 
 		"focus": function( elem ) {
 			var doc = elem.ownerDocument;
-			return elem === doc.activeElement && (!doc.hasFocus || doc.hasFocus()) && !!(elem.type || elem.href);
+			return elem === doc.activeElement && (!doc.hasFocus || doc.hasFocus()) && !!(elem.type || elem.href || ~elem.tabIndex);
 		},
 
 		"active": function( elem ) {
@@ -4526,11 +4515,11 @@ Expr = Sizzle.selectors = {
 		},
 
 		// Positional types
-		"first": createPositionalPseudo(function( matchIndexes, length, argument ) {
+		"first": createPositionalPseudo(function() {
 			return [ 0 ];
 		}),
 
-		"last": createPositionalPseudo(function( matchIndexes, length, argument ) {
+		"last": createPositionalPseudo(function( matchIndexes, length ) {
 			return [ length - 1 ];
 		}),
 
@@ -4538,14 +4527,14 @@ Expr = Sizzle.selectors = {
 			return [ argument < 0 ? argument + length : argument ];
 		}),
 
-		"even": createPositionalPseudo(function( matchIndexes, length, argument ) {
+		"even": createPositionalPseudo(function( matchIndexes, length ) {
 			for ( var i = 0; i < length; i += 2 ) {
 				matchIndexes.push( i );
 			}
 			return matchIndexes;
 		}),
 
-		"odd": createPositionalPseudo(function( matchIndexes, length, argument ) {
+		"odd": createPositionalPseudo(function( matchIndexes, length ) {
 			for ( var i = 1; i < length; i += 2 ) {
 				matchIndexes.push( i );
 			}
@@ -4666,7 +4655,9 @@ baseHasDuplicate = !hasDuplicate;
 // Document sorting and removing duplicates
 Sizzle.uniqueSort = function( results ) {
 	var elem,
-		i = 1;
+		duplicates = [],
+		i = 1,
+		j = 0;
 
 	hasDuplicate = baseHasDuplicate;
 	results.sort( sortOrder );
@@ -4674,9 +4665,12 @@ Sizzle.uniqueSort = function( results ) {
 	if ( hasDuplicate ) {
 		for ( ; (elem = results[i]); i++ ) {
 			if ( elem === results[ i - 1 ] ) {
-				results.splice( i--, 1 );
+				j = duplicates.push( i );
 			}
 		}
+		while ( j-- ) {
+			results.splice( duplicates[ j ], 1 );
+		}
 	}
 
 	return results;
@@ -4687,8 +4681,9 @@ Sizzle.error = function( msg ) {
 };
 
 function tokenize( selector, parseOnly ) {
-	var matched, match, tokens, type, soFar, groups, preFilters,
-		cached = tokenCache[ expando ][ selector ];
+	var matched, match, tokens, type,
+		soFar, groups, preFilters,
+		cached = tokenCache[ expando ][ selector + " " ];
 
 	if ( cached ) {
 		return parseOnly ? 0 : cached.slice( 0 );
@@ -4703,7 +4698,8 @@ function tokenize( selector, parseOnly ) {
 		// Comma and first run
 		if ( !matched || (match = rcomma.exec( soFar )) ) {
 			if ( match ) {
-				soFar = soFar.slice( match[0].length );
+				// Don't consume trailing commas as valid
+				soFar = soFar.slice( match[0].length ) || soFar;
 			}
 			groups.push( tokens = [] );
 		}
@@ -4722,8 +4718,7 @@ function tokenize( selector, parseOnly ) {
 		// Filters
 		for ( type in Expr.filter ) {
 			if ( (match = matchExpr[ type ].exec( soFar )) && (!preFilters[ type ] ||
-				// The last two arguments here are (context, xml) for backCompat
-				(match = preFilters[ type ]( match, document, true ))) ) {
+				(match = preFilters[ type ]( match ))) ) {
 
 				tokens.push( matched = new Token( match.shift() ) );
 				soFar = soFar.slice( matched.length );
@@ -4843,18 +4838,13 @@ function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postS
 		postFinder = setMatcher( postFinder, postSelector );
 	}
 	return markFunction(function( seed, results, context, xml ) {
-		// Positional selectors apply to seed elements, so it is invalid to follow them with relative ones
-		if ( seed && postFinder ) {
-			return;
-		}
-
-		var i, elem, postFilterIn,
+		var temp, i, elem,
 			preMap = [],
 			postMap = [],
 			preexisting = results.length,
 
 			// Get initial elements from seed or context
-			elems = seed || multipleContexts( selector || "*", context.nodeType ? [ context ] : context, [], seed ),
+			elems = seed || multipleContexts( selector || "*", context.nodeType ? [ context ] : context, [] ),
 
 			// Prefilter to get matcher input, preserving a map for seed-results synchronization
 			matcherIn = preFilter && ( seed || !selector ) ?
@@ -4879,27 +4869,45 @@ function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postS
 
 		// Apply postFilter
 		if ( postFilter ) {
-			postFilterIn = condense( matcherOut, postMap );
-			postFilter( postFilterIn, [], context, xml );
+			temp = condense( matcherOut, postMap );
+			postFilter( temp, [], context, xml );
 
 			// Un-match failing elements by moving them back to matcherIn
-			i = postFilterIn.length;
+			i = temp.length;
 			while ( i-- ) {
-				if ( (elem = postFilterIn[i]) ) {
+				if ( (elem = temp[i]) ) {
 					matcherOut[ postMap[i] ] = !(matcherIn[ postMap[i] ] = elem);
 				}
 			}
 		}
 
-		// Keep seed and results synchronized
 		if ( seed ) {
-			// Ignore postFinder because it can't coexist with seed
-			i = preFilter && matcherOut.length;
-			while ( i-- ) {
-				if ( (elem = matcherOut[i]) ) {
-					seed[ preMap[i] ] = !(results[ preMap[i] ] = elem);
+			if ( postFinder || preFilter ) {
+				if ( postFinder ) {
+					// Get the final matcherOut by condensing this intermediate into postFinder contexts
+					temp = [];
+					i = matcherOut.length;
+					while ( i-- ) {
+						if ( (elem = matcherOut[i]) ) {
+							// Restore matcherIn since elem is not yet a final match
+							temp.push( (matcherIn[i] = elem) );
+						}
+					}
+					postFinder( null, (matcherOut = []), temp, xml );
+				}
+
+				// Move matched elements from seed to results to keep them synchronized
+				i = matcherOut.length;
+				while ( i-- ) {
+					if ( (elem = matcherOut[i]) &&
+						(temp = postFinder ? indexOf.call( seed, elem ) : preMap[i]) > -1 ) {
+
+						seed[temp] = !(results[temp] = elem);
+					}
 				}
 			}
+
+		// Add elements to results, through postFinder if defined
 		} else {
 			matcherOut = condense(
 				matcherOut === results ?
@@ -4940,7 +4948,6 @@ function matcherFromTokens( tokens ) {
 		if ( (matcher = Expr.relative[ tokens[i].type ]) ) {
 			matchers = [ addCombinator( elementMatcher( matchers ), matcher ) ];
 		} else {
-			// The concatenated values are (context, xml) for backCompat
 			matcher = Expr.filter[ tokens[i].type ].apply( null, tokens[i].matches );
 
 			// Return special upon seeing a positional matcher
@@ -5069,7 +5076,7 @@ compile = Sizzle.compile = function( selector, group /* Internal Use Only */ ) {
 	var i,
 		setMatchers = [],
 		elementMatchers = [],
-		cached = compilerCache[ expando ][ selector ];
+		cached = compilerCache[ expando ][ selector + " " ];
 
 	if ( !cached ) {
 		// Generate a function of recursive functions that can be used to check each element
@@ -5092,11 +5099,11 @@ compile = Sizzle.compile = function( selector, group /* Internal Use Only */ ) {
 	return cached;
 };
 
-function multipleContexts( selector, contexts, results, seed ) {
+function multipleContexts( selector, contexts, results ) {
 	var i = 0,
 		len = contexts.length;
 	for ( ; i < len; i++ ) {
-		Sizzle( selector, contexts[i], results, seed );
+		Sizzle( selector, contexts[i], results );
 	}
 	return results;
 }
@@ -5174,15 +5181,14 @@ if ( document.querySelectorAll ) {
 			rescape = /'|\\/g,
 			rattributeQuotes = /\=[\x20\t\r\n\f]*([^'"\]]*)[\x20\t\r\n\f]*\]/g,
 
-			// qSa(:focus) reports false when true (Chrome 21),
+			// qSa(:focus) reports false when true (Chrome 21), no need to also add to buggyMatches since matches checks buggyQSA
 			// A support test would require too much code (would include document ready)
-			rbuggyQSA = [":focus"],
+			rbuggyQSA = [ ":focus" ],
 
-			// matchesSelector(:focus) reports false when true (Chrome 21),
 			// matchesSelector(:active) reports false when true (IE9/Opera 11.5)
 			// A support test would require too much code (would include document ready)
 			// just skip matchesSelector for :active
-			rbuggyMatches = [ ":active", ":focus" ],
+			rbuggyMatches = [ ":active" ],
 			matches = docElem.matchesSelector ||
 				docElem.mozMatchesSelector ||
 				docElem.webkitMatchesSelector ||
@@ -5236,7 +5242,7 @@ if ( document.querySelectorAll ) {
 			// Only use querySelectorAll when not filtering,
 			// when this is not xml,
 			// and when no QSA bugs apply
-			if ( !seed && !xml && (!rbuggyQSA || !rbuggyQSA.test( selector )) ) {
+			if ( !seed && !xml && !rbuggyQSA.test( selector ) ) {
 				var groups, i,
 					old = true,
 					nid = expando,
@@ -5305,7 +5311,7 @@ if ( document.querySelectorAll ) {
 				expr = expr.replace( rattributeQuotes, "='$1']" );
 
 				// rbuggyMatches always contains :active, so no need for an existence check
-				if ( !isXML( elem ) && !rbuggyMatches.test( expr ) && (!rbuggyQSA || !rbuggyQSA.test( expr )) ) {
+				if ( !isXML( elem ) && !rbuggyMatches.test( expr ) && !rbuggyQSA.test( expr ) ) {
 					try {
 						var ret = matches.call( elem, expr );
 
@@ -6540,7 +6546,7 @@ var curCSS, iframe, iframeDoc,
 	rnumsplit = new RegExp( "^(" + core_pnum + ")(.*)$", "i" ),
 	rnumnonpx = new RegExp( "^(" + core_pnum + ")(?!px)[a-z%]+$", "i" ),
 	rrelNum = new RegExp( "^([-+])=(" + core_pnum + ")", "i" ),
-	elemdisplay = {},
+	elemdisplay = { BODY: "block" },
 
 	cssShow = { position: "absolute", visibility: "hidden", display: "block" },
 	cssNormalTransform = {
@@ -6821,7 +6827,9 @@ if ( window.getComputedStyle ) {
 
 		if ( computed ) {
 
-			ret = computed[ name ];
+			// getPropertyValue is only needed for .css('filter') in IE9, see #12537
+			ret = computed.getPropertyValue( name ) || computed[ name ];
+
 			if ( ret === "" && !jQuery.contains( elem.ownerDocument, elem ) ) {
 				ret = jQuery.style( elem, name );
 			}
@@ -7850,9 +7858,12 @@ jQuery.extend({
 
 		// A cross-domain request is in order when we have a protocol:host:port mismatch
 		if ( s.crossDomain == null ) {
-			parts = rurl.exec( s.url.toLowerCase() ) || false;
-			s.crossDomain = parts && ( parts.join(":") + ( parts[ 3 ] ? "" : parts[ 1 ] === "http:" ? 80 : 443 ) ) !==
-				( ajaxLocParts.join(":") + ( ajaxLocParts[ 3 ] ? "" : ajaxLocParts[ 1 ] === "http:" ? 80 : 443 ) );
+			parts = rurl.exec( s.url.toLowerCase() );
+			s.crossDomain = !!( parts &&
+				( parts[ 1 ] !== ajaxLocParts[ 1 ] || parts[ 2 ] !== ajaxLocParts[ 2 ] ||
+					( parts[ 3 ] || ( parts[ 1 ] === "http:" ? 80 : 443 ) ) !=
+						( ajaxLocParts[ 3 ] || ( ajaxLocParts[ 1 ] === "http:" ? 80 : 443 ) ) )
+			);
 		}
 
 		// Convert data if not already a string
@@ -8471,7 +8482,7 @@ if ( jQuery.support.ajax ) {
 									// on any attempt to access responseText (#11426)
 									try {
 										responses.text = xhr.responseText;
-									} catch( _ ) {
+									} catch( e ) {
 									}
 
 									// Firefox throws an exception when accessing
@@ -8624,7 +8635,9 @@ function Animation( elem, properties, options ) {
 		tick = function() {
 			var currentTime = fxNow || createFxNow(),
 				remaining = Math.max( 0, animation.startTime + animation.duration - currentTime ),
-				percent = 1 - ( remaining / animation.duration || 0 ),
+				// archaic crash bug won't allow us to use 1 - ( 0.5 || 0 ) (#12497)
+				temp = remaining / animation.duration || 0,
+				percent = 1 - temp,
 				index = 0,
 				length = animation.tweens.length;
 
@@ -8776,7 +8789,7 @@ jQuery.Animation = jQuery.extend( Animation, {
 });
 
 function defaultPrefilter( elem, props, opts ) {
-	var index, prop, value, length, dataShow, tween, hooks, oldfire,
+	var index, prop, value, length, dataShow, toggle, tween, hooks, oldfire,
 		anim = this,
 		style = elem.style,
 		orig = {},
@@ -8850,6 +8863,7 @@ function defaultPrefilter( elem, props, opts ) {
 		value = props[ index ];
 		if ( rfxtypes.exec( value ) ) {
 			delete props[ index ];
+			toggle = toggle || value === "toggle";
 			if ( value === ( hidden ? "hide" : "show" ) ) {
 				continue;
 			}
@@ -8860,6 +8874,14 @@ function defaultPrefilter( elem, props, opts ) {
 	length = handled.length;
 	if ( length ) {
 		dataShow = jQuery._data( elem, "fxshow" ) || jQuery._data( elem, "fxshow", {} );
+		if ( "hidden" in dataShow ) {
+			hidden = dataShow.hidden;
+		}
+
+		// store state if its toggle - enables .stop().toggle() to "reverse"
+		if ( toggle ) {
+			dataShow.hidden = !hidden;
+		}
 		if ( hidden ) {
 			jQuery( elem ).show();
 		} else {
@@ -9156,6 +9178,8 @@ jQuery.fx.tick = function() {
 		timers = jQuery.timers,
 		i = 0;
 
+	fxNow = jQuery.now();
+
 	for ( ; i < timers.length; i++ ) {
 		timer = timers[ i ];
 		// Checks the timer has not already been removed
@@ -9167,6 +9191,7 @@ jQuery.fx.tick = function() {
 	if ( !timers.length ) {
 		jQuery.fx.stop();
 	}
+	fxNow = undefined;
 };
 
 jQuery.fx.timer = function( timer ) {

From 09a2f24398ce8b933ae052a763196f2ab46bfa14 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 19 Nov 2012 12:11:30 +0100
Subject: [PATCH 18/34] [FIX] push_state() broken after closing a wizard

bzr revid: fme@openerp.com-20121119111130-7xubnqvvhp3q1jds
---
 addons/web/static/src/js/views.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 641821152b2..6fbbd3199ad 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -26,6 +26,7 @@ instance.web.ActionManager = instance.web.Widget.extend({
         if (this.dialog) {
             this.dialog.destroy();
         }
+        this.dialog = null;
     },
     /**
      * Add a new item to the breadcrumb

From f35df2fdc8212edbc092c1a4e6044a13226ac1d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 19 Nov 2012 14:21:41 +0100
Subject: [PATCH 19/34] [FIX] crm: fixed a call to command_re, now in
 tools.mail.

bzr revid: tde@openerp.com-20121119132141-6zikqzuxlxap550f
---
 addons/crm/crm_lead.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 547b25af27c..569d69aa260 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -833,7 +833,7 @@ class crm_lead(base_stage, format_address, osv.osv):
         }
         for line in msg.get('body', '').split('\n'):
             line = line.strip()
-            res = tools.misc.command_re.match(line)
+            res = tools.command_re.match(line)
             if res and maps.get(res.group(1).lower()):
                 key = maps.get(res.group(1).lower())
                 update_vals[key] = res.group(2).lower()

From 62af1f1883ff85fa542e0c7e6937ab12e0de1679 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 19 Nov 2012 14:25:09 +0100
Subject: [PATCH 20/34] [FIX] addons: fixed calls to command_re.

bzr revid: tde@openerp.com-20121119132509-dyes929xalp0pgcj
---
 addons/crm_claim/crm_claim.py           | 2 +-
 addons/crm_helpdesk/crm_helpdesk.py     | 2 +-
 addons/hr_recruitment/hr_recruitment.py | 2 +-
 addons/project/project.py               | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py
index 8308e5420d0..70dcc18baf7 100644
--- a/addons/crm_claim/crm_claim.py
+++ b/addons/crm_claim/crm_claim.py
@@ -224,7 +224,7 @@ class crm_claim(base_stage, osv.osv):
         }
         for line in msg['body'].split('\n'):
             line = line.strip()
-            res = tools.misc.command_re.match(line)
+            res = tools.command_re.match(line)
             if res and maps.get(res.group(1).lower()):
                 key = maps.get(res.group(1).lower())
                 update_vals[key] = res.group(2).lower()
diff --git a/addons/crm_helpdesk/crm_helpdesk.py b/addons/crm_helpdesk/crm_helpdesk.py
index 276dd0b4b49..373cf53aed6 100644
--- a/addons/crm_helpdesk/crm_helpdesk.py
+++ b/addons/crm_helpdesk/crm_helpdesk.py
@@ -133,7 +133,7 @@ class crm_helpdesk(base_state, base_stage, osv.osv):
         }
         for line in msg['body'].split('\n'):
             line = line.strip()
-            res = tools.misc.command_re.match(line)
+            res = tools.command_re.match(line)
             if res and maps.get(res.group(1).lower()):
                 key = maps.get(res.group(1).lower())
                 update_vals[key] = res.group(2).lower()
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 155f20daf4d..4c0f0a2ddaf 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -373,7 +373,7 @@ class hr_applicant(base_stage, osv.Model):
         }
         for line in msg.get('body', '').split('\n'):
             line = line.strip()
-            res = tools.misc.command_re.match(line)
+            res = tools.command_re.match(line)
             if res and maps.get(res.group(1).lower(), False):
                 key = maps.get(res.group(1).lower())
                 update_vals[key] = res.group(2).lower()
diff --git a/addons/project/project.py b/addons/project/project.py
index 9c28fadeab9..68122d1a614 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -1247,7 +1247,7 @@ class task(base_stage, osv.osv):
         }
         for line in msg['body'].split('\n'):
             line = line.strip()
-            res = tools.misc.command_re.match(line)
+            res = tools.command_re.match(line)
             if res:
                 match = res.group(1).lower()
                 field = maps.get(match)

From 4820730cd6ab008e17c0bf18639f924ac061da53 Mon Sep 17 00:00:00 2001
From: Arnaud Pineux <api@openerp.com>
Date: Mon, 19 Nov 2012 14:56:28 +0100
Subject: [PATCH 21/34] [IMP] demo data & groups

bzr revid: api@openerp.com-20121119135628-krq8rle10si51vkh
---
 addons/lunch/lunch_demo.xml              | 36 ++++++++++++++++++------
 addons/lunch/security/lunch_security.xml | 12 ++++++--
 2 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/addons/lunch/lunch_demo.xml b/addons/lunch/lunch_demo.xml
index 9e92291b62d..7488208fd42 100644
--- a/addons/lunch/lunch_demo.xml
+++ b/addons/lunch/lunch_demo.xml
@@ -100,28 +100,28 @@
         </record>
 
         <record model="lunch.order" id="order_1">
-            <field name="user_id" ref="base.user_root"/>
+            <field name="user_id" ref="base.user_demo"/>
             <field name="date" eval="time.strftime('2012-10-23')"/>
             <field name="order_line_ids" eval="[]"/>
             <field name="state">new</field>
         </record>
 
         <record model="lunch.order" id="order_2">
-            <field name="user_id" ref="base.user_root"/>
+            <field name="user_id" ref="base.user_demo"/>
             <field name="date" eval="time.strftime('2012-10-22')"/>
             <field name="order_line_ids" eval="[]"/>
             <field name="state">confirmed</field>
         </record>
 
         <record model="lunch.order" id="order_3">
-            <field name="user_id" ref="base.user_root"/>
+            <field name="user_id" ref="base.user_demo"/>
             <field name="date" eval="time.strftime('2012-10-24')"/>
             <field name="order_line_ids" eval="[]"/>
-            <field name="state">cancelled</field>
+            <field name="state">partially</field>
         </record>
 
         <record model="lunch.order.line" id="order_line_1">
-            <field name="user_id" ref="base.user_root"/>
+            <field name="user_id" ref="base.user_demo"/>
             <field name="product_id" ref="product_Bolognese"/>
             <field name="date" eval="time.strftime('2012-10-23')"/>
             <field name="state">new</field>
@@ -131,7 +131,7 @@
         </record>
 
         <record model="lunch.order.line" id="order_line_2">
-            <field name="user_id" ref="base.user_root"/>
+            <field name="user_id" ref="base.user_demo"/>
             <field name="product_id" ref="product_italiana"/>
             <field name="date" eval="time.strftime('2012-10-22')"/>
             <field name="state">confirmed</field>
@@ -141,7 +141,7 @@
         </record>
 
         <record model="lunch.order.line" id="order_line_3">
-            <field name="user_id" ref="base.user_root"/>
+            <field name="user_id" ref="base.user_demo"/>
             <field name="product_id" ref="product_gouda"/>
             <field name="date" eval="time.strftime('2012-10-24')"/>
             <field name="state">cancelled</field>
@@ -150,9 +150,18 @@
             <field name="order_id" ref="order_3"/>
         </record>
 
+        <record model="lunch.order.line" id="order_line_4">
+            <field name="user_id" ref="base.user_demo"/>
+            <field name="product_id" ref="product_chicken_curry"/>
+            <field name="date" eval="time.strftime('2012-10-24')"/>
+            <field name="state">confirmed</field>
+            <field name="supplier" ref="partner_coin_gourmand"/>
+            <field name="note">+Salad +Tomatoes +Eggs</field>
+            <field name="order_id" ref="order_3"/>
+        </record>
     
         <record model="lunch.cashmove" id="cashmove_1">
-            <field name="user_id" ref="base.user_root"/>
+            <field name="user_id" ref="base.user_demo"/>
             <field name="date" eval="time.strftime('2012-10-23')"/>
             <field name="description">Pizza Italiana</field>
             <field name="amount">-7.40</field>
@@ -161,7 +170,16 @@
         </record>
 
         <record model="lunch.cashmove" id="cashmove_2">
-            <field name="user_id" ref="base.user_root"/>
+            <field name="user_id" ref="base.user_demo"/>
+            <field name="date" eval="time.strftime('2012-10-24')"/>
+            <field name="description">Chicken curry</field>
+            <field name="amount">-2.60</field>
+            <field name="order_id" ref="order_3"/>
+            <field name="state">order</field>
+        </record>
+
+        <record model="lunch.cashmove" id="cashmove_3">
+            <field name="user_id" ref="base.user_demo"/>
             <field name="date" eval="time.strftime('2012-10-24')"/>
             <field name="description">Payment: 5 lunch tickets (6€)</field>
             <field name="amount">30</field>
diff --git a/addons/lunch/security/lunch_security.xml b/addons/lunch/security/lunch_security.xml
index 75ab0836b12..af1f0317b4e 100644
--- a/addons/lunch/security/lunch_security.xml
+++ b/addons/lunch/security/lunch_security.xml
@@ -1,11 +1,19 @@
 <?xml version="1.0" ?>
 <openerp>
     <data>
+        <record model="ir.module.category" id="module_lunch_category">
+            <field name="name">Lunch</field>
+            <field name="description">Helps you handle your lunch needs, if you are a manager you will be able to create new products, cashmoves and to confirm or cancel orders.</field>
+            <field name="sequence">16</field>
+        </record>
         <record id="group_lunch_manager" model="res.groups">
-            <field name="name">Lunch / Manager</field>
+            <field name="name">Manager</field>
+            <field name="implied_ids" eval="[(4, ref('group_lunch_user'))]"/>
+            <field name="category_id" ref="module_lunch_category"/>
         </record>
         <record id="group_lunch_user" model="res.groups">
-            <field name="name">Lunch / User</field>
+            <field name="name">User</field>
+            <field name="category_id" ref="module_lunch_category"/>
         </record>
     </data>
 </openerp>

From 848679322a57e6a49c6082d0bbafb1211bbafdca Mon Sep 17 00:00:00 2001
From: Arnaud Pineux <api@openerp.com>
Date: Mon, 19 Nov 2012 15:08:01 +0100
Subject: [PATCH 22/34] [IMP] demo data & groups -> refactor

bzr revid: api@openerp.com-20121119140801-yxj936dhu1eapicl
---
 addons/lunch/security/lunch_security.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/lunch/security/lunch_security.xml b/addons/lunch/security/lunch_security.xml
index af1f0317b4e..e06b32311cc 100644
--- a/addons/lunch/security/lunch_security.xml
+++ b/addons/lunch/security/lunch_security.xml
@@ -8,7 +8,7 @@
         </record>
         <record id="group_lunch_manager" model="res.groups">
             <field name="name">Manager</field>
-            <field name="implied_ids" eval="[(4, ref('group_lunch_user'))]"/>
+            <field name="implied_ids" eval="[(4, [ref('group_lunch_user')])]"/>
             <field name="category_id" ref="module_lunch_category"/>
         </record>
         <record id="group_lunch_user" model="res.groups">

From 3bc9d36b774abd706add6515e6e04d93b0e5eda0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 19 Nov 2012 15:17:40 +0100
Subject: [PATCH 23/34] [FIX] message_route: when replying to a message, use
 its model and res_id, never lost.

bzr revid: tde@openerp.com-20121119141740-tjlp1uy4mq4lrg48
---
 addons/mail/mail_thread.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index ee1a015396b..a809f7e8e2e 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -341,7 +341,7 @@ class mail_thread(osv.AbstractModel):
             message = self.pool.get('mail.message').browse(cr, uid, message_ids[0], context=context)
             _logger.debug('Routing mail with Message-Id %s: direct reply to a private message: %s, custom_values: %s, uid: %s',
                             message_id, message.id, custom_values, uid)
-            return [(False, 0, custom_values, uid)]
+            return [(message.model, message.res_id, custom_values, uid)]
 
         # 2. Look for a matching mail.alias entry
         # Delivered-To is a safe bet in most modern MTAs, but we have to fallback on To + Cc values

From 5c6976e2a3a95c898eb0d05e86693efe5f7f962c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 19 Nov 2012 15:20:59 +0100
Subject: [PATCH 24/34] [FIX] hr_recruitment: fixed message_update, cleaned a
 bit the code.

bzr revid: tde@openerp.com-20121119142059-l4cnkyhlrg2vt1b9
---
 addons/hr_recruitment/hr_recruitment.py | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 4c0f0a2ddaf..88a750bbabf 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -356,7 +356,8 @@ class hr_applicant(base_stage, osv.Model):
         """
         if isinstance(ids, (str, int, long)):
             ids = [ids]
-        if update_vals is None: vals = {}
+        if update_vals is None:
+            update_vals = {}
 
         update_vals.update({
             'description': msg.get('body'),
@@ -378,7 +379,7 @@ class hr_applicant(base_stage, osv.Model):
                 key = maps.get(res.group(1).lower())
                 update_vals[key] = res.group(2).lower()
 
-        return super(hr_applicant, self).message_update(cr, uids, ids, update_vals=update_vals, context=context)
+        return super(hr_applicant, self).message_update(cr, uid, ids, msg, update_vals=update_vals, context=context)
 
     def create(self, cr, uid, vals, context=None):
         obj_id = super(hr_applicant, self).create(cr, uid, vals, context=context)
@@ -420,7 +421,7 @@ class hr_applicant(base_stage, osv.Model):
                 self.write(cr, uid, [applicant.id], {'emp_id': emp_id}, context=context)
                 self.case_close(cr, uid, [applicant.id], context)
             else:
-                raise osv.except_osv(_('Warning!'),_('You must define Applied Job for this applicant.'))
+                raise osv.except_osv(_('Warning!'), _('You must define Applied Job for this applicant.'))
 
         action_model, action_id = model_data.get_object_reference(cr, uid, 'hr', 'open_view_employee_list')
         dict_act_window = act_window.read(cr, uid, action_id, [])
@@ -433,13 +434,13 @@ class hr_applicant(base_stage, osv.Model):
         """Overrides cancel for crm_case for setting probability
         """
         res = super(hr_applicant, self).case_cancel(cr, uid, ids, context)
-        self.write(cr, uid, ids, {'probability' : 0.0})
+        self.write(cr, uid, ids, {'probability': 0.0})
         return res
 
     def case_pending(self, cr, uid, ids, context=None):
         """Marks case as pending"""
         res = super(hr_applicant, self).case_pending(cr, uid, ids, context)
-        self.write(cr, uid, ids, {'probability' : 0.0})
+        self.write(cr, uid, ids, {'probability': 0.0})
         return res
 
     def case_reset(self, cr, uid, ids, context=None):
@@ -452,7 +453,7 @@ class hr_applicant(base_stage, osv.Model):
     def set_priority(self, cr, uid, ids, priority, *args):
         """Set applicant priority
         """
-        return self.write(cr, uid, ids, {'priority' : priority})
+        return self.write(cr, uid, ids, {'priority': priority})
 
     def set_high_priority(self, cr, uid, ids, *args):
         """Set applicant priority to high
@@ -475,7 +476,7 @@ class hr_applicant(base_stage, osv.Model):
         return self.message_post(cr, uid, ids, body=_("Stage changed to <b>%s</b>.") % (stage_name), context=context)
 
     def case_get_note_msg_prefix(self, cr, uid, id, context=None):
-		return 'Applicant'
+        return 'Applicant'
 
     def case_open_send_note(self, cr, uid, ids, context=None):
         message = _("Applicant has been set <b>in progress</b>.")
@@ -507,7 +508,11 @@ class hr_applicant(base_stage, osv.Model):
         message = _("Applicant has been <b>created</b>.")
         for applicant in self.browse(cr, uid, ids, context=context):
             if applicant.job_id:
-                self.pool.get('hr.job').message_post(cr, uid, [applicant.job_id.id], body=message, subtype="hr_recruitment.mt_applicant_new", context=context)
+                if applicant.partner_name:
+                    job_message = _('Applicant %s <b>created</b>.') % applicant.partner_name
+                else:
+                    job_message = message
+                self.pool.get('hr.job').message_post(cr, uid, [applicant.job_id.id], body=job_message, subtype="hr_recruitment.mt_applicant_new", context=context)
         return self.message_post(cr, uid, ids, body=message, context=context)
 
 class hr_job(osv.osv):

From a3a26dc75587ab1495d6dbb06d71d42b5884ef80 Mon Sep 17 00:00:00 2001
From: Arnaud Pineux <api@openerp.com>
Date: Mon, 19 Nov 2012 15:21:46 +0100
Subject: [PATCH 25/34] [IMP] demo data & groups -> refactor

bzr revid: api@openerp.com-20121119142146-33aix5tk6bldizu9
---
 addons/lunch/security/lunch_security.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/lunch/security/lunch_security.xml b/addons/lunch/security/lunch_security.xml
index e06b32311cc..654f844c876 100644
--- a/addons/lunch/security/lunch_security.xml
+++ b/addons/lunch/security/lunch_security.xml
@@ -6,14 +6,14 @@
             <field name="description">Helps you handle your lunch needs, if you are a manager you will be able to create new products, cashmoves and to confirm or cancel orders.</field>
             <field name="sequence">16</field>
         </record>
-        <record id="group_lunch_manager" model="res.groups">
-            <field name="name">Manager</field>
-            <field name="implied_ids" eval="[(4, [ref('group_lunch_user')])]"/>
-            <field name="category_id" ref="module_lunch_category"/>
-        </record>
         <record id="group_lunch_user" model="res.groups">
             <field name="name">User</field>
             <field name="category_id" ref="module_lunch_category"/>
         </record>
+        <record id="group_lunch_manager" model="res.groups">
+            <field name="name">Manager</field>
+            <field name="implied_ids" eval="[(4, ref('group_lunch_user'))]"/>
+            <field name="category_id" ref="module_lunch_category"/>
+        </record>
     </data>
 </openerp>

From 9180d9702b11fe0fd6d228037826ccbaa9a31fc5 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 19 Nov 2012 15:37:19 +0100
Subject: [PATCH 26/34] [FIX] Don't leave button@type=submit in IE

bzr revid: fme@openerp.com-20121119143719-1uu4s71jyudfi5u3
---
 addons/web/static/src/js/view_form.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index dad622fb7f9..c784b169d12 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1215,7 +1215,7 @@ instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInt
 
         var doc = $.parseXML('<div class="oe_form">' + xml + '</div>');
         $('button', doc).each(function() {
-            $(this).attr('data-button-type', $(this).attr('type'));
+            $(this).attr('data-button-type', $(this).attr('type')).attr('type', 'button');
         });
         xml = instance.web.xml_to_str(doc);
         return $(xml);

From ad11004a328f045a84284be133eee680f63cc2f2 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 19 Nov 2012 15:39:12 +0100
Subject: [PATCH 27/34] [ADD] refs to server doc, intersphinx doesn't allow
 linking documents across docs

bzr revid: xmo@openerp.com-20121119143912-z3152u20zxjizzto
---
 doc/03_module_dev.rst    | 2 ++
 doc/03_module_dev_01.rst | 2 ++
 doc/03_module_dev_02.rst | 2 ++
 doc/03_module_dev_03.rst | 2 ++
 doc/03_module_dev_04.rst | 2 ++
 doc/03_module_dev_05.rst | 1 +
 doc/03_module_dev_06.rst | 1 +
 doc/04_security.rst      | 2 ++
 8 files changed, 14 insertions(+)

diff --git a/doc/03_module_dev.rst b/doc/03_module_dev.rst
index 033ba4b9267..72f035be4d0 100644
--- a/doc/03_module_dev.rst
+++ b/doc/03_module_dev.rst
@@ -1,3 +1,5 @@
+.. _module-dev:
+
 =======
 Modules
 =======
diff --git a/doc/03_module_dev_01.rst b/doc/03_module_dev_01.rst
index 4750a947da3..0fbca9d14b4 100644
--- a/doc/03_module_dev_01.rst
+++ b/doc/03_module_dev_01.rst
@@ -1,3 +1,5 @@
+.. _module-dev-structure:
+
 Module structure
 ================
 
diff --git a/doc/03_module_dev_02.rst b/doc/03_module_dev_02.rst
index c7075a8f7ae..9c00df6223e 100644
--- a/doc/03_module_dev_02.rst
+++ b/doc/03_module_dev_02.rst
@@ -1,3 +1,5 @@
+.. _module-dev-api:
+
 Objects, Fields and Methods
 ===========================
 
diff --git a/doc/03_module_dev_03.rst b/doc/03_module_dev_03.rst
index d2a1875b70c..40921eebcb5 100644
--- a/doc/03_module_dev_03.rst
+++ b/doc/03_module_dev_03.rst
@@ -1,3 +1,5 @@
+.. _module-dev-views:
+
 Views and Events
 ================
 
diff --git a/doc/03_module_dev_04.rst b/doc/03_module_dev_04.rst
index 90442de84ba..497830ca0e2 100644
--- a/doc/03_module_dev_04.rst
+++ b/doc/03_module_dev_04.rst
@@ -1,3 +1,5 @@
+.. _module-dev-actions:
+
 =================
 Menus and Actions 
 =================
diff --git a/doc/03_module_dev_05.rst b/doc/03_module_dev_05.rst
index 686fb6fe099..3bddecf9140 100644
--- a/doc/03_module_dev_05.rst
+++ b/doc/03_module_dev_05.rst
@@ -1,3 +1,4 @@
+.. _module-dev-example:
 
 ==========================
 Example of module creation
diff --git a/doc/03_module_dev_06.rst b/doc/03_module_dev_06.rst
index ebb97ea9010..f6771bbabed 100644
--- a/doc/03_module_dev_06.rst
+++ b/doc/03_module_dev_06.rst
@@ -1,3 +1,4 @@
+.. _module-dev-versioning:
 .. _module_versioning:
 
 =================
diff --git a/doc/04_security.rst b/doc/04_security.rst
index b1f9f565384..99d7fd3d17f 100644
--- a/doc/04_security.rst
+++ b/doc/04_security.rst
@@ -1,3 +1,5 @@
+.. _security:
+
 ==================================
 Security in OpenERP: users, groups
 ==================================

From 475e74734af78291b3912e265d86a7c03add32b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 19 Nov 2012 15:42:36 +0100
Subject: [PATCH 28/34] [REV] hr_recruitment: reverted improvement of message,
 not the purpose of this branch.

bzr revid: tde@openerp.com-20121119144236-he70h0bptnd2pbdo
---
 addons/hr_recruitment/hr_recruitment.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 88a750bbabf..de1539da55a 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -508,11 +508,7 @@ class hr_applicant(base_stage, osv.Model):
         message = _("Applicant has been <b>created</b>.")
         for applicant in self.browse(cr, uid, ids, context=context):
             if applicant.job_id:
-                if applicant.partner_name:
-                    job_message = _('Applicant %s <b>created</b>.') % applicant.partner_name
-                else:
-                    job_message = message
-                self.pool.get('hr.job').message_post(cr, uid, [applicant.job_id.id], body=job_message, subtype="hr_recruitment.mt_applicant_new", context=context)
+                self.pool.get('hr.job').message_post(cr, uid, [applicant.job_id.id], body=message, subtype="hr_recruitment.mt_applicant_new", context=context)
         return self.message_post(cr, uid, ids, body=message, context=context)
 
 class hr_job(osv.osv):

From 1a8acb73b39494b726f04fc559e45f27d851d5b6 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 19 Nov 2012 18:00:42 +0100
Subject: [PATCH 29/34] [IMP] monodb bootstrap: support @db query string param
 to force monodb mode

Allows a.o. to let auth_signup URLs works even if multiple DBs
exist

bzr revid: odo@openerp.com-20121119170042-iprc0u159qpf8ll2
---
 addons/web/controllers/main.py     | 45 +++++++++++++++---------------
 addons/web/static/src/js/chrome.js | 18 ++++++++----
 2 files changed, 35 insertions(+), 28 deletions(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index fb7b45a4056..8b043dc2cb0 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -82,7 +82,6 @@ def rjsmin(script):
     return result
 
 def db_list(req):
-    dbs = []
     proxy = req.session.proxy("db")
     dbs = proxy.list()
     h = req.httprequest.environ['HTTP_HOST'].split(':')[0]
@@ -92,7 +91,7 @@ def db_list(req):
     return dbs
 
 def db_monodb(req):
-    # if only one db is listed returns it else return False
+    # if only one db exists, return it else return False
     try:
         dbs = db_list(req)
         if len(dbs) == 1:
@@ -189,14 +188,14 @@ def module_installed_bypass_session(dbname):
     sorted_modules = module_topological_sort(modules)
     return sorted_modules
 
-def module_boot(req):
+def module_boot(req, db=None):
     server_wide_modules = openerp.conf.server_wide_modules or ['web']
     serverside = []
     dbside = []
     for i in server_wide_modules:
         if i in openerpweb.addons_manifest:
             serverside.append(i)
-    monodb = db_monodb(req)
+    monodb = db or db_monodb(req)
     if monodb:
         dbside = module_installed_bypass_session(monodb)
         dbside = [i for i in dbside if i not in serverside]
@@ -273,9 +272,9 @@ def fs2web(path):
     """convert FS path into web path"""
     return '/'.join(path.split(os.path.sep))
 
-def manifest_glob(req, addons, key):
+def manifest_glob(req, extension, addons=None, db=None):
     if addons is None:
-        addons = module_boot(req)
+        addons = module_boot(req, db=db)
     else:
         addons = addons.split(',')
     r = []
@@ -285,19 +284,21 @@ def manifest_glob(req, addons, key):
             continue
         # ensure does not ends with /
         addons_path = os.path.join(manifest['addons_path'], '')[:-1]
-        globlist = manifest.get(key, [])
+        globlist = manifest.get(extension, [])
         for pattern in globlist:
             for path in glob.glob(os.path.normpath(os.path.join(addons_path, addon, pattern))):
                 r.append((path, fs2web(path[len(addons_path):])))
     return r
 
-def manifest_list(req, mods, extension):
+def manifest_list(req, extension, mods=None, db=None):
     if not req.debug:
         path = '/web/webclient/' + extension
         if mods is not None:
             path += '?mods=' + mods
+        elif db:
+            path += '?db=' + db
         return [path]
-    files = manifest_glob(req, mods, extension)
+    files = manifest_glob(req, extension, addons=mods, db=db)
     i_am_diabetic = req.httprequest.environ["QUERY_STRING"].count("no_sugar") >= 1 or \
                     req.httprequest.environ.get('HTTP_REFERER', '').count("no_sugar") >= 1
     if i_am_diabetic:
@@ -598,14 +599,14 @@ class Home(openerpweb.Controller):
     _cp_path = '/'
 
     @openerpweb.httprequest
-    def index(self, req, s_action=None, **kw):
-        js = "\n        ".join('<script type="text/javascript" src="%s"></script>' % i for i in manifest_list(req, None, 'js'))
-        css = "\n        ".join('<link rel="stylesheet" href="%s">' % i for i in manifest_list(req, None, 'css'))
+    def index(self, req, s_action=None, db=None, **kw):
+        js = "\n        ".join('<script type="text/javascript" src="%s"></script>' % i for i in manifest_list(req, 'js', db=db))
+        css = "\n        ".join('<link rel="stylesheet" href="%s">' % i for i in manifest_list(req, 'css', db=db))
 
         r = html_template % {
             'js': js,
             'css': css,
-            'modules': simplejson.dumps(module_boot(req)),
+            'modules': simplejson.dumps(module_boot(req, db=db)),
             'init': 'var wc = new s.web.WebClient();wc.appendTo($(document.body));'
         }
         return r
@@ -619,19 +620,19 @@ class WebClient(openerpweb.Controller):
 
     @openerpweb.jsonrequest
     def csslist(self, req, mods=None):
-        return manifest_list(req, mods, 'css')
+        return manifest_list(req, 'css', mods=mods)
 
     @openerpweb.jsonrequest
     def jslist(self, req, mods=None):
-        return manifest_list(req, mods, 'js')
+        return manifest_list(req, 'js', mods=mods)
 
     @openerpweb.jsonrequest
     def qweblist(self, req, mods=None):
-        return manifest_list(req, mods, 'qweb')
+        return manifest_list(req, 'qweb', mods=mods)
 
     @openerpweb.httprequest
-    def css(self, req, mods=None):
-        files = list(manifest_glob(req, mods, 'css'))
+    def css(self, req, mods=None, db=None):
+        files = list(manifest_glob(req, 'css', addons=mods, db=db))
         last_modified = get_last_modified(f[0] for f in files)
         if req.httprequest.if_modified_since and req.httprequest.if_modified_since >= last_modified:
             return werkzeug.wrappers.Response(status=304)
@@ -669,8 +670,8 @@ class WebClient(openerpweb.Controller):
             last_modified, checksum)
 
     @openerpweb.httprequest
-    def js(self, req, mods=None):
-        files = [f[0] for f in manifest_glob(req, mods, 'js')]
+    def js(self, req, mods=None, db=None):
+        files = [f[0] for f in manifest_glob(req, 'js', addons=mods, db=db)]
         last_modified = get_last_modified(files)
         if req.httprequest.if_modified_since and req.httprequest.if_modified_since >= last_modified:
             return werkzeug.wrappers.Response(status=304)
@@ -682,8 +683,8 @@ class WebClient(openerpweb.Controller):
             last_modified, checksum)
 
     @openerpweb.httprequest
-    def qweb(self, req, mods=None):
-        files = [f[0] for f in manifest_glob(req, mods, 'qweb')]
+    def qweb(self, req, mods=None, db=None):
+        files = [f[0] for f in manifest_glob(req, 'qweb', addons=mods, db=db)]
         last_modified = get_last_modified(files)
         if req.httprequest.if_modified_since and req.httprequest.if_modified_since >= last_modified:
             return werkzeug.wrappers.Response(status=304)
diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 07b0bf39f21..2cca57f0b56 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -565,13 +565,19 @@ instance.web.Login =  instance.web.Widget.extend({
         self.$el.find('.oe_login_manage_db').click(function() {
             self.do_action("database_manager");
         });
-        var d;
-        if (self.params.db) {
-            if (self.params.login && self.params.password) {
-                d = self.do_login(self.params.db, self.params.login, self.params.password);
-            }
+        var d = $.when();
+        if ($.deparam.querystring().db) {
+            self.params.db = $.deparam.querystring().db;
+        }
+        // used by dbmanager.do_create via internal client action
+        if (self.params.db && self.params.login && self.params.password) {
+            d = self.do_login(self.params.db, self.params.login, self.params.password);
         } else {
-            d = self.rpc("/web/database/get_list", {}).done(self.on_db_loaded).fail(self.on_db_failed);
+            if (self.params.db) {
+                self.on_db_loaded([self.params.db])
+            } else {
+                d = self.rpc("/web/database/get_list", {}).done(self.on_db_loaded).fail(self.on_db_failed);
+            }
         }
         return d;
     },

From a792b030644e6a40162ce2e065ace56409e95e6b Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Tue, 20 Nov 2012 04:51:20 +0000
Subject: [PATCH 30/34] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20121120045120-19bxfsgj0kx6nbld
---
 openerp/addons/base/i18n/fa.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/i18n/fa.po b/openerp/addons/base/i18n/fa.po
index 38baf159866..e46f8e266da 100644
--- a/openerp/addons/base/i18n/fa.po
+++ b/openerp/addons/base/i18n/fa.po
@@ -9,8 +9,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-11-19 04:37+0000\n"
-"X-Generator: Launchpad (build 16278)\n"
+"X-Launchpad-Export-Date: 2012-11-20 04:51+0000\n"
+"X-Generator: Launchpad (build 16286)\n"
 "X-Poedit-Country: IRAN, ISLAMIC REPUBLIC OF\n"
 "X-Poedit-Language: Persian\n"
 

From ceae7544cac93308745dacc0c302ccac767ba865 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 20 Nov 2012 10:50:42 +0100
Subject: [PATCH 31/34] [FIX] Fixed Export dialog buttons. Cleanup
 openerp.web.Dialog

bzr revid: fme@openerp.com-20121120095042-6f4tyiap3t6cxk9e
---
 addons/web/static/src/js/chrome.js      | 83 +++++++++++++------------
 addons/web/static/src/js/data_export.js |  1 -
 2 files changed, 43 insertions(+), 41 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 2cca57f0b56..798a84b53da 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -66,50 +66,48 @@ instance.web.Dialog = instance.web.Widget.extend({
             max_width: '95%',
             height: 'auto',
             min_height: 0,
-            max_height: this.get_height('100%') - 200,
+            max_height: $(window.top).height() - 200,
             autoOpen: false,
             position: [false, 40],
-            buttons: {},
+            buttons: null,
             beforeClose: function () {
                 self.trigger("closing");
             },
-            resizeStop: this.on_resized
+            resizeStop: function() {
+                self.trigger("resized");
+            },
         };
-        for (var f in this) {
-            if (f.substr(0, 10) == 'on_button_') {
-                this.dialog_options.buttons[f.substr(10)] = this[f];
-            }
-        }
         if (options) {
             _.extend(this.dialog_options, options);
         }
         this.on("closing", this, this._closing);
     },
-    get_options: function(options) {
-        var self = this,
-            o = _.extend({}, this.dialog_options, options || {});
-        _.each(['width', 'height'], function(unit) {
-            o[unit] = self['get_' + unit](o[unit]);
-            o['min_' + unit] = self['get_' + unit](o['min_' + unit] || 0);
-            o['max_' + unit] = self['get_' + unit](o['max_' + unit] || 0);
-            if (o[unit] !== 'auto' && o['min_' + unit] && o[unit] < o['min_' + unit]) o[unit] = o['min_' + unit];
-            if (o[unit] !== 'auto' && o['max_' + unit] && o[unit] > o['max_' + unit]) o[unit] = o['max_' + unit];
+    _get_options: function(options) {
+        var self = this;
+        var o = _.extend({}, this.dialog_options, options || {});
+        var sizes = {
+            width: $(window.top).width(),
+            height: $(window.top).height(),
+        };
+        _.each(sizes, function(available_size, unit) {
+            o[unit] = self._get_size(o[unit]);
+            o['min_' + unit] = self._get_size(o['min_' + unit] || 0, available_size);
+            o['max_' + unit] = self._get_size(o['max_' + unit] || 0, available_size);
+            if (o[unit] !== 'auto' && o['min_' + unit] && o[unit] < o['min_' + unit]) {
+                o[unit] = o['min_' + unit];
+            }
+            if (o[unit] !== 'auto' && o['max_' + unit] && o[unit] > o['max_' + unit]) {
+                o[unit] = o['max_' + unit];
+            }
         });
-        if (!o.title && this.dialog_title) {
-            o.title = this.dialog_title;
-        }
+        o.title = o.title || this.dialog_title;
         return o;
     },
-    get_width: function(val) {
-        return this.get_size(val.toString(), $(window.top).width());
-    },
-    get_height: function(val) {
-        return this.get_size(val.toString(), $(window.top).height());
-    },
-    get_size: function(val, available_size) {
+    _get_size: function(val, available_size) {
+        val = val.toString();
         if (val === 'auto') {
             return val;
-        } else if (val.slice(-1) == "%") {
+        } else if (val.slice(-1) === "%") {
             return Math.round(available_size / 100 * parseInt(val.slice(0, -1), 10));
         } else {
             return parseInt(val, 10);
@@ -123,11 +121,14 @@ instance.web.Dialog = instance.web.Widget.extend({
         }
     },
     open: function(options) {
-        if (! this.dialog_inited)
-            this.init_dialog();
-        var o = this.get_options(options);
-        this.add_buttons(o.buttons);
-        delete(o.buttons);
+        var o = this._get_options(options);
+        if (!this.dialog_inited) {
+            this.init_dialog(o);
+        }
+        if (o.buttons) {
+            this._add_buttons(o.buttons);
+            delete(o.buttons);
+        }
         this.$buttons.appendTo($("body"));
         instance.web.dialog(this.$el, o).dialog('open');
         this.$el.dialog("widget").find(".ui-dialog-buttonpane").remove();
@@ -137,10 +138,15 @@ instance.web.Dialog = instance.web.Widget.extend({
         }
         return this;
     },
-    add_buttons: function(buttons) {
+    _add_buttons: function(buttons) {
         var self = this;
-        _.each(buttons, function(fn, but) {
-            var $but = $(QWeb.render('WidgetButton', { widget : { string: but, node: { attrs: {} }}}));
+        _.each(buttons, function(fn, text) {
+            // buttons can be object or array
+            if (!_.isFunction(fn)) {
+                text = fn.text;
+                fn = fn.click;
+            }
+            var $but = $(QWeb.render('WidgetButton', { widget : { string: text, node: { attrs: {} }}}));
             self.$buttons.append($but);
             $but.on('click', function(ev) {
                 fn.call(self.$el, ev);
@@ -149,8 +155,7 @@ instance.web.Dialog = instance.web.Widget.extend({
     },
     init_dialog: function(options) {
         this.renderElement();
-        var o = this.get_options(options);
-        instance.web.dialog(this.$el, o);
+        instance.web.dialog(this.$el, options);
         this.$buttons = $('<div class="ui-dialog-buttonpane ui-widget-content ui-helper-clearfix" />');
         this.$el.dialog("widget").append(this.$buttons);
         this.dialog_inited = true;
@@ -171,8 +176,6 @@ instance.web.Dialog = instance.web.Widget.extend({
             this.__tmp_dialog_closing = undefined;
         }
     },
-    on_resized: function() {
-    },
     destroy: function () {
         _.each(this.getChildren(), function(el) {
             el.destroy();
diff --git a/addons/web/static/src/js/data_export.js b/addons/web/static/src/js/data_export.js
index 477d89c99b3..e38d21d1cd2 100644
--- a/addons/web/static/src/js/data_export.js
+++ b/addons/web/static/src/js/data_export.js
@@ -22,7 +22,6 @@ instance.web.DataExport = instance.web.Dialog.extend({
     start: function() {
         var self = this;
         this._super.apply(this, arguments);
-        this.open();
         self.$el.removeClass('ui-dialog-content ui-widget-content');
         self.$el.find('#add_field').click(function() {
             if ($('#field-tree-structure tr.ui-selected')) {

From 0e3d3328ccac69ce246b995146fb676c1d6146d3 Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert <csn@openerp.com>
Date: Tue, 20 Nov 2012 11:02:52 +0100
Subject: [PATCH 32/34] [FIX]fix constraint to an SQL constraint

bzr revid: csn@openerp.com-20121120100252-ieznyh43zanv2w7q
---
 addons/membership/membership.py | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/addons/membership/membership.py b/addons/membership/membership.py
index 8851747d77f..a61afa407c8 100644
--- a/addons/membership/membership.py
+++ b/addons/membership/membership.py
@@ -470,14 +470,8 @@ class Product(osv.osv):
         'membership_date_from': fields.date('Date from', help='Date from which membership becomes active.'),
         'membership_date_to': fields.date('Date to', help='Date until which membership remains active.'),
     }
-    def _check_end_date(self, cr, uid, ids, context=None):
-        for membership in self.browse(cr, uid, ids, context=context):
-            if membership.membership_date_to < membership.membership_date_from:
-                return False
-        return True
-    _constraints = [
-        (_check_end_date, 'Error ! Ending Date cannot be set before Beginning Date.', ['membership_date_to']),
-    ]
+
+    _sql_constraints = [('date_greater','check(membership_date_to >= membership_date_from)','Error ! Ending Date cannot be set before Beginning Date.')]
     _defaults = {
         'membership': False,
     }

From 999c0b2cabb08496ffd60a56791151c76e4203fd Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 20 Nov 2012 11:06:20 +0100
Subject: [PATCH 33/34] [FIX] Modified behavior when we click on an action in
 the 'More' menu.

Since revision 1517, when using the sidebar from a form view, it merged all the fields of the form view in the context of the action.
It was modified to avoid that context pollution, now it only uses those fields to evaluate the context of that action. So it allows
specifying contexts like "{'invoice_id': invoice_id}", but invoice_id will not be propagated any more to the new action context if not
explicitely specified.

bzr revid: nicolas.vanhoren@openerp.com-20121120100620-ig4e02uctysk7oj8
---
 addons/web/static/src/js/view_form.js |  4 ++--
 addons/web/static/src/js/views.js     | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index c784b169d12..81987dc9e15 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1009,8 +1009,8 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
         }
         return true;
     },
-    sidebar_context: function () {
-        return this.save().then(_.bind(function() {return this.get_fields_values();}, this));
+    sidebar_eval_context: function () {
+        return $.when(this.build_eval_context());
     },
     open_defaults_dialog: function () {
         var self = this;
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 6fbbd3199ad..0478ba6abb0 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -1061,23 +1061,23 @@ instance.web.Sidebar = instance.web.Widget.extend({
     },
     on_item_action_clicked: function(item) {
         var self = this;
-        self.getParent().sidebar_context().done(function (context) {
+        self.getParent().sidebar_eval_context().done(function (sidebar_eval_context) {
             var ids = self.getParent().get_selected_ids();
             if (ids.length == 0) {
                 instance.web.dialog($("<div />").text(_t("You must choose at least one record.")), { title: _t("Warning"), modal: true });
                 return false;
             }
-            var additional_context = _.extend({
+            var active_ids_context = {
                 active_id: ids[0],
                 active_ids: ids,
                 active_model: self.getParent().dataset.model
-            }, context);
+            };
             self.rpc("/web/action/load", {
                 action_id: item.action.id,
-                context: additional_context
+                context: new instance.web.CompoundContext(sidebar_eval_context, active_ids_context),
             }).done(function(result) {
-                result.context = _.extend(result.context || {},
-                    additional_context);
+                console.log(result.context);
+                result.context = new instance.web.CompoundContext(result.context || {}, active_ids_context);
                 result.flags = result.flags || {};
                 result.flags.new_window = true;
                 self.do_action(result, {
@@ -1330,7 +1330,7 @@ instance.web.View = instance.web.Widget.extend({
     on_sidebar_export: function() {
         new instance.web.DataExport(this, this.dataset).open();
     },
-    sidebar_context: function () {
+    sidebar_eval_context: function () {
         return $.when();
     },
     /**

From ade1a5df8713d6375bc7196261ed8b28f820fd42 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 20 Nov 2012 12:07:48 +0100
Subject: [PATCH 34/34] [IMP] allows to specify a specific eval domain in
 /web/action/load

bzr revid: nicolas.vanhoren@openerp.com-20121120110748-5idnflvmxx0jibwe
---
 addons/web/controllers/main.py    | 17 ++++++++++-------
 addons/web/static/src/js/views.js |  3 ++-
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 8b043dc2cb0..d7561130feb 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -367,13 +367,13 @@ def load_actions_from_ir_values(req, key, key2, models, meta):
     Values = req.session.model('ir.values')
     actions = Values.get(key, key2, models, meta, context)
 
-    return [(id, name, clean_action(req, action))
+    return [(id, name, clean_action(req, action, context))
             for id, name, action in actions]
 
-def clean_action(req, action, do_not_eval=False):
+def clean_action(req, action, context, do_not_eval=False):
     action.setdefault('flags', {})
 
-    context = req.session.eval_context(req.context)
+    context = context or {}
     eval_ctx = req.session.evaluation_context(context)
 
     if not do_not_eval:
@@ -1237,9 +1237,10 @@ class DataSet(openerpweb.Controller):
 
     @openerpweb.jsonrequest
     def call_button(self, req, model, method, args, domain_id=None, context_id=None):
+        context = req.session.eval_context(req.context)
         action = self.call_common(req, model, method, args, domain_id, context_id)
         if isinstance(action, dict) and action.get('type') != '':
-            return clean_action(req, action)
+            return clean_action(req, action, context)
         return False
 
     @openerpweb.jsonrequest
@@ -1618,10 +1619,11 @@ class Action(openerpweb.Controller):
     _cp_path = "/web/action"
 
     @openerpweb.jsonrequest
-    def load(self, req, action_id, do_not_eval=False):
+    def load(self, req, action_id, do_not_eval=False, eval_context=None):
         Actions = req.session.model('ir.actions.actions')
         value = False
         context = req.session.eval_context(req.context)
+        eval_context = req.session.eval_context(nonliterals.CompoundContext(context, eval_context or {}))
 
         try:
             action_id = int(action_id)
@@ -1642,15 +1644,16 @@ class Action(openerpweb.Controller):
             ctx.update(context)
             action = req.session.model(action_type).read([action_id], False, ctx)
             if action:
-                value = clean_action(req, action[0], do_not_eval)
+                value = clean_action(req, action[0], eval_context, do_not_eval)
         return value
 
     @openerpweb.jsonrequest
     def run(self, req, action_id):
+        context = req.session.eval_context(req.context)
         return_action = req.session.model('ir.actions.server').run(
             [action_id], req.session.eval_context(req.context))
         if return_action:
-            return clean_action(req, return_action)
+            return clean_action(req, return_action, context)
         else:
             return False
 
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 0478ba6abb0..42d64c7d2f7 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -1074,7 +1074,8 @@ instance.web.Sidebar = instance.web.Widget.extend({
             };
             self.rpc("/web/action/load", {
                 action_id: item.action.id,
-                context: new instance.web.CompoundContext(sidebar_eval_context, active_ids_context),
+                context: active_ids_context,
+                eval_context: new instance.web.CompoundContext(sidebar_eval_context, active_ids_context),
             }).done(function(result) {
                 console.log(result.context);
                 result.context = new instance.web.CompoundContext(result.context || {}, active_ids_context);