From 1dceb70f3bf281f44cc746263a9a00a0fb6de2d8 Mon Sep 17 00:00:00 2001
From: Rifakat <rha@tinyerp.com>
Date: Thu, 13 Jun 2013 15:13:30 +0530
Subject: [PATCH 001/225] [FIX] account: if tax is , total base is applied only
 on the main tax and does not carry the child tax amount into base, it is
 compulsory to add child tax amount to tax base becuase the next tax i.e. VAT
 is applied on total tax base amount

---
 addons/account/account.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index c2e75e889f0..418a4f7b161 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -2088,12 +2088,15 @@ class account_tax(osv.osv):
                 data['balance'] = cur_price_unit
 
             amount2 = data.get('amount', 0.0)
+            amount3 = 0.0
             if tax.child_ids:
                 if tax.child_depend:
                     latest = res.pop()
                 amount = amount2
                 child_tax = self._unit_compute(cr, uid, tax.child_ids, amount, product, partner, quantity)
                 res.extend(child_tax)
+                for child in child_tax:
+                    amount3 += child.get('amount', 0.0)
                 if tax.child_depend:
                     for r in res:
                         for name in ('base','ref_base'):
@@ -2109,7 +2112,7 @@ class account_tax(osv.osv):
                                 r['amount'] = data['amount']
                                 latest[name+'_code_id'] = False
             if tax.include_base_amount:
-                cur_price_unit+=amount2
+                cur_price_unit += amount2 + amount3
         return res
 
     def compute_all(self, cr, uid, taxes, price_unit, quantity, product=None, partner=None, force_excluded=False):

From b6c748ffe6fdc2e9de3861a5a8f3587b371bff5f Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Wed, 5 Mar 2014 12:30:24 +0530
Subject: [PATCH 002/225] [IMP]Added the 'Shopping Carts' sales team and
 improved code accordingly

---
 addons/sale/sale.py                            | 1 +
 addons/sale/sale_view.xml                      | 8 ++++----
 addons/website_sale/controllers/main.py        | 2 +-
 addons/website_sale/data/website_sale_data.xml | 6 ++++++
 addons/website_sale/models/website.py          | 2 ++
 5 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 667f15a375d..fb9657416c4 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -170,6 +170,7 @@ class sale_order(osv.osv):
         'client_order_ref': fields.char('Customer Reference', size=64),
         'state': fields.selection([
             ('draft', 'Draft Quotation'),
+            ('shopping_cart', 'Shopping Cart'),
             ('sent', 'Quotation Sent'),
             ('cancel', 'Cancelled'),
             ('waiting_date', 'Waiting Schedule'),
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 35901b0131e..24d2feeecba 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -80,14 +80,14 @@
                         <button name="action_quotation_send" string="Send by Email" type="object" states="sent,progress,manual" groups="base.group_user"/>
                         <button name="print_quotation" string="Print" type="object" states="draft" class="oe_highlight" groups="base.group_user"/>
                         <button name="print_quotation" string="Print" type="object" states="sent,progress,manual" groups="base.group_user"/>
-                        <button name="action_button_confirm" states="draft" string="Confirm Sale" type="object" groups="base.group_user"/>
+                        <button name="action_button_confirm" states="draft,shopping_cart" string="Confirm Sale" type="object" groups="base.group_user"/>
                         <button name="action_button_confirm" states="sent" string="Confirm Sale" class="oe_highlight" type="object" groups="base.group_user"/>
                         <button name="action_view_invoice" string="View Invoice" type="object" class="oe_highlight"
                             attrs="{'invisible': [('invoice_exists', '=', False)]}" groups="base.group_user"/>
                         <button name="%(action_view_sale_advance_payment_inv)d" string="Create Invoice"
                             type="action" states="manual" class="oe_highlight" groups="base.group_user"/>
                         <button name="copy_quotation" states="cancel" string="New Copy of Quotation" type="object"/>
-                        <button name="cancel" states="draft,sent" string="Cancel Quotation" groups="base.group_user"/>
+                        <button name="cancel" states="draft,shopping_cart,sent" string="Cancel Quotation" groups="base.group_user"/>
                         <button name="action_cancel" states="manual,progress" string="Cancel Order" type="object" groups="base.group_user"/>
                         <button name="invoice_cancel" states="invoice_except" string="Cancel Order" groups="base.group_user"/>
                         <field name="state" widget="statusbar" statusbar_visible="draft,sent,progress,done" statusbar_colors='{"invoice_except":"red","waiting_date":"blue"}'/>
@@ -277,7 +277,7 @@
                     'search_default_my_sale_orders_filter': 1
                 }
             </field>
-            <field name="domain">[('state', 'not in', ('draft', 'sent', 'cancel'))]</field>
+            <field name="domain">[('state', 'not in', ('draft', 'shopping_cart', 'sent', 'cancel'))]</field>
             <field name="help" type="html">
                 <p class="oe_view_nocontent_create">
                     Click to create a quotation that can be converted into a sales
@@ -321,7 +321,7 @@
             <field name="view_id" ref="view_quotation_tree"/>
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="context">{'search_default_my_sale_orders_filter': 1}</field>
-            <field name="domain">[('state','in',('draft','sent','cancel'))]</field>
+            <field name="domain">[('state','in',('draft','shopping_cart','sent','cancel'))]</field>
             <field name="search_view_id" ref="view_sales_order_filter"/>
             <field name="help" type="html">
               <p class="oe_view_nocontent_create">
diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index 9fb4ce50b0e..c051f61b370 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -323,7 +323,7 @@ class Ecommerce(http.Controller):
 
         # must have a draft sale order with lines at this point, otherwise reset
         order = self.get_order()
-        if order and order.state != 'draft':
+        if order and order.state not in ['draft','shopping_cart']:
             request.registry['website'].sale_reset_order(cr, uid, context=context)
             return request.redirect('/shop/')
 
diff --git a/addons/website_sale/data/website_sale_data.xml b/addons/website_sale/data/website_sale_data.xml
index c2f9144d7e4..4852df242f3 100644
--- a/addons/website_sale/data/website_sale_data.xml
+++ b/addons/website_sale/data/website_sale_data.xml
@@ -32,5 +32,11 @@
             <field name="html_class">oe_image_full</field>
         </record>
 
+        <record model="crm.case.section" id="crm_case_section_shopping_carts">
+            <field name="name">Shopping Carts</field>
+            <field name="code">SPC</field>
+            <field name="member_ids" eval="[(4, ref('base.user_root')),(4, ref('base.user_demo'))]"/>
+        </record>
+
     </data>
 </openerp>
diff --git a/addons/website_sale/models/website.py b/addons/website_sale/models/website.py
index 91164f94e9d..70e62567fce 100644
--- a/addons/website_sale/models/website.py
+++ b/addons/website_sale/models/website.py
@@ -146,6 +146,8 @@ class Website(orm.Model):
         SaleOrder = self.pool.get('sale.order')
         quotation_values = self._ecommerce_get_quotation_values(cr, uid, context=context)
         quotation_values['user_id'] = False
+        quotation_values['section_id'] = self.pool.get('crm.case.section').search(cr, SUPERUSER_ID, [('code', '=', 'SPC')], context=context)
+        quotation_values['state'] = 'shopping_cart'
         return SaleOrder.create(cr, SUPERUSER_ID, quotation_values, context=context)
 
     def ecommerce_get_new_order(self, cr, uid, context=None):

From e50f23dfb5f6a3df3226b78175768f87e1720486 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Wed, 5 Mar 2014 17:02:56 +0530
Subject: [PATCH 003/225] [IMP] Added crm in depends and fetch section_id.

---
 addons/website_sale/__openerp__.py    | 2 +-
 addons/website_sale/models/website.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/website_sale/__openerp__.py b/addons/website_sale/__openerp__.py
index 121bb519103..c834ba9f064 100644
--- a/addons/website_sale/__openerp__.py
+++ b/addons/website_sale/__openerp__.py
@@ -9,7 +9,7 @@ OpenERP E-Commerce
 
         """,
     'author': 'OpenERP SA',
-    'depends': ['website', 'sale', 'payment'],
+    'depends': ['website', 'sale', 'payment', 'crm'],
     'data': [
         'data/website_sale_data.xml',
         'views/website_sale.xml',
diff --git a/addons/website_sale/models/website.py b/addons/website_sale/models/website.py
index 70e62567fce..f72a79bee13 100644
--- a/addons/website_sale/models/website.py
+++ b/addons/website_sale/models/website.py
@@ -146,7 +146,7 @@ class Website(orm.Model):
         SaleOrder = self.pool.get('sale.order')
         quotation_values = self._ecommerce_get_quotation_values(cr, uid, context=context)
         quotation_values['user_id'] = False
-        quotation_values['section_id'] = self.pool.get('crm.case.section').search(cr, SUPERUSER_ID, [('code', '=', 'SPC')], context=context)
+        quotation_values['section_id'] = self.pool.get('crm.case.section').search(cr, SUPERUSER_ID, [('code', '=', 'SPC')], context=context)[0]
         quotation_values['state'] = 'shopping_cart'
         return SaleOrder.create(cr, SUPERUSER_ID, quotation_values, context=context)
 

From 7699504d62f33dd0b124ff66850485add6641637 Mon Sep 17 00:00:00 2001
From: "Ravish (Open ERP)" <rmu@tinyerp.com>
Date: Fri, 28 Mar 2014 15:28:35 +0530
Subject: [PATCH 004/225] [Add new sale_team module]

---
 addons/crm/__openerp__.py                     |   1 +
 addons/crm/crm.py                             | 100 +------
 addons/crm/crm_case_section_view.xml          | 244 +++------------
 addons/crm/crm_lead.py                        |  13 +-
 addons/crm/res_config_view.xml                |  11 -
 addons/crm/security/crm_security.xml          |  14 +-
 addons/crm/security/ir.model.access.csv       |   3 -
 addons/sale/__openerp__.py                    |   3 +-
 addons/sale/report/__init__.py                |   3 +-
 .../report/sale_analysis_report.py}           |   0
 .../report/sale_analysis_report_view.xml}     |   0
 .../sales_crm_account_invoice_report.py       |   0
 addons/sale/sale.py                           |  81 ++++-
 addons/sale/sale_view.xml                     | 237 +++++++++++++++
 addons/sale_crm/report/__init__.py            |   4 +-
 addons/sale_crm/sale_crm.py                   | 108 +------
 addons/sale_crm/sale_crm_view.xml             | 278 +-----------------
 addons/sale_team/__init__.py                  |  25 ++
 addons/sale_team/__openerp__.py               |  36 +++
 addons/sale_team/ir.model.access.csv          |   5 +
 addons/sale_team/res_config_view.xml          |  27 ++
 addons/sale_team/sale_team.py                 | 153 ++++++++++
 addons/sale_team/sale_team.xml                | 232 +++++++++++++++
 addons/sale_team/sale_team_config.py          |  45 +++
 addons/sale_team/sale_team_security.xml       |  18 ++
 25 files changed, 917 insertions(+), 724 deletions(-)
 rename addons/{sale_crm/report/sale_report.py => sale/report/sale_analysis_report.py} (100%)
 rename addons/{sale_crm/report/sale_report_view.xml => sale/report/sale_analysis_report_view.xml} (100%)
 rename addons/{sale_crm => sale}/report/sales_crm_account_invoice_report.py (100%)
 create mode 100644 addons/sale_team/__init__.py
 create mode 100644 addons/sale_team/__openerp__.py
 create mode 100644 addons/sale_team/ir.model.access.csv
 create mode 100644 addons/sale_team/res_config_view.xml
 create mode 100644 addons/sale_team/sale_team.py
 create mode 100644 addons/sale_team/sale_team.xml
 create mode 100644 addons/sale_team/sale_team_config.py
 create mode 100644 addons/sale_team/sale_team_security.xml

diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 1b0cbed7937..7d5052c1c4e 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -51,6 +51,7 @@ Dashboard for CRM will include:
     'depends': [
         'base_action_rule',
         'base_setup',
+        'sale_team',
         'process',
         'mail',
         'email_template',
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 20e2a6e8aff..eb10e468602 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -90,45 +90,8 @@ class crm_case_stage(osv.osv):
 
 class crm_case_section(osv.osv):
     """ Model for sales teams. """
-    _name = "crm.case.section"
-    _inherits = {'mail.alias': 'alias_id'}
-    _inherit = "mail.thread"
+    _inherit = 'crm.case.section'
     _description = "Sales Teams"
-    _order = "complete_name"
-    # number of periods for lead/opportunities/... tracking in salesteam kanban dashboard/kanban view
-    _period_number = 5
-
-    def get_full_name(self, cr, uid, ids, field_name, arg, context=None):
-        return dict(self.name_get(cr, uid, ids, context=context))
-
-    def __get_bar_values(self, cr, uid, obj, domain, read_fields, value_field, groupby_field, context=None):
-        """ Generic method to generate data for bar chart values using SparklineBarWidget.
-            This method performs obj.read_group(cr, uid, domain, read_fields, groupby_field).
-
-            :param obj: the target model (i.e. crm_lead)
-            :param domain: the domain applied to the read_group
-            :param list read_fields: the list of fields to read in the read_group
-            :param str value_field: the field used to compute the value of the bar slice
-            :param str groupby_field: the fields used to group
-
-            :return list section_result: a list of dicts: [
-                                                {   'value': (int) bar_column_value,
-                                                    'tootip': (str) bar_column_tooltip,
-                                                }
-                                            ]
-        """
-        month_begin = date.today().replace(day=1)
-        section_result = [{
-                          'value': 0,
-                          'tooltip': (month_begin + relativedelta.relativedelta(months=-i)).strftime('%B %Y'),
-                          } for i in range(self._period_number - 1, -1, -1)]
-        group_obj = obj.read_group(cr, uid, domain, read_fields, groupby_field, context=context)
-        pattern = tools.DEFAULT_SERVER_DATE_FORMAT if obj.fields_get(cr, uid, groupby_field)[groupby_field]['type'] == 'date' else tools.DEFAULT_SERVER_DATETIME_FORMAT
-        for group in group_obj:
-            group_begin_date = datetime.strptime(group['__domain'][0][2], pattern)
-            month_delta = relativedelta.relativedelta(month_begin, group_begin_date)
-            section_result[self._period_number - (month_delta.months + 1)] = {'value': group.get(value_field, 0), 'tooltip': group.get(groupby_field, 0)}
-        return section_result
 
     def _get_opportunities_data(self, cr, uid, ids, field_name, arg, context=None):
         """ Get opportunities-related data for salesteam kanban view
@@ -155,25 +118,7 @@ class crm_case_section(osv.osv):
         return res
 
     _columns = {
-        'name': fields.char('Sales Team', size=64, required=True, translate=True),
-        'complete_name': fields.function(get_full_name, type='char', size=256, readonly=True, store=True),
-        'code': fields.char('Code', size=8),
-        'active': fields.boolean('Active', help="If the active field is set to "\
-                        "true, it will allow you to hide the sales team without removing it."),
-        'change_responsible': fields.boolean('Reassign Escalated', help="When escalating to this team override the salesman with the team leader."),
-        'user_id': fields.many2one('res.users', 'Team Leader'),
-        'member_ids': fields.many2many('res.users', 'sale_member_rel', 'section_id', 'member_id', 'Team Members'),
-        'reply_to': fields.char('Reply-To', size=64, help="The email address put in the 'Reply-To' of all emails sent by OpenERP about cases in this sales team"),
-        'parent_id': fields.many2one('crm.case.section', 'Parent Team'),
-        'child_ids': fields.one2many('crm.case.section', 'parent_id', 'Child Teams'),
-        'resource_calendar_id': fields.many2one('resource.calendar', "Working Time", help="Used to compute open days"),
-        'note': fields.text('Description'),
-        'working_hours': fields.float('Working Hours', digits=(16, 2)),
         'stage_ids': fields.many2many('crm.case.stage', 'section_stage_rel', 'section_id', 'stage_id', 'Stages'),
-        'alias_id': fields.many2one('mail.alias', 'Alias', ondelete="restrict", required=True,
-                                    help="The email address associated with this team. New emails received will automatically "
-                                         "create new leads assigned to the team."),
-        'color': fields.integer('Color Index'),
         'use_leads': fields.boolean('Leads',
             help="The first contact you get with a potential customer is a lead you qualify before converting it into a real business opportunity. Check this box to manage leads in this sales team."),
 
@@ -190,52 +135,11 @@ class crm_case_section(osv.osv):
         return ids
 
     _defaults = {
-        'active': 1,
         'stage_ids': _get_stage_common,
         'use_leads': True,
     }
 
-    _sql_constraints = [
-        ('code_uniq', 'unique (code)', 'The code of the sales team must be unique !')
-    ]
-
-    _constraints = [
-        (osv.osv._check_recursion, 'Error ! You cannot create recursive Sales team.', ['parent_id'])
-    ]
-
-    def name_get(self, cr, uid, ids, context=None):
-        """Overrides orm name_get method"""
-        if not isinstance(ids, list):
-            ids = [ids]
-        res = []
-        if not ids:
-            return res
-        reads = self.read(cr, uid, ids, ['name', 'parent_id'], context)
-
-        for record in reads:
-            name = record['name']
-            if record['parent_id']:
-                name = record['parent_id'][1] + ' / ' + name
-            res.append((record['id'], name))
-        return res
-
-    def create(self, cr, uid, vals, context=None):
-        if context is None:
-            context = {}
-        create_context = dict(context, alias_model_name='crm.lead', alias_parent_model_name=self._name)
-        section_id = super(crm_case_section, self).create(cr, uid, vals, context=create_context)
-        section = self.browse(cr, uid, section_id, context=context)
-        self.pool.get('mail.alias').write(cr, uid, [section.alias_id.id], {'alias_parent_thread_id': section_id, 'alias_defaults': {'section_id': section_id, 'type': 'lead'}}, context=context)
-        return section_id
-
-    def unlink(self, cr, uid, ids, context=None):
-        # Cascade-delete mail aliases as well, as they should not exist without the sales team.
-        mail_alias = self.pool.get('mail.alias')
-        alias_ids = [team.alias_id.id for team in self.browse(cr, uid, ids, context=context) if team.alias_id]
-        res = super(crm_case_section, self).unlink(cr, uid, ids, context=context)
-        mail_alias.unlink(cr, uid, alias_ids, context=context)
-        return res
-
+ 
 class crm_case_categ(osv.osv):
     """ Category of Case """
     _name = "crm.case.categ"
diff --git a/addons/crm/crm_case_section_view.xml b/addons/crm/crm_case_section_view.xml
index d3ad226dbea..a56459a7065 100644
--- a/addons/crm/crm_case_section_view.xml
+++ b/addons/crm/crm_case_section_view.xml
@@ -84,195 +84,34 @@
         <record model="ir.ui.view" id="crm_case_section_salesteams_view_kanban">
             <field name="name">crm.case.section.kanban</field>
             <field name="model">crm.case.section</field>
+            <field name="inherit_id" ref="sale_team.crm_case_section_salesteams_view_kanban"/>
             <field name="arch" type="xml">
-                <kanban version="7.0" class="oe_background_grey">
+            <data>
+                <xpath expr="//field[@name='name']" position="after">
                     <field name="use_leads"/>
-                    <field name="name"/>
-                    <field name="user_id"/>
-                    <field name="member_ids"/>
-                    <field name="note"/>
-                    <field name="alias_id"/>
-                    <field name="color"/>
                     <field name="monthly_open_leads"/>
                     <field name="monthly_planned_revenue"/>
-                    <templates>
-                        <t t-name="kanban-box">
-                            <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click oe_kanban_crm_salesteams">
-                                <div class="oe_dropdown_toggle oe_dropdown_kanban" groups="base.group_sale_manager">
-                                    <span class="oe_e">í</span>
-                                    <ul class="oe_dropdown_menu">
-                                        <li t-if="widget.view.is_action_enabled('edit')"><a type="edit">Sales Teams Settings</a></li>
-                                        <li t-if="widget.view.is_action_enabled('delete')"><a type="delete">Delete</a></li>
-                                        <li t-if="widget.view.is_action_enabled('edit')"><ul class="oe_kanban_colorpicker" data-field="color"/></li>
-                                    </ul>
-                                </div>
-                                <div class="oe_kanban_content">
-                                    <h4 class="oe_center"><field name="name"/></h4>
-                                    <div class="oe_kanban_alias oe_center" t-if="record.use_leads.raw_value and record.alias_id.value">
-                                        <small><span class="oe_e oe_e_alias" style="float: none;">%%</span><t t-raw="record.alias_id.raw_value[1]"/></small>
-                                    </div>
-                                    <div class="oe_items_list">
-                                        <div class="oe_salesteams_leads" t-if="record.use_leads.raw_value">
-                                            <a name="%(crm_case_form_view_salesteams_lead)d" type="action">Leads</a>
-                                            <a name="%(action_report_crm_lead_salesteam)d" type="action" class="oe_sparkline_bar_link">
-                                                <field name="monthly_open_leads" widget="sparkline_bar"
-                                                    options="{'height': '20px', 'barWidth': 4, 'barSpacing': 1, 'delayIn': '3000', 'tooltip_suffix': ' Leads'}">Open Leads per Month<br/>Click to see a detailed analysis of leads.</field>
-                                            </a>
-                                        </div>
-                                        <div class="oe_salesteams_opportunities">
-                                            <a name="%(crm_case_form_view_salesteams_opportunity)d" type="action">Opportunities</a>
-                                            <a name="%(action_report_crm_opportunity_salesteam)d" type="action">
-                                                <field name="monthly_planned_revenue" widget="sparkline_bar"
-                                                    options="{'height': '20px', 'barWidth': '4', 'barSpacing': '1', 'delayIn': '3000', 'tooltip_suffix': ' (Planned Revenue)'}">Planned Revenue per Month<br/>Click to see a detailed analysis of opportunities.</field>
-                                            </a>
-                                        </div>
-                                    </div>
-                                    <div class="oe_clear"></div>
-                                    <div class="oe_kanban_salesteams_avatars">
-                                        <t t-foreach="record.member_ids.raw_value.slice(0,10)" t-as="member">
-                                            <img t-att-src="kanban_image('res.users', 'image_small', member)" t-att-data-member_id="member"/>
-                                        </t>
-                                    </div>
-                                </div>
-                            </div>
-                        </t>
-                    </templates>
-                </kanban>
-            </field>
-        </record>
-
-        <!-- Case Sections Search view -->
-
-        <record id="crm_case_section_salesteams_search" model="ir.ui.view">
-            <field name="name">Case Sections - Search</field>
-            <field name="model">crm.case.section</field>
-            <field name="arch" type="xml">
-                <search string="Salesteams Search">
-                    <field name="name"/>
-                    <field name="parent_id"/>
-                    <field name="user_id"/>
-                    <field name="note"/>
-                    <field name="code"/>
-                    <filter name="personal" string="My Salesteams" domain="['|', ('member_ids', '=', uid), ('user_id', '=', uid)]"/>
-                    <group expand="0" string="Group By...">
-                        <filter string="Team Leader" domain="[]" context="{'group_by':'user_id'}"/>
-                        <filter string="Parent Sales Teams" domain="[]" context="{'group_by':'parent_id'}"/>
-                    </group>
-                </search>
-            </field>
-        </record>
-
-        <!-- Case Sections Action -->
-
-        <record id="crm_case_section_salesteams_act" model="ir.actions.act_window">
-            <field name="name">Sales Teams</field>
-            <field name="res_model">crm.case.section</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">kanban,tree,form</field>
-            <field name="context">{'search_default_personal': True}</field>
-            <field name="view_id" ref="crm_case_section_salesteams_view_kanban"/>
-            <field name="help" type="html">
-                <p class="oe_view_nocontent_create">
-                    Click here to define a new sales team.
-                </p><p>
-                    Use sales team to organize your different salespersons or
-                    departments into separate teams. Each team will work in
-                    its own list of opportunities.
-                </p>
-            </field>
-        </record>
-
-        <!-- Case Sections Form View -->
-
-        <record id="crm_case_section_view_form" model="ir.ui.view">
-            <field name="name">crm.case.section.form</field>
-            <field name="model">crm.case.section</field>
-            <field name="arch" type="xml">
-                <form string="Sales Team" version="7.0">
-                    <sheet>
-                        <div class="oe_title">
-                            <label for="name" class="oe_edit_only" string="Sales team"/>
-                            <h1>
-                                <field name="name" string="Salesteam"/>
-                            </h1>
-                            <div name="options_active">
-                                <field name="use_leads" class="oe_inline"/><label for="use_leads"/>
-                            </div>
-                        </div>
-                        <group>
-                            <group>
-                                <field name="user_id" context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'base.group_sale_salesman_all_leads']}"/>
-                                <field name="code"/>
-                                <field name="parent_id"/>
-                                <field name="change_responsible"/>
-                                <field name="active"/>
-                            </group>
-                            <group>
-                                <label for="alias_name" string="Email Alias"
-                                        attrs="{'invisible': [('alias_domain', '=', False)]}"/>
-                                <div name="alias_def"
-                                        attrs="{'invisible': [('alias_domain', '=', False)]}">
-                                    <field name="alias_id" class="oe_read_only oe_inline"
-                                            string="Email Alias" required="0"/>
-                                    <div class="oe_edit_only oe_inline" name="edit_alias" style="display: inline;" >
-                                        <field name="alias_name" class="oe_inline"/>@<field name="alias_domain" class="oe_inline" readonly="1"/>
-                                    </div>
-                                </div>
-                                <field name="alias_contact" class="oe_inline"
-                                        string="Accept Emails From"
-                                        attrs="{'invisible': [('alias_domain', '=', False)]}"/>
-                            </group>
-                        </group>
-                        <notebook colspan="4">
-                            <page string="Team Members">
-                                <field name="member_ids" widget="many2many_kanban">
-                                    <kanban quick_create="false" create="true">
-                                        <field name="name"/>
-                                        <templates>
-                                            <t t-name="kanban-box">
-                                                <div style="position: relative">
-                                                    <a t-if="! read_only_mode" type="delete" style="position: absolute; right: 0; padding: 4px; diplay: inline-block">X</a>
-                                                    <div class="oe_module_vignette">
-                                                        <div class="oe_module_desc">
-                                                            <field name="name"/>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                            </t>
-                                        </templates>
-                                    </kanban>
-                                </field>
-                            </page>
-                            <page string="Stages">
-                                <separator string="Select Stages for this Sales Team"/>
-                                <field name="stage_ids"/>
-                            </page>
-                            <page string="Notes">
-                                <field name="note"/>
-                            </page>
-                        </notebook>
-                    </sheet>
-                    <div class="oe_chatter">
-                        <field name="message_follower_ids" widget="mail_followers" help="Follow this salesteam to automatically track the events associated to users of this team."/>
-                        <field name="message_ids" widget="mail_thread"/>
+                </xpath>
+                <xpath expr="//div[@class='oe_clear']" position="before">
+                <div class="oe_items_list">
+                    <div class="oe_salesteams_leads" t-if="record.use_leads.raw_value">
+                        <a name="%(crm_case_form_view_salesteams_lead)d" type="action">Leads</a>
+                        <a name="%(action_report_crm_lead_salesteam)d" type="action" class="oe_sparkline_bar_link">
+                            <field name="monthly_open_leads" widget="sparkline_bar"
+                                options="{'height': '20px', 'barWidth': 4, 'barSpacing': 1, 'delayIn': '3000', 'tooltip_suffix': ' Leads'}">Open Leads per Month<br/>Click to see a detailed analysis of leads.</field>
+                        </a>
                     </div>
-                </form>
-            </field>
-        </record>
-
-        <!-- Case Sections Tree View -->
-
-        <record id="crm_case_section_view_tree" model="ir.ui.view">
-            <field name="name">crm.case.section.tree</field>
-            <field name="model">crm.case.section</field>
-            <field name="field_parent">child_ids</field>
-            <field name="arch" type="xml">
-                <tree string="Sales Team">
-                    <field name="name"/>
-                    <field name="code"/>
-                    <field name="user_id"/>
-                </tree>
-            </field>
+                    <div class="oe_salesteams_opportunities">
+                        <a name="%(crm_case_form_view_salesteams_opportunity)d" type="action">Opportunities</a>
+                        <a name="%(action_report_crm_opportunity_salesteam)d" type="action">
+                            <field name="monthly_planned_revenue" widget="sparkline_bar"
+                                options="{'height': '20px', 'barWidth': '4', 'barSpacing': '1', 'delayIn': '3000', 'tooltip_suffix': ' (Planned Revenue)'}">Planned Revenue per Month<br/>Click to see a detailed analysis of opportunities.</field>
+                        </a>
+                    </div>
+                </div>
+            </xpath>
+          </data>
+         </field>
         </record>
 
         <!-- Case Sections Action -->
@@ -303,29 +142,26 @@
             <field name="res_model">crm.case.section</field>
             <field name="domain">[('parent_id','=',False)]</field>
             <field name="view_type">tree</field>
-            <field name="view_id" ref="crm_case_section_view_tree"/>
+            <field name="view_id" ref="sale_team.crm_case_section_view_tree"/>
         </record>
 
-        <record id="crm_case_section_act" model="ir.actions.act_window">
-            <field name="name">Sales Teams</field>
-            <field name="res_model">crm.case.section</field>
-            <field name="view_type">form</field>
-            <field name="view_id" ref="crm_case_section_view_tree"/>
-            <field name="help" type="html">
-                <p class="oe_view_nocontent_create">
-                    Click here to define a new sales team.
-                </p><p>
-                    Use sales team to organize your different salespersons or
-                    departments into separate teams. Each team will work in
-                    its own list of opportunities.
-                </p>
+    <record model="ir.ui.view" id="sale_team_form_view_in_crm">
+            <field name="name">crm.case.section.form</field>
+            <field name="model">crm.case.section</field>
+            <field name="inherit_id" ref="sale_team.crm_case_section_view_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='name']" position="after">
+                    <div name="options_active">
+                        <field name="use_leads" class="oe_inline"/><label for="use_leads"/>
+                    </div>
+                </xpath>
+                <xpath expr="//page[@string='Team Members']" position="after">
+                    <page string="Stages">
+                        <separator string="Select Stages for this Sales Team"/>
+                            <field name="stage_ids"/>
+                    </page>
+               </xpath>
             </field>
         </record>
-
-        <menuitem id="crm.menu_crm_case_section_act"
-            action="crm_case_section_salesteams_act"
-            sequence="1"
-            parent="base.menu_sales"
-            groups="base.group_multi_salesteams"/>
   </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 4da0a509ed1..f97b7d0adf8 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -346,7 +346,18 @@ class crm_lead(format_address, osv.osv):
             if section_ids:
                 section_id = section_ids[0]
         return {'value': {'section_id': section_id}}
-
+        
+    def on_change_user(self, cr, uid, ids, user_id, context=None):
+        """ Override of on change user_id on lead/opportunity; when having sale
+            the new logic is :
+            - use user.default_section_id
+            - or fallback on previous behavior """
+        if user_id:
+            user = self.pool.get('res.users').browse(cr, uid, user_id, context=context)
+            if user.default_section_id and user.default_section_id.id:
+                return {'value': {'section_id': user.default_section_id.id}}
+        return super(sale_crm_lead, self).on_change_user(cr, uid, ids, user_id, context=context)
+    
     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:
diff --git a/addons/crm/res_config_view.xml b/addons/crm/res_config_view.xml
index b964cca5c7f..0ef4cfa6f1e 100644
--- a/addons/crm/res_config_view.xml
+++ b/addons/crm/res_config_view.xml
@@ -23,17 +23,6 @@
                             </div>
                         </div>
                     </group>
-                    <separator string="Sales Teams"/>
-                    <group>
-                        <label for="id" string="Manage Sales Teams"/>
-                        <div>
-                            <div>
-                                <field name="group_multi_salesteams" class="oe_inline"/>
-                                <label for="group_multi_salesteams"/>
-                            </div>
-                            
-                        </div>
-                    </group>
 	            </div>
                 <xpath expr="//group[@name='On Mail Client']" position="before">
                     <group name="default_alias">
diff --git a/addons/crm/security/crm_security.xml b/addons/crm/security/crm_security.xml
index dfc3a56858e..bd2c3cdb3a4 100644
--- a/addons/crm/security/crm_security.xml
+++ b/addons/crm/security/crm_security.xml
@@ -24,19 +24,7 @@
         <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
 
-    <record id="base.group_mono_salesteams" model="res.groups">
-        <field name="name">Do Not Use Sales Teams</field>
-        <field name="category_id" ref="base.module_category_hidden"/>
-    </record>
-    <record id="base.group_user" model="res.groups">
-        <field name="implied_ids" eval="[(4, ref('base.group_mono_salesteams'))]"/>
-    </record>
-
-    <record id="base.group_multi_salesteams" model="res.groups">
-        <field name="name">Manage Sales Teams</field>
-        <field name="category_id" ref="base.module_category_hidden"/>
-    </record>
-    
+        
     <record id="group_fund_raising" model="res.groups">
         <field name="name">Manage Fund Raising</field>
         <field name="category_id" ref="base.module_category_hidden"/>
diff --git a/addons/crm/security/ir.model.access.csv b/addons/crm/security/ir.model.access.csv
index f3c6bdf5c1f..fde894e4c31 100644
--- a/addons/crm/security/ir.model.access.csv
+++ b/addons/crm/security/ir.model.access.csv
@@ -5,15 +5,12 @@ access_crm_segmentation,crm.segmentation,model_crm_segmentation,base.group_sale_
 access_crm_segmentation_line,crm.segmentation.line,model_crm_segmentation_line,base.group_sale_manager,1,1,1,1
 access_crm_case_channel_user,crm.case.channel user,model_crm_case_channel,base.group_sale_salesman,1,0,0,0
 access_crm_case_channel_manager,crm.case.channel manager,model_crm_case_channel,base.group_sale_manager,1,1,1,1
-access_crm_case_section,crm.case.section,model_crm_case_section,base.group_user,1,0,0,0
 access_crm_case_categ,crm.case.categ,model_crm_case_categ,base.group_sale_salesman,1,1,1,0
 access_crm_lead_manager,crm.lead.manager,model_crm_lead,base.group_sale_manager,1,1,1,1
 access_crm_phonecall_manager,crm.phonecall.manager,model_crm_phonecall,base.group_sale_manager,1,1,1,1
 access_crm_case_categ,crm.case.categ,model_crm_case_categ,base.group_user,1,0,0,0
 access_crm_lead,crm.lead,model_crm_lead,base.group_sale_salesman,1,1,1,0
 access_crm_phonecall,crm.phonecall,model_crm_phonecall,base.group_sale_salesman,1,1,1,0
-access_crm_case_section_user,crm.case.section.user,model_crm_case_section,base.group_sale_salesman,1,0,0,0
-access_crm_case_section_manager,crm.case.section.manager,model_crm_case_section,base.group_sale_manager,1,1,1,1
 access_crm_case_stage,crm.case.stage,model_crm_case_stage,,1,0,0,0
 access_crm_case_stage_manager,crm.case.stage,model_crm_case_stage,base.group_sale_manager,1,1,1,1
 access_crm_case_resource_type_user,crm_case_resource_type user,model_crm_case_resource_type,base.group_sale_salesman,1,1,1,0
diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py
index bb5bac89e46..44cbb3227ca 100644
--- a/addons/sale/__openerp__.py
+++ b/addons/sale/__openerp__.py
@@ -59,7 +59,7 @@ The Dashboard for the Sales Manager will include
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'images': ['images/sale_dashboard.jpeg','images/Sale_order_line_to_invoice.jpeg','images/sale_order.jpeg','images/sales_analysis.jpeg'],
-    'depends': ['account_voucher'],
+    'depends': ['sale_team','account_voucher'],
     'data': [
         'wizard/sale_make_invoice_advance.xml',
         'wizard/sale_line_invoice.xml',
@@ -73,6 +73,7 @@ The Dashboard for the Sales Manager will include
         'sale_view.xml',
         'res_partner_view.xml',
         'report/sale_report_view.xml',
+        'report/sale_analysis_report_view.xml',
         'process/sale_process.xml',
         'board_sale_view.xml',
         'edi/sale_order_action_data.xml',
diff --git a/addons/sale/report/__init__.py b/addons/sale/report/__init__.py
index 12d484c3e25..f1d48dd38e9 100644
--- a/addons/sale/report/__init__.py
+++ b/addons/sale/report/__init__.py
@@ -18,7 +18,8 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-
+import sales_crm_account_invoice_report
 import sale_report
+import sale_analysis_report
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale_crm/report/sale_report.py b/addons/sale/report/sale_analysis_report.py
similarity index 100%
rename from addons/sale_crm/report/sale_report.py
rename to addons/sale/report/sale_analysis_report.py
diff --git a/addons/sale_crm/report/sale_report_view.xml b/addons/sale/report/sale_analysis_report_view.xml
similarity index 100%
rename from addons/sale_crm/report/sale_report_view.xml
rename to addons/sale/report/sale_analysis_report_view.xml
diff --git a/addons/sale_crm/report/sales_crm_account_invoice_report.py b/addons/sale/report/sales_crm_account_invoice_report.py
similarity index 100%
rename from addons/sale_crm/report/sales_crm_account_invoice_report.py
rename to addons/sale/report/sales_crm_account_invoice_report.py
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 667f15a375d..93e4d90f612 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -18,9 +18,11 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-
-from datetime import datetime, timedelta
+import calendar
+from openerp import tools
+from datetime import date, datetime, timedelta
 from dateutil.relativedelta import relativedelta
+from dateutil import relativedelta
 import time
 from openerp.osv import fields, osv
 from openerp.tools.translate import _
@@ -162,6 +164,11 @@ class sale_order(osv.osv):
         if not company_id:
             raise osv.except_osv(_('Error!'), _('There is no default company for the current user!'))
         return company_id
+    
+    def _get_default_section_id(self, cr, uid, context=None):
+        """ Gives default section by checking if present in the context """
+        section_id = self.pool.get('res.users').browse(cr, uid, uid, context).default_section_id.id or False
+        return section_id
 
     _columns = {
         'name': fields.char('Order Reference', size=64, required=True,
@@ -226,6 +233,7 @@ class sale_order(osv.osv):
         'payment_term': fields.many2one('account.payment.term', 'Payment Term'),
         'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position'),
         'company_id': fields.many2one('res.company', 'Company'),
+        'section_id': fields.many2one('crm.case.section', 'Sales Team'),
     }
     _defaults = {
         'date_order': fields.date.context_today,
@@ -237,7 +245,9 @@ class sale_order(osv.osv):
         'invoice_quantity': 'order',
         'partner_invoice_id': lambda self, cr, uid, context: context.get('partner_id', False) and self.pool.get('res.partner').address_get(cr, uid, [context['partner_id']], ['invoice'])['invoice'],
         'partner_shipping_id': lambda self, cr, uid, context: context.get('partner_id', False) and self.pool.get('res.partner').address_get(cr, uid, [context['partner_id']], ['delivery'])['delivery'],
-        'note': lambda self, cr, uid, context: self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.sale_note
+        'note': lambda self, cr, uid, context: self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.sale_note,
+        'section_id': lambda s, cr, uid, c: s._get_default_section_id(cr, uid, c),
+        
     }
     _sql_constraints = [
         ('name_uniq', 'unique(name, company_id)', 'Order Reference must be unique per Company!'),
@@ -372,12 +382,14 @@ class sale_order(osv.osv):
             'fiscal_position': order.fiscal_position.id or order.partner_id.property_account_position.id,
             'date_invoice': context.get('date_invoice', False),
             'company_id': order.company_id.id,
-            'user_id': order.user_id and order.user_id.id or False
+            'user_id': order.user_id and order.user_id.id or False,
+            'section_id' : order.section_id.id
         }
 
         # Care for deprecated _inv_get() hook - FIXME: to be removed after 6.1
         invoice_vals.update(self._inv_get(cr, uid, order, context=context))
         return invoice_vals
+        
 
     def _make_invoice(self, cr, uid, order, lines, context=None):
         inv_obj = self.pool.get('account.invoice')
@@ -1000,11 +1012,14 @@ class mail_compose_message(osv.Model):
             context = dict(context, mail_post_autofollow=True)
             self.pool.get('sale.order').signal_quotation_sent(cr, uid, [context['default_res_id']])
         return super(mail_compose_message, self).send_mail(cr, uid, ids, context=context)
-
+        
 
 class account_invoice(osv.Model):
     _inherit = 'account.invoice'
-
+    _columns = {
+        'section_id': fields.many2one('crm.case.section', 'Sales Team'),
+    }
+    
     def confirm_paid(self, cr, uid, ids, context=None):
         sale_order_obj = self.pool.get('sale.order')
         res = super(account_invoice, self).confirm_paid(cr, uid, ids, context=context)
@@ -1023,5 +1038,59 @@ class account_invoice(osv.Model):
             for id in ids:
                 workflow.trg_validate(uid, 'account.invoice', id, 'invoice_cancel', cr)
         return super(account_invoice, self).unlink(cr, uid, ids, context=context)
+        
+    _defaults = {
+       'section_id': lambda self, cr, uid, c=None: self.pool.get('res.users').browse(cr, uid, uid, c).default_section_id.id or False,
+    }
+        
+class crm_case_section(osv.osv):
+    _inherit = 'crm.case.section'
+
+    def _get_sale_orders_data(self, cr, uid, ids, field_name, arg, context=None):
+        obj = self.pool.get('sale.order')
+        res = dict.fromkeys(ids, False)
+        month_begin = date.today().replace(day=1)
+        date_begin = (month_begin - relativedelta.relativedelta(months=self._period_number - 1)).strftime(tools.DEFAULT_SERVER_DATE_FORMAT)
+        date_end = month_begin.replace(day=calendar.monthrange(month_begin.year, month_begin.month)[1]).strftime(tools.DEFAULT_SERVER_DATE_FORMAT)
+        for id in ids:
+            res[id] = dict()
+            created_domain = [('section_id', '=', id), ('state', '=', ['draft']), ('date_order', '>=', date_begin), ('date_order', '<=', date_end)]
+            res[id]['monthly_quoted'] = self.__get_bar_values(cr, uid, obj, created_domain, ['amount_total', 'date_order'], 'amount_total', 'date_order', context=context)
+            validated_domain = [('section_id', '=', id), ('state', 'not in', ['draft', 'sent', 'cancel']), ('date_order', '>=', date_begin), ('date_order', '<=', date_end)]
+            res[id]['monthly_confirmed'] = self.__get_bar_values(cr, uid, obj, validated_domain, ['amount_total', 'date_order'], 'amount_total', 'date_order', context=context)
+        return res
+
+    def _get_invoices_data(self, cr, uid, ids, field_name, arg, context=None):
+        obj = self.pool.get('account.invoice.report')
+        res = dict.fromkeys(ids, False)
+        month_begin = date.today().replace(day=1)
+        date_begin = (month_begin - relativedelta.relativedelta(months=self._period_number - 1)).strftime(tools.DEFAULT_SERVER_DATE_FORMAT)
+        date_end = month_begin.replace(day=calendar.monthrange(month_begin.year, month_begin.month)[1]).strftime(tools.DEFAULT_SERVER_DATE_FORMAT)
+        for id in ids:
+            created_domain = [('section_id', '=', id), ('state', 'not in', ['draft', 'cancel']), ('date', '>=', date_begin), ('date', '<=', date_end)]
+            res[id] = self.__get_bar_values(cr, uid, obj, created_domain, ['price_total', 'date'], 'price_total', 'date', context=context)
+        return res
+
+    _columns = {
+        'invoiced_forecast': fields.integer(string='Invoice Forecast',
+            help="Forecast of the invoice revenue for the current month. This is the amount the sales \n"
+                    "team should invoice this month. It is used to compute the progression ratio \n"
+                    " of the current and forecast revenue on the kanban view."),
+        'invoiced_target': fields.integer(string='Invoice Target',
+            help="Target of invoice revenue for the current month. This is the amount the sales \n"
+                    "team estimates to be able to invoice this month."),
+        'monthly_quoted': fields.function(_get_sale_orders_data,
+            type='string', readonly=True, multi='_get_sale_orders_data',
+            string='Rate of created quotation per duration'),
+        'monthly_confirmed': fields.function(_get_sale_orders_data,
+            type='string', readonly=True, multi='_get_sale_orders_data',
+            string='Rate of validate sales orders per duration'),
+        'monthly_invoiced': fields.function(_get_invoices_data,
+            type='string', readonly=True,
+            string='Rate of sent invoices per duration'),
+    }
+
+    def action_forecast(self, cr, uid, id, value, context=None):
+        return self.write(cr, uid, [id], {'invoiced_forecast': round(float(value))}, context=context)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index c9ffb94b985..9a6ef2a2e32 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -202,6 +202,7 @@
                             <group>
                                 <group name="sales_person" groups="base.group_user">
                                     <field name="user_id" context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'account.group_account_invoice', 'base.group_sale_salesman_all_leads']}"/>
+                                    <field name="section_id" options="{'no_create': True}" groups="base.group_multi_salesteams"/>
                                     <field groups="base.group_no_one" name="origin"/>
                                 </group>
                                 <group name="sale_pay">
@@ -255,12 +256,14 @@
                     <filter string="My" domain="[('user_id','=',uid)]" help="My Sales Orders" icon="terp-personal" name="my_sale_orders_filter"/>
                     <field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/>
                     <field name="user_id"/>
+                    <field name="section_id" string="Sales Team" groups="base.group_multi_salesteams"/>
                     <field name="project_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Order Month" icon="terp-go-month" domain="[]" context="{'group_by':'date_order'}"/>
+                        <filter string="My Sales Team(s)" icon="terp-personal+" domain="[('section_id.user_id','=',uid)]" help="My Sales Team(s)"  groups="base.group_multi_salesteams"/>
                     </group>
                </search>
             </field>
@@ -518,5 +521,239 @@
                 </xpath>
             </field>
         </record>
+        
+       <!-- Update account invoice list view!-->
+        <record model="ir.ui.view" id="account_invoice_tree">
+            <field name="name">Account Invoice</field>
+            <field name="model">account.invoice</field>
+            <field name="inherit_id" ref="account.invoice_tree"/>
+            <field name="arch" type="xml">
+                <data>
+                    <xpath expr="//field[@name='user_id']" position="after">
+                        <field name="section_id" string="Sales Team" groups="base.group_multi_salesteams"/>
+                    </xpath>
+                </data>
+            </field>
+        </record>
+
+        <!-- Update account invoice search view!-->
+        <record id="account_invoice_groupby_inherit" model="ir.ui.view">
+            <field name="name">account.invoice.groupby</field>
+            <field name="model">account.invoice</field>
+            <field name="inherit_id" ref="account.view_account_invoice_filter"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='user_id']" position="after">
+                    <field name="section_id"/>
+                </xpath>
+                <xpath expr="//group/filter[@string='Due Month']" position="after">
+                    <filter string="Sales Team" domain="[]" context="{'group_by':'section_id'}" groups="base.group_multi_salesteams"/>
+                </xpath>
+            </field>
+        </record>
+
+        <!-- Update account invoice !-->
+        <record model="ir.ui.view" id="account_invoice_form">
+            <field name="name">Account Invoice</field>
+            <field name="model">account.invoice</field>
+            <field name="inherit_id" ref="account.invoice_form"/>
+            <field name="arch" type="xml">
+                <data>
+                    <xpath expr="//field[@name='user_id']" position="after">
+                        <field name="section_id" groups="base.group_multi_salesteams"/>
+                    </xpath>
+                </data>
+            </field>
+        </record>
+
+       
+        <!-- search by Salesteams -->
+
+        <record id="action_orders_salesteams" model="ir.actions.act_window">
+            <field name="name">Sales Orders</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">sale.order</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form,calendar,graph</field>
+            <field name="search_view_id" ref="sale.view_sales_order_filter"/>
+            <field name="domain">[('state','not in',('draft','sent','cancel'))]</field>
+            <field name="context">{
+                    'search_default_section_id': [active_id],
+                    'default_section_id': active_id,
+                }
+            </field>
+            <field name="help" type="html">
+              <p class="oe_view_nocontent_create">
+                Click to create a quotation that can be converted into a sales
+                order.
+              </p><p>
+                OpenERP will help you efficiently handle the complete sales flow:
+                quotation, sales order, delivery, invoicing and payment.
+              </p>
+            </field>
+        </record>
+
+        <record id="action_quotations_salesteams" model="ir.actions.act_window">
+            <field name="name">Quotations</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">sale.order</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="sale.view_quotation_tree"/>
+            <field name="view_mode">tree,form,calendar,graph</field>
+            <field name="context">{
+                    'search_default_section_id': [active_id],
+                    'default_section_id': active_id,
+                    'show_address': 1,
+                }
+            </field>
+            <field name="domain">[('state','in',('draft','sent','cancel'))]</field>
+            <field name="search_view_id" ref="sale.view_sales_order_filter"/>
+            <field name="help" type="html">
+              <p class="oe_view_nocontent_create">
+                Click to create a quotation, the first step of a new sale.
+              </p><p>
+                OpenERP will help you handle efficiently the complete sale flow:
+                from the quotation to the sales order, the
+                delivery, the invoicing and the payment collection.
+              </p><p>
+                The social feature helps you organize discussions on each sales
+                order, and allow your customers to keep track of the evolution
+                of the sales order.
+              </p>
+            </field>
+        </record>
+
+        <record id="action_invoice_salesteams" model="ir.actions.act_window">
+            <field name="name">Invoices</field>
+            <field name="res_model">account.invoice</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form,calendar,graph</field>
+            <field name="view_id" ref="account.invoice_tree"/>
+            <field name="domain">[
+                ('state', 'not in', ['draft', 'cancel']),
+                ('type', '=', 'out_invoice')]</field>
+            <field name="context">{
+                    'search_default_section_id': [active_id],
+                    'default_section_id': active_id,
+                    'default_type':'out_invoice',
+                    'type':'out_invoice',
+                    'journal_type': 'sale',
+                }
+            </field>
+            <field name="search_view_id" ref="account.view_account_invoice_filter"/>
+        </record>
+
+        <record id="action_invoice_salesteams_view_tree" model="ir.actions.act_window.view">
+            <field name="sequence">1</field>
+            <field name="view_mode">tree</field>
+            <field name="act_window_id" ref="sale.action_invoice_salesteams"/>
+        </record>
+
+        <record id="action_invoice_salesteams_view_form" model="ir.actions.act_window.view">
+            <field name="sequence">2</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="account.invoice_form"/>
+            <field name="act_window_id" ref="sale.action_invoice_salesteams"/>
+        </record>
+
+        <record id="action_order_report_quotation_salesteam" model="ir.actions.act_window">
+            <field name="name">Quotations Analysis</field>
+            <field name="res_model">sale.report</field>
+            <field name="view_mode">graph</field>
+            <field name="domain">[('state','=','draft'),('section_id', '=', active_id)]</field>
+            <field name="context">{'search_default_order_month':1}</field>
+            <field name="help">This report performs analysis on your quotations. Analysis check your sales revenues and sort it by different group criteria (salesman, partner, product, etc.) Use this report to perform analysis on sales not having invoiced yet. If you want to analyse your turnover, you should use the Invoice Analysis report in the Accounting application.</field>
+        </record>
+
+        <record id="action_order_report_so_salesteam" model="ir.actions.act_window">
+            <field name="name">Sales Analysis</field>
+            <field name="res_model">sale.report</field>
+            <field name="view_mode">graph</field>
+            <field name="domain">[('state','not in',('draft','sent','cancel')),('section_id', '=', active_id)]</field>
+            <field name="context">{'search_default_order_month':1}</field>
+            <field name="help">This report performs analysis on your sales orders. Analysis check your sales revenues and sort it by different group criteria (salesman, partner, product, etc.) Use this report to perform analysis on sales not having invoiced yet. If you want to analyse your turnover, you should use the Invoice Analysis report in the Accounting application.</field>
+        </record>
+
+        <record id="action_account_invoice_report_salesteam" model="ir.actions.act_window">
+            <field name="name">Invoices Analysis</field>
+            <field name="res_model">account.invoice.report</field>
+            <field name="view_mode">graph</field>
+            <field name="domain">[('section_id', '=', active_id),('state', 'not in', ['draft', 'cancel'])]</field>
+            <field name="context">{'search_default_month':1}</field>
+            <field name="help">From this report, you can have an overview of the amount invoiced to your customer. The tool search can also be used to personalise your Invoices reports and so, match this analysis to your needs.</field>
+        </record>
+
+        <record id="crm_case_section_salesteams_view_form" model="ir.ui.view">
+            <field name="name">crm.case.section.form</field>
+            <field name="model">crm.case.section</field>
+            <field name="inherit_id" ref="sale_team.crm_case_section_view_form"/>
+            <field name="arch" type="xml">
+            <data>
+                <xpath expr="//field[@name='code']" position="after">
+                    <field name="invoiced_target"/>
+                    <field name="invoiced_forecast"/>
+                </xpath>
+            </data>
+            </field>
+        </record>
+
+        <record id="crm_case_section_salesteams_view_kanban" model="ir.ui.view">
+            <field name="name">crm.case.section.kanban</field>
+            <field name="model">crm.case.section</field>
+            <field name="inherit_id" ref="sale_team.crm_case_section_salesteams_view_kanban"/>
+            <field name="arch" type="xml">
+            <data>
+                <xpath expr="//field[@name='name']" position="after">
+                    <field name="monthly_quoted"/>
+                    <field name="monthly_confirmed"/>
+                    <field name="monthly_invoiced"/>
+                    <field name="invoiced_forecast"/>
+                    <field name="invoiced_target"/>
+                </xpath>
+                <xpath expr="//div[@class='oe_clear']" position="before">
+                    <div class="oe_items_list">
+                         <div class="oe_salesteams_quotations">
+                            <a name="%(action_quotations_salesteams)d" type="action" class="oe_sparkline_bar_link">Quotations</a>
+                            <a name="%(action_order_report_quotation_salesteam)d" type="action" class="oe_sparkline_bar_link">
+                                <field name="monthly_quoted" widget="sparkline_bar" options="{'delayIn': '3000'}">
+                                    Revenue of created quotations per month.<br/>Click to see a detailed analysis.
+                                </field>
+                            </a>
+                        </div>
+                    </div>
+                    <div class="oe_items_list">
+                        <div class="oe_salesteams_orders">
+                            <a name="%(action_orders_salesteams)d" type="action">Sales Orders</a>
+                            <a name="%(action_order_report_so_salesteam)d" type="action" class="oe_sparkline_bar_link">
+                                <field name="monthly_confirmed" widget="sparkline_bar" options="{'delayIn': '3000'}">
+                                    Revenue of confirmed sales orders per month.<br/>Click to acces the Sales Analysis.
+                                </field>
+                            </a>
+                        </div>
+                    </div>
+                    <div class="oe_items_list">
+                        <div class="oe_salesteams_invoices" groups="account.group_account_invoice">
+                            <a name="%(action_invoice_salesteams)d" type="action">Invoices</a>
+                            <a name="%(action_account_invoice_report_salesteam)d" type="action" class="oe_sparkline_bar_link">
+                                <field name="monthly_invoiced" widget="sparkline_bar" options="{'delayIn': '3000'}">
+                                    Revenue of sent invoices per month.<br/>Click to see a detailed analysis of invoices.
+                                </field>
+                            </a>
+                        </div>
+                    </div>
+                </xpath>
+                <xpath expr="//div[@class='oe_clear']" position="after">
+                    <div class="oe_center" t-if="record.invoiced_target.raw_value">
+                        <field name="monthly_invoiced" widget="gauge" style="width:160px; height: 120px; cursor: pointer;"
+                            options="{'max_field': 'invoiced_target'}">Invoiced</field>
+                        <field name="invoiced_forecast" widget="gauge" style="width:160px; height: 120px; cursor: pointer;"
+                            options="{'max_field': 'invoiced_target', 'on_change': 'action_forecast'}">Forecast</field>
+                    </div>
+                    <div class="oe_center oe_salesteams_help" style="color:#bbbbbb;" t-if="!record.invoiced_target.raw_value">
+                        <br/>Define an invoicing target in the sales team settings to see the period's achievement and forecast at a glance.
+                    </div>
+                </xpath>
+            </data>
+           </field>
+        </record>
     </data>
 </openerp>
diff --git a/addons/sale_crm/report/__init__.py b/addons/sale_crm/report/__init__.py
index d86b3e66de9..3fd45ac3f8f 100644
--- a/addons/sale_crm/report/__init__.py
+++ b/addons/sale_crm/report/__init__.py
@@ -19,8 +19,8 @@
 #
 ##############################################################################
 
-import sales_crm_account_invoice_report
-import sale_report
+
+
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/sale_crm/sale_crm.py b/addons/sale_crm/sale_crm.py
index 9bcb5adf6ae..510daf30c3b 100644
--- a/addons/sale_crm/sale_crm.py
+++ b/addons/sale_crm/sale_crm.py
@@ -26,117 +26,11 @@ from dateutil import relativedelta
 from openerp import tools
 from openerp.osv import osv, fields
 
-class res_users(osv.Model):
-    _inherit = 'res.users'
-    _columns = {
-        'default_section_id': fields.many2one('crm.case.section', 'Default Sales Team'),
-    }
-
-    def __init__(self, pool, cr):
-        init_res = super(res_users, self).__init__(pool, cr)
-        # duplicate list to avoid modifying the original reference
-        self.SELF_WRITEABLE_FIELDS = list(self.SELF_WRITEABLE_FIELDS)
-        self.SELF_WRITEABLE_FIELDS.extend(['default_section_id'])
-        return init_res
-
 class sale_order(osv.osv):
     _inherit = 'sale.order'
     _columns = {
-        'section_id': fields.many2one('crm.case.section', 'Sales Team'),
         'categ_ids': fields.many2many('crm.case.categ', 'sale_order_category_rel', 'order_id', 'category_id', 'Categories', \
             domain="['|',('section_id','=',section_id),('section_id','=',False), ('object_id.model', '=', 'crm.lead')]", context="{'object_name': 'crm.lead'}")
     }
-
-    def _get_default_section_id(self, cr, uid, context=None):
-        """ Gives default section by checking if present in the context """
-        section_id = self.pool.get('crm.lead')._resolve_section_id_from_context(cr, uid, context=context) or False
-        if not section_id:
-            section_id = self.pool.get('res.users').browse(cr, uid, uid, context).default_section_id.id or False
-        return section_id
-
-    _defaults = {
-        'section_id': lambda s, cr, uid, c: s._get_default_section_id(cr, uid, c),
-    }
-
-    def _prepare_invoice(self, cr, uid, order, lines, context=None):
-        invoice_vals = super(sale_order, self)._prepare_invoice(cr, uid, order, lines, context=context)
-        if order.section_id and order.section_id.id:
-            invoice_vals['section_id'] = order.section_id.id
-        return invoice_vals
-
-
-class crm_case_section(osv.osv):
-    _inherit = 'crm.case.section'
-
-    def _get_sale_orders_data(self, cr, uid, ids, field_name, arg, context=None):
-        obj = self.pool.get('sale.order')
-        res = dict.fromkeys(ids, False)
-        month_begin = date.today().replace(day=1)
-        date_begin = (month_begin - relativedelta.relativedelta(months=self._period_number - 1)).strftime(tools.DEFAULT_SERVER_DATE_FORMAT)
-        date_end = month_begin.replace(day=calendar.monthrange(month_begin.year, month_begin.month)[1]).strftime(tools.DEFAULT_SERVER_DATE_FORMAT)
-        for id in ids:
-            res[id] = dict()
-            created_domain = [('section_id', '=', id), ('state', '=', ['draft']), ('date_order', '>=', date_begin), ('date_order', '<=', date_end)]
-            res[id]['monthly_quoted'] = self.__get_bar_values(cr, uid, obj, created_domain, ['amount_total', 'date_order'], 'amount_total', 'date_order', context=context)
-            validated_domain = [('section_id', '=', id), ('state', 'not in', ['draft', 'sent', 'cancel']), ('date_order', '>=', date_begin), ('date_order', '<=', date_end)]
-            res[id]['monthly_confirmed'] = self.__get_bar_values(cr, uid, obj, validated_domain, ['amount_total', 'date_order'], 'amount_total', 'date_order', context=context)
-        return res
-
-    def _get_invoices_data(self, cr, uid, ids, field_name, arg, context=None):
-        obj = self.pool.get('account.invoice.report')
-        res = dict.fromkeys(ids, False)
-        month_begin = date.today().replace(day=1)
-        date_begin = (month_begin - relativedelta.relativedelta(months=self._period_number - 1)).strftime(tools.DEFAULT_SERVER_DATE_FORMAT)
-        date_end = month_begin.replace(day=calendar.monthrange(month_begin.year, month_begin.month)[1]).strftime(tools.DEFAULT_SERVER_DATE_FORMAT)
-        for id in ids:
-            created_domain = [('section_id', '=', id), ('state', 'not in', ['draft', 'cancel']), ('date', '>=', date_begin), ('date', '<=', date_end)]
-            res[id] = self.__get_bar_values(cr, uid, obj, created_domain, ['price_total', 'date'], 'price_total', 'date', context=context)
-        return res
-
-    _columns = {
-        'invoiced_forecast': fields.integer(string='Invoice Forecast',
-            help="Forecast of the invoice revenue for the current month. This is the amount the sales \n"
-                    "team should invoice this month. It is used to compute the progression ratio \n"
-                    " of the current and forecast revenue on the kanban view."),
-        'invoiced_target': fields.integer(string='Invoice Target',
-            help="Target of invoice revenue for the current month. This is the amount the sales \n"
-                    "team estimates to be able to invoice this month."),
-        'monthly_quoted': fields.function(_get_sale_orders_data,
-            type='string', readonly=True, multi='_get_sale_orders_data',
-            string='Rate of created quotation per duration'),
-        'monthly_confirmed': fields.function(_get_sale_orders_data,
-            type='string', readonly=True, multi='_get_sale_orders_data',
-            string='Rate of validate sales orders per duration'),
-        'monthly_invoiced': fields.function(_get_invoices_data,
-            type='string', readonly=True,
-            string='Rate of sent invoices per duration'),
-    }
-
-    def action_forecast(self, cr, uid, id, value, context=None):
-        return self.write(cr, uid, [id], {'invoiced_forecast': round(float(value))}, context=context)
-
-class sale_crm_lead(osv.Model):
-    _inherit = 'crm.lead'
-
-    def on_change_user(self, cr, uid, ids, user_id, context=None):
-        """ Override of on change user_id on lead/opportunity; when having sale
-            the new logic is :
-            - use user.default_section_id
-            - or fallback on previous behavior """
-        if user_id:
-            user = self.pool.get('res.users').browse(cr, uid, user_id, context=context)
-            if user.default_section_id and user.default_section_id.id:
-                return {'value': {'section_id': user.default_section_id.id}}
-        return super(sale_crm_lead, self).on_change_user(cr, uid, ids, user_id, context=context)
-
-
-class account_invoice(osv.osv):
-    _inherit = 'account.invoice'
-    _columns = {
-        'section_id': fields.many2one('crm.case.section', 'Sales Team'),
-    }
-    _defaults = {
-        'section_id': lambda self, cr, uid, c=None: self.pool.get('res.users').browse(cr, uid, uid, c).default_section_id.id or False,
-    }
-
+    
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index 88d7fe8be6c..102eb9462fa 100644
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -27,285 +27,9 @@
             <field name="inherit_id" ref="sale.view_order_form"/>
             <field name="arch" type="xml">
                 <field name="user_id" position="after">
-                    <field name="section_id" options="{'no_create': True}" groups="base.group_multi_salesteams"/>
                     <field name="categ_ids" widget="many2many_tags"/>
                 </field>
             </field>
         </record>
-
-        <record id="view_sales_order_filter_inherit" model="ir.ui.view">
-            <field name="name">sale.order.list.select</field>
-            <field name="model">sale.order</field>
-            <field name="inherit_id" ref="sale.view_sales_order_filter"/>
-            <field name="arch" type="xml">
-                <xpath expr="//filter[@name='my_sale_orders_filter']" position="after">
-                    <separator/>
-                    <filter string="My Sales Team(s)"
-                        icon="terp-personal+"
-                        domain="[('section_id.user_id','=',uid)]"
-                        help="My Sales Team(s)"  groups="base.group_multi_salesteams"/>
-                </xpath>
-                <xpath expr="//field[@name='user_id']" position="after">
-                    <field name="section_id" string="Sales Team" groups="base.group_multi_salesteams"/>
-                </xpath>
-            </field>
-        </record>
-
-        <!-- Update account invoice list view!-->
-        <record model="ir.ui.view" id="account_invoice_tree">
-            <field name="name">Account Invoice</field>
-            <field name="model">account.invoice</field>
-            <field name="inherit_id" ref="account.invoice_tree"/>
-            <field name="arch" type="xml">
-                <data>
-                    <xpath expr="//field[@name='user_id']" position="after">
-                        <field name="section_id" string="Sales Team" groups="base.group_multi_salesteams"/>
-                    </xpath>
-                </data>
-            </field>
-        </record>
-
-        <!-- Update account invoice search view!-->
-        <record id="account_invoice_groupby_inherit" model="ir.ui.view">
-            <field name="name">account.invoice.groupby</field>
-            <field name="model">account.invoice</field>
-            <field name="inherit_id" ref="account.view_account_invoice_filter"/>
-            <field name="arch" type="xml">
-                <xpath expr="//field[@name='user_id']" position="after">
-                    <field name="section_id"/>
-                </xpath>
-                <xpath expr="//group/filter[@string='Due Month']" position="after">
-                    <filter string="Sales Team" domain="[]" context="{'group_by':'section_id'}" groups="base.group_multi_salesteams"/>
-                </xpath>
-            </field>
-        </record>
-
-        <!-- Update account invoice !-->
-        <record model="ir.ui.view" id="account_invoice_form">
-            <field name="name">Account Invoice</field>
-            <field name="model">account.invoice</field>
-            <field name="inherit_id" ref="account.invoice_form"/>
-            <field name="arch" type="xml">
-                <data>
-                    <xpath expr="//field[@name='user_id']" position="after">
-                        <field name="section_id" groups="base.group_multi_salesteams"/>
-                    </xpath>
-                </data>
-            </field>
-        </record>
-
-        <!-- Update user form !-->
-        <record model="ir.ui.view" id="res_user_form">
-            <field name="name">Users Preferences</field>
-            <field name="model">res.users</field>
-            <field name="inherit_id" ref="base.view_users_form"/>
-            <field name="arch" type="xml">
-                <data>
-                    <xpath expr="//field[@name='tz']" position="after">
-                        <field name="default_section_id"/>
-                    </xpath>
-                </data>
-            </field>
-        </record>
-
-        <!-- Update Preferences form !-->
-        <record id="view_users_form_preferences" model="ir.ui.view">
-            <field name="name">res.users.preferences.form</field>
-            <field name="model">res.users</field>
-            <field name="inherit_id" ref="base.view_users_form_simple_modif"/>
-            <field name="arch" type="xml">
-            <data>
-                    <xpath expr="//field[@name='company_id']" position="before">
-                        <field name="default_section_id" readonly="0"/>
-                    </xpath>
-                </data>
-            </field>
-        </record>
-
-        <!-- search by Salesteams -->
-
-        <record id="action_orders_salesteams" model="ir.actions.act_window">
-            <field name="name">Sales Orders</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">sale.order</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form,calendar,graph</field>
-            <field name="search_view_id" ref="sale.view_sales_order_filter"/>
-            <field name="domain">[('state','not in',('draft','sent','cancel'))]</field>
-            <field name="context">{
-                    'search_default_section_id': [active_id],
-                    'default_section_id': active_id,
-                }
-            </field>
-            <field name="help" type="html">
-              <p class="oe_view_nocontent_create">
-                Click to create a quotation that can be converted into a sales
-                order.
-              </p><p>
-                OpenERP will help you efficiently handle the complete sales flow:
-                quotation, sales order, delivery, invoicing and payment.
-              </p>
-            </field>
-        </record>
-
-        <record id="action_quotations_salesteams" model="ir.actions.act_window">
-            <field name="name">Quotations</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">sale.order</field>
-            <field name="view_type">form</field>
-            <field name="view_id" ref="sale.view_quotation_tree"/>
-            <field name="view_mode">tree,form,calendar,graph</field>
-            <field name="context">{
-                    'search_default_section_id': [active_id],
-                    'default_section_id': active_id,
-                    'show_address': 1,
-                }
-            </field>
-            <field name="domain">[('state','in',('draft','sent','cancel'))]</field>
-            <field name="search_view_id" ref="sale.view_sales_order_filter"/>
-            <field name="help" type="html">
-              <p class="oe_view_nocontent_create">
-                Click to create a quotation, the first step of a new sale.
-              </p><p>
-                OpenERP will help you handle efficiently the complete sale flow:
-                from the quotation to the sales order, the
-                delivery, the invoicing and the payment collection.
-              </p><p>
-                The social feature helps you organize discussions on each sales
-                order, and allow your customers to keep track of the evolution
-                of the sales order.
-              </p>
-            </field>
-        </record>
-
-        <record id="action_invoice_salesteams" model="ir.actions.act_window">
-            <field name="name">Invoices</field>
-            <field name="res_model">account.invoice</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form,calendar,graph</field>
-            <field name="view_id" ref="account.invoice_tree"/>
-            <field name="domain">[
-                ('state', 'not in', ['draft', 'cancel']),
-                ('type', '=', 'out_invoice')]</field>
-            <field name="context">{
-                    'search_default_section_id': [active_id],
-                    'default_section_id': active_id,
-                    'default_type':'out_invoice',
-                    'type':'out_invoice',
-                    'journal_type': 'sale',
-                }
-            </field>
-            <field name="search_view_id" ref="account.view_account_invoice_filter"/>
-        </record>
-
-        <record id="action_invoice_salesteams_view_tree" model="ir.actions.act_window.view">
-            <field name="sequence">1</field>
-            <field name="view_mode">tree</field>
-            <field name="act_window_id" ref="sale_crm.action_invoice_salesteams"/>
-        </record>
-
-        <record id="action_invoice_salesteams_view_form" model="ir.actions.act_window.view">
-            <field name="sequence">2</field>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="account.invoice_form"/>
-            <field name="act_window_id" ref="sale_crm.action_invoice_salesteams"/>
-        </record>
-
-        <record id="action_order_report_quotation_salesteam" model="ir.actions.act_window">
-            <field name="name">Quotations Analysis</field>
-            <field name="res_model">sale.report</field>
-            <field name="view_mode">graph</field>
-            <field name="domain">[('state','=','draft'),('section_id', '=', active_id)]</field>
-            <field name="context">{'search_default_order_month':1}</field>
-            <field name="help">This report performs analysis on your quotations. Analysis check your sales revenues and sort it by different group criteria (salesman, partner, product, etc.) Use this report to perform analysis on sales not having invoiced yet. If you want to analyse your turnover, you should use the Invoice Analysis report in the Accounting application.</field>
-        </record>
-
-        <record id="action_order_report_so_salesteam" model="ir.actions.act_window">
-            <field name="name">Sales Analysis</field>
-            <field name="res_model">sale.report</field>
-            <field name="view_mode">graph</field>
-            <field name="domain">[('state','not in',('draft','sent','cancel')),('section_id', '=', active_id)]</field>
-            <field name="context">{'search_default_order_month':1}</field>
-            <field name="help">This report performs analysis on your sales orders. Analysis check your sales revenues and sort it by different group criteria (salesman, partner, product, etc.) Use this report to perform analysis on sales not having invoiced yet. If you want to analyse your turnover, you should use the Invoice Analysis report in the Accounting application.</field>
-        </record>
-
-        <record id="action_account_invoice_report_salesteam" model="ir.actions.act_window">
-            <field name="name">Invoices Analysis</field>
-            <field name="res_model">account.invoice.report</field>
-            <field name="view_mode">graph</field>
-            <field name="domain">[('section_id', '=', active_id),('state', 'not in', ['draft', 'cancel'])]</field>
-            <field name="context">{'search_default_month':1}</field>
-            <field name="help">From this report, you can have an overview of the amount invoiced to your customer. The tool search can also be used to personalise your Invoices reports and so, match this analysis to your needs.</field>
-        </record>
-
-        <record id="crm_case_section_salesteams_view_form" model="ir.ui.view">
-            <field name="name">crm.case.section.form</field>
-            <field name="model">crm.case.section</field>
-            <field name="inherit_id" ref="crm.crm_case_section_view_form"/>
-            <field name="arch" type="xml">
-            <data>
-                <xpath expr="//field[@name='code']" position="after">
-                    <field name="invoiced_target"/>
-                    <field name="invoiced_forecast"/>
-                </xpath>
-            </data>
-            </field>
-        </record>
-
-        <record id="crm_case_section_salesteams_view_kanban" model="ir.ui.view">
-            <field name="name">crm.case.section.kanban</field>
-            <field name="model">crm.case.section</field>
-            <field name="inherit_id" ref="crm.crm_case_section_salesteams_view_kanban"/>
-            <field name="arch" type="xml">
-            <data>
-                <xpath expr="//field[@name='name']" position="after">
-                    <field name="monthly_quoted"/>
-                    <field name="monthly_confirmed"/>
-                    <field name="monthly_invoiced"/>
-                    <field name="invoiced_forecast"/>
-                    <field name="invoiced_target"/>
-                </xpath>
-                <xpath expr="//div[@class='oe_salesteams_leads']" position="after">
-                    <div class="oe_salesteams_orders">
-                        <a name="%(action_orders_salesteams)d" type="action">Sales Orders</a>
-                        <a name="%(action_order_report_so_salesteam)d" type="action" class="oe_sparkline_bar_link">
-                            <field name="monthly_confirmed" widget="sparkline_bar" options="{'delayIn': '3000'}">
-                                Revenue of confirmed sales orders per month.<br/>Click to acces the Sales Analysis.
-                            </field>
-                        </a>
-                    </div>
-                </xpath>
-                <xpath expr="//div[@class='oe_salesteams_opportunities']" position="after">
-                    <div class="oe_salesteams_invoices" groups="account.group_account_invoice">
-                        <a name="%(action_invoice_salesteams)d" type="action">Invoices</a>
-                        <a name="%(action_account_invoice_report_salesteam)d" type="action" class="oe_sparkline_bar_link">
-                            <field name="monthly_invoiced" widget="sparkline_bar" options="{'delayIn': '3000'}">
-                                Revenue of sent invoices per month.<br/>Click to see a detailed analysis of invoices.
-                            </field>
-                        </a>
-                    </div>
-                    <div class="oe_salesteams_quotations">
-                        <a name="%(action_quotations_salesteams)d" type="action" class="oe_sparkline_bar_link">Quotations</a>
-                        <a name="%(action_order_report_quotation_salesteam)d" type="action" class="oe_sparkline_bar_link">
-                            <field name="monthly_quoted" widget="sparkline_bar" options="{'delayIn': '3000'}">
-                                Revenue of created quotations per month.<br/>Click to see a detailed analysis.
-                            </field>
-                        </a>
-                    </div>
-                </xpath>
-                <xpath expr="//div[@class='oe_clear']" position="after">
-                    <div class="oe_center" t-if="record.invoiced_target.raw_value">
-                        <field name="monthly_invoiced" widget="gauge" style="width:160px; height: 120px; cursor: pointer;"
-                            options="{'max_field': 'invoiced_target'}">Invoiced</field>
-                        <field name="invoiced_forecast" widget="gauge" style="width:160px; height: 120px; cursor: pointer;"
-                            options="{'max_field': 'invoiced_target', 'on_change': 'action_forecast'}">Forecast</field>
-                    </div>
-                    <div class="oe_center oe_salesteams_help" style="color:#bbbbbb;" t-if="!record.invoiced_target.raw_value">
-                        <br/>Define an invoicing target in the sales team settings to see the period's achievement and forecast at a glance.
-                    </div>
-                </xpath>
-            </data>
-            </field>
-        </record>
-    </data>
+      </data>
 </openerp>
diff --git a/addons/sale_team/__init__.py b/addons/sale_team/__init__.py
new file mode 100644
index 00000000000..6bac200f0db
--- /dev/null
+++ b/addons/sale_team/__init__.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import sale_team
+import sale_team_config
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/sale_team/__openerp__.py b/addons/sale_team/__openerp__.py
new file mode 100644
index 00000000000..9c303ae3ae3
--- /dev/null
+++ b/addons/sale_team/__openerp__.py
@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+{
+    'name' : 'Sale Team',
+    'version' : '1.0',
+    'author' : 'OpenERP SA',
+    'category': 'hidden',
+    'sequence': 10,
+    'summary': 'Sales Team',
+    'description': """ """,
+    'website': 'http://www.openerp.com',
+    'depends' : ['base','web_kanban','calendar'],
+    'data': ['sale_team.xml','sale_team_security.xml','res_config_view.xml','ir.model.access.csv'],
+    'demo': [],
+    'installable': True,
+    'auto_install': True,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale_team/ir.model.access.csv b/addons/sale_team/ir.model.access.csv
new file mode 100644
index 00000000000..9817ad834f6
--- /dev/null
+++ b/addons/sale_team/ir.model.access.csv
@@ -0,0 +1,5 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_crm_case_section,crm.case.section,model_crm_case_section,base.group_user,1,0,0,0
+access_crm_case_section_user,crm.case.section.user,model_crm_case_section,base.group_sale_salesman,1,0,0,0
+access_crm_case_section_manager,crm.case.section.manager,model_crm_case_section,base.group_sale_manager,1,1,1,1
+
diff --git a/addons/sale_team/res_config_view.xml b/addons/sale_team/res_config_view.xml
new file mode 100644
index 00000000000..7723fda48fc
--- /dev/null
+++ b/addons/sale_team/res_config_view.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="view_sale_config_settings" model="ir.ui.view">
+            <field name="name">crm settings</field>
+            <field name="model">sale.team.config.settings</field>
+            <field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
+            <field name="arch" type="xml">
+                <data>
+	            <div name="config_sale" position="before">
+                    <separator string="Sales Teams"/>
+                    <group>
+                        <label for="id" string="Manage Sales Teams"/>
+                        <div>
+                            <div>
+                                <field name="group_multi_salesteams" class="oe_inline"/>
+                                <label for="group_multi_salesteams"/>
+                            </div>
+                            
+                        </div>
+                    </group>
+	            </div>
+	          </data></field>
+        </record>
+     </data>
+</openerp>
diff --git a/addons/sale_team/sale_team.py b/addons/sale_team/sale_team.py
new file mode 100644
index 00000000000..3643a6dc26c
--- /dev/null
+++ b/addons/sale_team/sale_team.py
@@ -0,0 +1,153 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-today OpenERP SA (<http://www.openerp.com>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+
+import calendar
+from datetime import date, datetime
+from dateutil import relativedelta
+
+from openerp import tools
+from openerp.osv import fields
+from openerp.osv import osv
+
+
+
+class crm_case_section(osv.osv):
+    _name = "crm.case.section"
+    _inherits = {'mail.alias': 'alias_id'}
+    _inherit = ['mail.thread', 'ir.needaction_mixin']
+    _description = "Sales Teams"
+    _order = "complete_name"
+    # number of periods for lead/opportunities/... tracking in salesteam kanban dashboard/kanban view
+    _period_number = 5
+
+    def get_full_name(self, cr, uid, ids, field_name, arg, context=None):
+        return dict(self.name_get(cr, uid, ids, context=context))
+        
+    def __get_bar_values(self, cr, uid, obj, domain, read_fields, value_field, groupby_field, context=None):
+        
+        """ Generic method to generate data for bar chart values using SparklineBarWidget.
+            This method performs obj.read_group(cr, uid, domain, read_fields, groupby_field).
+
+            :param obj: the target model (i.e. crm_lead)
+            :param domain: the domain applied to the read_group
+            :param list read_fields: the list of fields to read in the read_group
+            :param str value_field: the field used to compute the value of the bar slice
+            :param str groupby_field: the fields used to group
+
+            :return list section_result: a list of dicts: [
+                                                {   'value': (int) bar_column_value,
+                                                    'tootip': (str) bar_column_tooltip,
+                                                }
+                                            ]
+        """
+        month_begin = date.today().replace(day=1)
+        section_result = [{
+                          'value': 0,
+                          'tooltip': (month_begin + relativedelta.relativedelta(months=-i)).strftime('%B %Y'),
+                          } for i in range(self._period_number - 1, -1, -1)]
+        group_obj = obj.read_group(cr, uid, domain, read_fields, groupby_field, context=context)
+        pattern = tools.DEFAULT_SERVER_DATE_FORMAT if obj.fields_get(cr, uid, groupby_field)[groupby_field]['type'] == 'date' else tools.DEFAULT_SERVER_DATETIME_FORMAT
+        for group in group_obj:
+            group_begin_date = datetime.strptime(group['__domain'][0][2], pattern)
+            month_delta = relativedelta.relativedelta(month_begin, group_begin_date)
+            section_result[self._period_number - (month_delta.months + 1)] = {'value': group.get(value_field, 0), 'tooltip': group.get(groupby_field, 0)}
+        return section_result
+   
+    _columns = {
+        'name': fields.char('Sales Team', size=64, required=True, translate=True),
+        'complete_name': fields.function(get_full_name, type='char', size=256, readonly=True, store=True),
+        'code': fields.char('Code', size=8),
+        'active': fields.boolean('Active', help="If the active field is set to "\
+                        "true, it will allow you to hide the sales team without removing it."),
+        'change_responsible': fields.boolean('Reassign Escalated', help="When escalating to this team override the salesman with the team leader."),
+        'user_id': fields.many2one('res.users', 'Team Leader'),
+        'member_ids': fields.many2many('res.users', 'sale_member_rel', 'section_id', 'member_id', 'Team Members'),
+        'reply_to': fields.char('Reply-To', size=64, help="The email address put in the 'Reply-To' of all emails sent by OpenERP about cases in this sales team"),
+        'parent_id': fields.many2one('crm.case.section', 'Parent Team'),
+        'child_ids': fields.one2many('crm.case.section', 'parent_id', 'Child Teams'),
+        'resource_calendar_id': fields.many2one('resource.calendar', "Working Time", help="Used to compute open days"),
+        'note': fields.text('Description'),
+        'working_hours': fields.float('Working Hours', digits=(16, 2)),
+        'alias_id': fields.many2one('mail.alias', 'Alias', ondelete="restrict", required=True, help="The email address associated with this team. New emails received will automatically ""create new leads assigned to the team."),
+        'color': fields.integer('Color Index'),
+           }
+   
+    _defaults = {
+        'active': 1,
+    }
+
+    _sql_constraints = [
+        ('code_uniq', 'unique (code)', 'The code of the sales team must be unique !')
+    ]
+
+    _constraints = [
+        (osv.osv._check_recursion, 'Error ! You cannot create recursive Sales team.', ['parent_id'])
+    ]
+
+    def name_get(self, cr, uid, ids, context=None):
+        """Overrides orm name_get method"""
+        if not isinstance(ids, list):
+            ids = [ids]
+        res = []
+        if not ids:
+            return res
+        reads = self.read(cr, uid, ids, ['name', 'parent_id'], context)
+
+        for record in reads:
+            name = record['name']
+            if record['parent_id']:
+                name = record['parent_id'][1] + ' / ' + name
+            res.append((record['id'], name))
+        return res
+        
+    def create(self, cr, uid, vals, context=None):
+        if context is None:
+            context = {}
+        create_context = dict(context, alias_model_name=self._name, alias_parent_model_name=self._name)
+        section_id = super(crm_case_section, self).create(cr, uid, vals, context=create_context)
+        section = self.browse(cr, uid, section_id, context=context)
+        self.pool.get('mail.alias').write(cr, uid, [section.alias_id.id], {'alias_parent_thread_id': section_id, 'alias_defaults': {'section_id': section_id, 'type': 'lead'}}, context=context)
+        return section_id
+
+    def unlink(self, cr, uid, ids, context=None):
+        # Cascade-delete mail aliases as well, as they should not exist without the sales team.
+        mail_alias = self.pool.get('mail.alias')
+        alias_ids = [team.alias_id.id for team in self.browse(cr, uid, ids, context=context) if team.alias_id]
+        res = super(crm_case_section, self).unlink(cr, uid, ids, context=context)
+        mail_alias.unlink(cr, uid, alias_ids, context=context)
+        return res
+        
+class res_users(osv.Model):
+    _inherit = 'res.users'
+    _columns = {
+        'default_section_id': fields.many2one('crm.case.section', 'Default Sales Team'),
+    }
+
+    def __init__(self, pool, cr):
+        init_res = super(res_users, self).__init__(pool, cr)
+        # duplicate list to avoid modifying the original reference
+        self.SELF_WRITEABLE_FIELDS = list(self.SELF_WRITEABLE_FIELDS)
+        self.SELF_WRITEABLE_FIELDS.extend(['default_section_id'])
+        return init_res
+
+    
+      
\ No newline at end of file
diff --git a/addons/sale_team/sale_team.xml b/addons/sale_team/sale_team.xml
new file mode 100644
index 00000000000..687919ff66a
--- /dev/null
+++ b/addons/sale_team/sale_team.xml
@@ -0,0 +1,232 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+  <data>
+
+ <!-- Update user form !-->
+        <record model="ir.ui.view" id="res_user_form">
+            <field name="name">Users Preferences</field>
+            <field name="model">res.users</field>
+            <field name="inherit_id" ref="base.view_users_form"/>
+            <field name="arch" type="xml">
+                <data>
+                    <xpath expr="//field[@name='tz']" position="after">
+                        <field name="default_section_id"/>
+                    </xpath>
+                </data>
+            </field>
+        </record>
+
+        <!-- Update Preferences form !-->
+        <record id="view_users_form_preferences" model="ir.ui.view">
+            <field name="name">res.users.preferences.form</field>
+            <field name="model">res.users</field>
+            <field name="inherit_id" ref="base.view_users_form_simple_modif"/>
+            <field name="arch" type="xml">
+            <data>
+                    <xpath expr="//field[@name='company_id']" position="before">
+                        <field name="default_section_id" readonly="0"/>
+                    </xpath>
+                </data>
+            </field>
+        </record>
+
+        <!-- Case Sections Salesteams kanban view -->
+
+       <record model="ir.ui.view" id="crm_case_section_salesteams_view_kanban">
+            <field name="name">crm.case.section.kanban</field>
+            <field name="model">crm.case.section</field>
+            <field name="arch" type="xml">
+                <kanban version="7.0" class="oe_background_grey">
+                    <field name="name"/>
+                    <field name="user_id"/>
+                    <field name="member_ids"/>
+                    <field name="note"/>
+                    <field name="alias_id"/>
+                    <field name="color"/>
+                    <templates>
+                        <t t-name="kanban-box">
+                            <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click oe_kanban_crm_salesteams">
+                                <div class="oe_dropdown_toggle oe_dropdown_kanban">
+                                    <span class="oe_e">í</span>
+                                    <ul class="oe_dropdown_menu">
+                                        <li t-if="widget.view.is_action_enabled('edit')"><a type="edit">Sales Teams Settings</a></li>
+                                        <li t-if="widget.view.is_action_enabled('delete')"><a type="delete">Delete</a></li>
+                                        <li t-if="widget.view.is_action_enabled('edit')"><ul class="oe_kanban_colorpicker" data-field="color"/></li>
+                                    </ul>
+                                </div>
+                                <div class="oe_kanban_content">
+                                    <h4 class="oe_center"><field name="name"/></h4>
+                                   <div class="oe_kanban_alias oe_center" t-if="record.alias_id.value">
+                                        <small><span class="oe_e oe_e_alias" style="float: none;">%%</span><t t-raw="record.alias_id.raw_value[1]"/></small>
+                                    </div>
+                                    <div class="oe_clear"></div>
+                                    <div class="oe_kanban_salesteams_avatars">
+                                        <t t-foreach="record.member_ids.raw_value.slice(0,10)" t-as="member">
+                                            <img t-att-src="kanban_image('res.users', 'image_small', member)" t-att-data-member_id="member"/>
+                                        </t>
+                                    </div>
+                                </div>
+                            </div>
+                        </t>
+                    </templates>
+                </kanban>
+            </field>
+        </record>
+
+
+        
+        <!-- Case Sections Search view -->
+
+        <record id="crm_case_section_salesteams_search" model="ir.ui.view">
+            <field name="name">Case Sections - Search</field>
+            <field name="model">crm.case.section</field>
+            <field name="arch" type="xml">
+                <search string="Salesteams Search">
+                    <field name="name"/>
+                    <field name="parent_id"/>
+                    <field name="user_id"/>
+                    <field name="note"/>
+                    <field name="code"/>
+                    <filter name="personal" string="My Salesteams" domain="['|', ('member_ids', '=', uid), ('user_id', '=', uid)]"/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Team Leader" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="Parent Sales Teams" domain="[]" context="{'group_by':'parent_id'}"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+
+        <!-- Case Sections Action -->
+
+        <record id="crm_case_section_salesteams_act" model="ir.actions.act_window">
+            <field name="name">Sales Teams</field>
+            <field name="res_model">crm.case.section</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">kanban,tree,form</field>
+            <field name="context">{}</field>
+            <field name="view_id" ref="crm_case_section_salesteams_search"/>
+            <field name="help" type="html">
+                <p class="oe_view_nocontent_create">
+                    Click here to define a new sales team.
+                </p><p>
+                    Use sales team to organize your different salespersons or
+                    departments into separate teams. Each team will work in
+                    its own list of opportunities.
+                </p>
+            </field>
+        </record>
+
+        <!-- Case Sections Form View -->
+
+         <record id="crm_case_section_view_form" model="ir.ui.view">
+            <field name="name">crm.case.section.form</field>
+            <field name="model">crm.case.section</field>
+            <field name="arch" type="xml">
+                <form string="Sales Team" version="7.0">
+                    <sheet>
+                        <div class="oe_title">
+                            <label for="name" class="oe_edit_only" string="Sales team"/>
+                            <h1>
+                                <field name="name" string="Salesteam"/>
+                            </h1>
+                        </div>
+                        <group>
+                            <group>
+                                <field name="user_id" context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'base.group_sale_salesman_all_leads']}"/>
+                                <field name="code"/>
+                                <field name="parent_id"/>
+                                <field name="change_responsible"/>
+                                <field name="active"/>
+                            </group>
+                            <group>
+                                <label for="alias_name" string="Email Alias"
+                                        attrs="{'invisible': [('alias_domain', '=', False)]}"/>
+                                <div name="alias_def"
+                                        attrs="{'invisible': [('alias_domain', '=', False)]}">
+                                    <field name="alias_id" class="oe_read_only oe_inline"
+                                            string="Email Alias" required="0"/>
+                                    <div class="oe_edit_only oe_inline" name="edit_alias" style="display: inline;" >
+                                        <field name="alias_name" class="oe_inline"/>@<field name="alias_domain" class="oe_inline" readonly="1"/>
+                                    </div>
+                                </div>
+                                <field name="alias_contact" class="oe_inline"
+                                        string="Accept Emails From"
+                                        attrs="{'invisible': [('alias_domain', '=', False)]}"/>
+                            </group>
+                        </group>
+                        <notebook colspan="4">
+                            <page string="Team Members">
+                                <field name="member_ids" widget="many2many_kanban">
+                                    <kanban quick_create="false" create="true">
+                                        <field name="name"/>
+                                        <templates>
+                                            <t t-name="kanban-box">
+                                                <div style="position: relative">
+                                                    <a t-if="! read_only_mode" type="delete" style="position: absolute; right: 0; padding: 4px; diplay: inline-block">X</a>
+                                                    <div class="oe_module_vignette">
+                                                        <div class="oe_module_desc">
+                                                            <field name="name"/>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </t>
+                                        </templates>
+                                    </kanban>
+                                </field>
+                            </page>
+                            <page string="Notes">
+                                <field name="note"/>
+                            </page>
+                        </notebook>
+                    </sheet>
+                    <div class="oe_chatter">
+                        <field name="message_follower_ids" widget="mail_followers" help="Follow this salesteam to automatically track the events associated to users of this team."/>
+                        <field name="message_ids" widget="mail_thread"/>
+                    </div>
+                </form>
+            </field>
+        </record>
+
+        <!-- Case Sections Tree View -->
+
+        <record id="crm_case_section_view_tree" model="ir.ui.view">
+            <field name="name">crm.case.section.tree</field>
+            <field name="model">crm.case.section</field>
+            <field name="field_parent">child_ids</field>
+            <field name="arch" type="xml">
+                <tree string="Sales Team">
+                    <field name="name"/>
+                    <field name="code"/>
+                    <field name="user_id"/>
+                </tree>
+            </field>
+        </record>
+
+        <!-- Case Sections Action -->
+
+        <!--<record model="ir.actions.act_window.view" id="action_crm_tag_kanban_view_salesteams_oppor11">
+            <field name="sequence" eval="0"/>
+            <field name="view_mode">kanban</field>
+            <field name="view_id" ref="crm_case_kanban_view_leads"/>
+            <field name="act_window_id" ref="crm_case_form_view_salesteams_opportunity"/>
+        </record>-->
+
+        <record id="crm_case_section_act" model="ir.actions.act_window">
+            <field name="name">Sales Teams</field>
+            <field name="res_model">crm.case.section</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="crm_case_section_view_tree"/>
+            <field name="help" type="html">
+                <p class="oe_view_nocontent_create">
+                    Click here to define a new sales team.
+                </p><p>
+                    Use sales team to organize your different salespersons or
+                    departments into separate teams. Each team will work in
+                    its own list of opportunities.
+                </p>
+            </field>
+        </record>
+        
+    <menuitem id="sale_team.menu_sale_team_act" action="crm_case_section_salesteams_act" sequence="1" parent="base.menu_sales"/>
+  </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/sale_team/sale_team_config.py b/addons/sale_team/sale_team_config.py
new file mode 100644
index 00000000000..33a5e84b8de
--- /dev/null
+++ b/addons/sale_team/sale_team_config.py
@@ -0,0 +1,45 @@
+
+from openerp import SUPERUSER_ID
+from openerp.osv import fields, osv
+
+
+class sala_team_configuration(osv.TransientModel):
+    _name = 'sale.team.config.settings'
+    _inherit = ['sale.config.settings', 'fetchmail.config.settings']
+
+    def set_group_multi_salesteams(self, cr, uid, ids, context=None):
+        """ This method is automatically called by res_config as it begins
+            with set. It is used to implement the 'one group or another'
+            behavior. We have to perform some group manipulation by hand
+            because in res_config.execute(), set_* methods are called
+            after group_*; therefore writing on an hidden res_config file
+            could not work.
+            If group_multi_salesteams is checked: remove group_mono_salesteams
+            from group_user, remove the users. Otherwise, just add
+            group_mono_salesteams in group_user.
+            The inverse logic about group_multi_salesteams is managed by the
+            normal behavior of 'group_multi_salesteams' field.
+        """
+        def ref(xml_id):
+            mod, xml = xml_id.split('.', 1)
+            return self.pool['ir.model.data'].get_object(cr, uid, mod, xml, context)
+
+        for obj in self.browse(cr, uid, ids, context=context):
+            config_group = ref('base.group_mono_salesteams')
+            base_group = ref('base.group_user')
+            if obj.group_multi_salesteams:
+                base_group.write({'implied_ids': [(3, config_group.id)]})
+                config_group.write({'users': [(3, u.id) for u in base_group.users]})
+            else:
+                base_group.write({'implied_ids': [(4, config_group.id)]})
+        return True
+
+    _columns = {
+       
+        'group_multi_salesteams': fields.boolean("Organize Sales activities into multiple Sales Teams",
+            implied_group='base.group_multi_salesteams',
+            help="""Allows you to use Sales Teams to manage your leads and opportunities."""),
+    }
+
+
+    
diff --git a/addons/sale_team/sale_team_security.xml b/addons/sale_team/sale_team_security.xml
new file mode 100644
index 00000000000..ff8eef01678
--- /dev/null
+++ b/addons/sale_team/sale_team_security.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+    <record id="base.group_mono_salesteams" model="res.groups">
+        <field name="name">Do Not Use Sales Teams</field>
+        <field name="category_id" ref="base.module_category_hidden"/>
+    </record>
+    <record id="base.group_user" model="res.groups">
+        <field name="implied_ids" eval="[(4, ref('base.group_mono_salesteams'))]"/>
+    </record>
+
+    <record id="base.group_multi_salesteams" model="res.groups">
+        <field name="name">Manage Sales Teams</field>
+        <field name="category_id" ref="base.module_category_hidden"/>
+    </record>
+</data>
+</openerp>
+

From 3676ec8291fa3ccbc6e6ae69123db38f5f6239b6 Mon Sep 17 00:00:00 2001
From: "Ravish (Open ERP)" <rmu@tinyerp.com>
Date: Fri, 28 Mar 2014 16:17:12 +0530
Subject: [PATCH 005/225] [update in code]

---
 addons/sale_crm/__openerp__.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/sale_crm/__openerp__.py b/addons/sale_crm/__openerp__.py
index ab94069c173..859a67b3e56 100644
--- a/addons/sale_crm/__openerp__.py
+++ b/addons/sale_crm/__openerp__.py
@@ -45,7 +45,6 @@ modules.
         'process/sale_crm_process.xml',
         'security/sale_crm_security.xml',
         'security/ir.model.access.csv',
-        'report/sale_report_view.xml',
     ],
     'js': [
         'static/src/js/sale_crm.js',

From 69c060639af2ada321cb7198a1e92fa785f94586 Mon Sep 17 00:00:00 2001
From: "Ravish (Open ERP)" <rmu@tinyerp.com>
Date: Tue, 1 Apr 2014 15:14:34 +0530
Subject: [PATCH 006/225] [update] update in code

---
 addons/crm/security/ir.model.access.csv | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/crm/security/ir.model.access.csv b/addons/crm/security/ir.model.access.csv
index fde894e4c31..639c5928894 100644
--- a/addons/crm/security/ir.model.access.csv
+++ b/addons/crm/security/ir.model.access.csv
@@ -11,6 +11,7 @@ access_crm_phonecall_manager,crm.phonecall.manager,model_crm_phonecall,base.grou
 access_crm_case_categ,crm.case.categ,model_crm_case_categ,base.group_user,1,0,0,0
 access_crm_lead,crm.lead,model_crm_lead,base.group_sale_salesman,1,1,1,0
 access_crm_phonecall,crm.phonecall,model_crm_phonecall,base.group_sale_salesman,1,1,1,0
+access_crm_case_section_manager,crm.case.section.manager,model_crm_case_section,base.group_sale_manager,1,1,1,1
 access_crm_case_stage,crm.case.stage,model_crm_case_stage,,1,0,0,0
 access_crm_case_stage_manager,crm.case.stage,model_crm_case_stage,base.group_sale_manager,1,1,1,1
 access_crm_case_resource_type_user,crm_case_resource_type user,model_crm_case_resource_type,base.group_sale_salesman,1,1,1,0

From 44d3f263cca585b4ff391d41811a5faa3cc913ce Mon Sep 17 00:00:00 2001
From: "Ravish (Open ERP)" <rmu@tinyerp.com>
Date: Tue, 1 Apr 2014 18:34:23 +0530
Subject: [PATCH 007/225] [IMP] update on  code

---
 addons/crm/crm_lead.py                  | 13 +++----------
 addons/crm/security/ir.model.access.csv |  2 ++
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index f97b7d0adf8..b1a0effaf63 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -345,19 +345,12 @@ class crm_lead(format_address, osv.osv):
             section_ids = self.pool.get('crm.case.section').search(cr, uid, ['|', ('user_id', '=', user_id), ('member_ids', '=', user_id)], context=context)
             if section_ids:
                 section_id = section_ids[0]
-        return {'value': {'section_id': section_id}}
-        
-    def on_change_user(self, cr, uid, ids, user_id, context=None):
-        """ Override of on change user_id on lead/opportunity; when having sale
-            the new logic is :
-            - use user.default_section_id
-            - or fallback on previous behavior """
-        if user_id:
+        else:
             user = self.pool.get('res.users').browse(cr, uid, user_id, context=context)
             if user.default_section_id and user.default_section_id.id:
                 return {'value': {'section_id': user.default_section_id.id}}
-        return super(sale_crm_lead, self).on_change_user(cr, uid, ids, user_id, context=context)
-    
+        return {'value': {'section_id': section_id}}
+        
     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:
diff --git a/addons/crm/security/ir.model.access.csv b/addons/crm/security/ir.model.access.csv
index 639c5928894..52648c8e347 100644
--- a/addons/crm/security/ir.model.access.csv
+++ b/addons/crm/security/ir.model.access.csv
@@ -5,12 +5,14 @@ access_crm_segmentation,crm.segmentation,model_crm_segmentation,base.group_sale_
 access_crm_segmentation_line,crm.segmentation.line,model_crm_segmentation_line,base.group_sale_manager,1,1,1,1
 access_crm_case_channel_user,crm.case.channel user,model_crm_case_channel,base.group_sale_salesman,1,0,0,0
 access_crm_case_channel_manager,crm.case.channel manager,model_crm_case_channel,base.group_sale_manager,1,1,1,1
+access_crm_case_section,crm.case.section,model_crm_case_section,base.group_user,1,0,0,0
 access_crm_case_categ,crm.case.categ,model_crm_case_categ,base.group_sale_salesman,1,1,1,0
 access_crm_lead_manager,crm.lead.manager,model_crm_lead,base.group_sale_manager,1,1,1,1
 access_crm_phonecall_manager,crm.phonecall.manager,model_crm_phonecall,base.group_sale_manager,1,1,1,1
 access_crm_case_categ,crm.case.categ,model_crm_case_categ,base.group_user,1,0,0,0
 access_crm_lead,crm.lead,model_crm_lead,base.group_sale_salesman,1,1,1,0
 access_crm_phonecall,crm.phonecall,model_crm_phonecall,base.group_sale_salesman,1,1,1,0
+access_crm_case_section_user,crm.case.section.user,model_crm_case_section,base.group_sale_salesman,1,1,1,0
 access_crm_case_section_manager,crm.case.section.manager,model_crm_case_section,base.group_sale_manager,1,1,1,1
 access_crm_case_stage,crm.case.stage,model_crm_case_stage,,1,0,0,0
 access_crm_case_stage_manager,crm.case.stage,model_crm_case_stage,base.group_sale_manager,1,1,1,1

From 0ee42746df8c8e688c0eefbcc0faed0b9d795194 Mon Sep 17 00:00:00 2001
From: "Ravish (Open ERP)" <rmu@tinyerp.com>
Date: Wed, 2 Apr 2014 12:41:23 +0530
Subject: [PATCH 008/225] [update] move alias for default lead in to crm

---
 addons/crm/crm.py                       | 20 ++++++++++++++++++++
 addons/crm/security/ir.model.access.csv |  3 ---
 addons/sale_team/sale_team.py           | 19 -------------------
 3 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index eb10e468602..166cfc7f435 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -90,6 +90,8 @@ class crm_case_stage(osv.osv):
 
 class crm_case_section(osv.osv):
     """ Model for sales teams. """
+    _name = "crm.case.section"
+    _inherits = {'mail.alias': 'alias_id'}
     _inherit = 'crm.case.section'
     _description = "Sales Teams"
 
@@ -118,6 +120,8 @@ class crm_case_section(osv.osv):
         return res
 
     _columns = {
+    
+        'alias_id': fields.many2one('mail.alias', 'Alias', ondelete="restrict", required=True, help="The email address associated with this team. New emails received will automatically ""create new leads assigned to the team."),
         'stage_ids': fields.many2many('crm.case.stage', 'section_stage_rel', 'section_id', 'stage_id', 'Stages'),
         'use_leads': fields.boolean('Leads',
             help="The first contact you get with a potential customer is a lead you qualify before converting it into a real business opportunity. Check this box to manage leads in this sales team."),
@@ -138,7 +142,23 @@ class crm_case_section(osv.osv):
         'stage_ids': _get_stage_common,
         'use_leads': True,
     }
+    
+    def create(self, cr, uid, vals, context=None):
+        if context is None:
+            context = {}
+        create_context = dict(context, alias_model_name='crm.lead', alias_parent_model_name=self._name)
+        section_id = super(crm_case_section, self).create(cr, uid, vals, context=create_context)
+        section = self.browse(cr, uid, section_id, context=context)
+        self.pool.get('mail.alias').write(cr, uid, [section.alias_id.id], {'alias_parent_thread_id': section_id, 'alias_defaults': {'section_id': section_id, 'type': 'lead'}}, context=context)
+        return section_id
 
+    def unlink(self, cr, uid, ids, context=None):
+        # Cascade-delete mail aliases as well, as they should not exist without the sales team.
+        mail_alias = self.pool.get('mail.alias')
+        alias_ids = [team.alias_id.id for team in self.browse(cr, uid, ids, context=context) if team.alias_id]
+        res = super(crm_case_section, self).unlink(cr, uid, ids, context=context)
+        mail_alias.unlink(cr, uid, alias_ids, context=context)
+        return res
  
 class crm_case_categ(osv.osv):
     """ Category of Case """
diff --git a/addons/crm/security/ir.model.access.csv b/addons/crm/security/ir.model.access.csv
index 52648c8e347..fde894e4c31 100644
--- a/addons/crm/security/ir.model.access.csv
+++ b/addons/crm/security/ir.model.access.csv
@@ -5,15 +5,12 @@ access_crm_segmentation,crm.segmentation,model_crm_segmentation,base.group_sale_
 access_crm_segmentation_line,crm.segmentation.line,model_crm_segmentation_line,base.group_sale_manager,1,1,1,1
 access_crm_case_channel_user,crm.case.channel user,model_crm_case_channel,base.group_sale_salesman,1,0,0,0
 access_crm_case_channel_manager,crm.case.channel manager,model_crm_case_channel,base.group_sale_manager,1,1,1,1
-access_crm_case_section,crm.case.section,model_crm_case_section,base.group_user,1,0,0,0
 access_crm_case_categ,crm.case.categ,model_crm_case_categ,base.group_sale_salesman,1,1,1,0
 access_crm_lead_manager,crm.lead.manager,model_crm_lead,base.group_sale_manager,1,1,1,1
 access_crm_phonecall_manager,crm.phonecall.manager,model_crm_phonecall,base.group_sale_manager,1,1,1,1
 access_crm_case_categ,crm.case.categ,model_crm_case_categ,base.group_user,1,0,0,0
 access_crm_lead,crm.lead,model_crm_lead,base.group_sale_salesman,1,1,1,0
 access_crm_phonecall,crm.phonecall,model_crm_phonecall,base.group_sale_salesman,1,1,1,0
-access_crm_case_section_user,crm.case.section.user,model_crm_case_section,base.group_sale_salesman,1,1,1,0
-access_crm_case_section_manager,crm.case.section.manager,model_crm_case_section,base.group_sale_manager,1,1,1,1
 access_crm_case_stage,crm.case.stage,model_crm_case_stage,,1,0,0,0
 access_crm_case_stage_manager,crm.case.stage,model_crm_case_stage,base.group_sale_manager,1,1,1,1
 access_crm_case_resource_type_user,crm_case_resource_type user,model_crm_case_resource_type,base.group_sale_salesman,1,1,1,0
diff --git a/addons/sale_team/sale_team.py b/addons/sale_team/sale_team.py
index 3643a6dc26c..fd898bb248c 100644
--- a/addons/sale_team/sale_team.py
+++ b/addons/sale_team/sale_team.py
@@ -36,7 +36,6 @@ class crm_case_section(osv.osv):
     _inherit = ['mail.thread', 'ir.needaction_mixin']
     _description = "Sales Teams"
     _order = "complete_name"
-    # number of periods for lead/opportunities/... tracking in salesteam kanban dashboard/kanban view
     _period_number = 5
 
     def get_full_name(self, cr, uid, ids, field_name, arg, context=None):
@@ -87,7 +86,6 @@ class crm_case_section(osv.osv):
         'resource_calendar_id': fields.many2one('resource.calendar', "Working Time", help="Used to compute open days"),
         'note': fields.text('Description'),
         'working_hours': fields.float('Working Hours', digits=(16, 2)),
-        'alias_id': fields.many2one('mail.alias', 'Alias', ondelete="restrict", required=True, help="The email address associated with this team. New emails received will automatically ""create new leads assigned to the team."),
         'color': fields.integer('Color Index'),
            }
    
@@ -119,23 +117,6 @@ class crm_case_section(osv.osv):
             res.append((record['id'], name))
         return res
         
-    def create(self, cr, uid, vals, context=None):
-        if context is None:
-            context = {}
-        create_context = dict(context, alias_model_name=self._name, alias_parent_model_name=self._name)
-        section_id = super(crm_case_section, self).create(cr, uid, vals, context=create_context)
-        section = self.browse(cr, uid, section_id, context=context)
-        self.pool.get('mail.alias').write(cr, uid, [section.alias_id.id], {'alias_parent_thread_id': section_id, 'alias_defaults': {'section_id': section_id, 'type': 'lead'}}, context=context)
-        return section_id
-
-    def unlink(self, cr, uid, ids, context=None):
-        # Cascade-delete mail aliases as well, as they should not exist without the sales team.
-        mail_alias = self.pool.get('mail.alias')
-        alias_ids = [team.alias_id.id for team in self.browse(cr, uid, ids, context=context) if team.alias_id]
-        res = super(crm_case_section, self).unlink(cr, uid, ids, context=context)
-        mail_alias.unlink(cr, uid, alias_ids, context=context)
-        return res
-        
 class res_users(osv.Model):
     _inherit = 'res.users'
     _columns = {

From bc90e644a9f3d2636992ad2265e76838eaeb702c Mon Sep 17 00:00:00 2001
From: "Ravish (Open ERP)" <rmu@tinyerp.com>
Date: Fri, 4 Apr 2014 17:18:07 +0530
Subject: [PATCH 009/225] [IMP]done the require changes

---
 addons/crm/crm_case_section_view.xml | 23 ++++++++++++++++++++++-
 addons/sale_team/sale_team.py        |  1 -
 addons/sale_team/sale_team.xml       | 19 -------------------
 3 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/addons/crm/crm_case_section_view.xml b/addons/crm/crm_case_section_view.xml
index a56459a7065..caa282c4e7f 100644
--- a/addons/crm/crm_case_section_view.xml
+++ b/addons/crm/crm_case_section_view.xml
@@ -89,10 +89,14 @@
             <data>
                 <xpath expr="//field[@name='name']" position="after">
                     <field name="use_leads"/>
+                    <field name="alias_id"/>
                     <field name="monthly_open_leads"/>
                     <field name="monthly_planned_revenue"/>
                 </xpath>
                 <xpath expr="//div[@class='oe_clear']" position="before">
+                <div class="oe_kanban_alias oe_center" t-if="record.use_leads.raw_value and record.alias_id.value">
+                    <small><span class="oe_e oe_e_alias" style="float: none;">%%</span><t t-raw="record.alias_id.raw_value[1]"/></small>
+                </div>
                 <div class="oe_items_list">
                     <div class="oe_salesteams_leads" t-if="record.use_leads.raw_value">
                         <a name="%(crm_case_form_view_salesteams_lead)d" type="action">Leads</a>
@@ -152,9 +156,26 @@
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='name']" position="after">
                     <div name="options_active">
-                        <field name="use_leads" class="oe_inline"/><label for="use_leads"/>
+                       <h6><field name="use_leads"/><label for="use_leads" string="Leads"/></h6>
                     </div>
                 </xpath>
+                <xpath expr="//group/field[@name='active']" position="inside">
+                    <group>
+                        <label for="alias_name" string="Email Alias"
+                                attrs="p'invisible': [('alias_domain', '=', False)]}"/>
+                        <div name="alias_def"
+                                attrs="{'invisible': [('alias_domain', '=', False)]}">
+                            <field name="alias_id" class="oe_read_only oe_inline"
+                                    string="Email Alias" required="0"/>
+                            <div class="oe_edit_only oe_inline" name="edit_alias" style="display: inline;" >
+                                <field name="alias_name" class="oe_inline"/>@<field name="alias_domain" class="oe_inline" readonly="1"/>
+                            </div>
+                        </div>
+                        <field name="alias_contact" class="oe_inline"
+                                string="Accept Emails From"
+                                attrs="{'invisible': [('alias_domain', '=', False)]}"/>
+                    </group>
+                </xpath>
                 <xpath expr="//page[@string='Team Members']" position="after">
                     <page string="Stages">
                         <separator string="Select Stages for this Sales Team"/>
diff --git a/addons/sale_team/sale_team.py b/addons/sale_team/sale_team.py
index fd898bb248c..423bb21391c 100644
--- a/addons/sale_team/sale_team.py
+++ b/addons/sale_team/sale_team.py
@@ -32,7 +32,6 @@ from openerp.osv import osv
 
 class crm_case_section(osv.osv):
     _name = "crm.case.section"
-    _inherits = {'mail.alias': 'alias_id'}
     _inherit = ['mail.thread', 'ir.needaction_mixin']
     _description = "Sales Teams"
     _order = "complete_name"
diff --git a/addons/sale_team/sale_team.xml b/addons/sale_team/sale_team.xml
index 687919ff66a..0120dbd21b5 100644
--- a/addons/sale_team/sale_team.xml
+++ b/addons/sale_team/sale_team.xml
@@ -41,7 +41,6 @@
                     <field name="user_id"/>
                     <field name="member_ids"/>
                     <field name="note"/>
-                    <field name="alias_id"/>
                     <field name="color"/>
                     <templates>
                         <t t-name="kanban-box">
@@ -56,9 +55,6 @@
                                 </div>
                                 <div class="oe_kanban_content">
                                     <h4 class="oe_center"><field name="name"/></h4>
-                                   <div class="oe_kanban_alias oe_center" t-if="record.alias_id.value">
-                                        <small><span class="oe_e oe_e_alias" style="float: none;">%%</span><t t-raw="record.alias_id.raw_value[1]"/></small>
-                                    </div>
                                     <div class="oe_clear"></div>
                                     <div class="oe_kanban_salesteams_avatars">
                                         <t t-foreach="record.member_ids.raw_value.slice(0,10)" t-as="member">
@@ -138,21 +134,6 @@
                                 <field name="change_responsible"/>
                                 <field name="active"/>
                             </group>
-                            <group>
-                                <label for="alias_name" string="Email Alias"
-                                        attrs="{'invisible': [('alias_domain', '=', False)]}"/>
-                                <div name="alias_def"
-                                        attrs="{'invisible': [('alias_domain', '=', False)]}">
-                                    <field name="alias_id" class="oe_read_only oe_inline"
-                                            string="Email Alias" required="0"/>
-                                    <div class="oe_edit_only oe_inline" name="edit_alias" style="display: inline;" >
-                                        <field name="alias_name" class="oe_inline"/>@<field name="alias_domain" class="oe_inline" readonly="1"/>
-                                    </div>
-                                </div>
-                                <field name="alias_contact" class="oe_inline"
-                                        string="Accept Emails From"
-                                        attrs="{'invisible': [('alias_domain', '=', False)]}"/>
-                            </group>
                         </group>
                         <notebook colspan="4">
                             <page string="Team Members">

From 3ae307003a0192d3d59428abd65e82d3b8f27d7a Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Wed, 9 Apr 2014 12:27:12 +0530
Subject: [PATCH 010/225] [IMP] Improved code for confirm_order state in
 shopping_cart.

---
 addons/website_sale/controllers/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index 816a63132a9..ca6e396acf4 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -473,7 +473,7 @@ class Ecommerce(http.Controller):
 
         # must have a draft sale order with lines at this point, otherwise redirect to shop
         order = self.get_order()
-        if not order or order.state != 'draft' or not order.order_line:
+        if not order or order.state not in ['draft', 'shopping_cart'] or not order.order_line:
             request.registry['website'].ecommerce_reset(cr, uid, context=context)
             return request.redirect('/shop')
         # if transaction pending / done: redirect to confirmation

From cfc26235349087748c58e9b4ce39b775fc4c709a Mon Sep 17 00:00:00 2001
From: "Ravish (Open ERP)" <rmu@tinyerp.com>
Date: Wed, 9 Apr 2014 15:35:21 +0530
Subject: [PATCH 011/225] [IMP] improve related yml bug

---
 addons/crm/__openerp__.py                     |  1 -
 addons/sale_team/static/src/css/sale_team.css | 62 +++++++++++++++++++
 2 files changed, 62 insertions(+), 1 deletion(-)
 create mode 100644 addons/sale_team/static/src/css/sale_team.css

diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 7d5052c1c4e..b72fa3e5ae2 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -109,7 +109,6 @@ Dashboard for CRM will include:
     'test': [
         'test/crm_access_group_users.yml',
         'test/crm_lead_message.yml',
-        'test/lead2opportunity2win.yml',
         'test/lead2opportunity_assign_salesmen.yml',
         'test/crm_lead_merge.yml',
         'test/crm_lead_cancel.yml',
diff --git a/addons/sale_team/static/src/css/sale_team.css b/addons/sale_team/static/src/css/sale_team.css
new file mode 100644
index 00000000000..8999f758e41
--- /dev/null
+++ b/addons/sale_team/static/src/css/sale_team.css
@@ -0,0 +1,62 @@
+@charset "utf-8";
+.openerp .oe_kanban_view .oe_kanban_crm_salesteams {
+  /* Customize width and height of kanban according bootstrap3 */
+  width: 357px;
+  min-height: 254px !important;
+  /* End of customize */
+  cursor: default;
+}
+.openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_items_list {
+  position: relative;
+  /* Improved margin to set alignment of list items according bootstrap3 */
+  margin: 10px 0 10px 9px;
+  min-height: 10px;
+}
+.openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_items_list div {
+  width: 160px;
+  height: 22px;
+  margin: 0 !important;
+  position: relative;
+  display: inline-block;
+  float: left;
+}
+.openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_items_list div a:nth-child(2n) {
+  position: absolute;
+  left: 90px;
+  top: 0;
+}
+.openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_items_list div:nth-child(2n) a:nth-child(2n) {
+  left: 110px;
+}
+.openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_items_list a:hover {
+  text-decoration: underline !important;
+}
+.openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_center {
+  text-align: center;
+  margin: 3px 0;
+}
+.openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_center .oe_sum {
+  margin: 0;
+  font-size: 40px;
+}
+.openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_center .oe_subsum {
+  font-size: 10px;
+}
+.openerp .oe_kanban_view .oe_salesteams_help {
+  display: inline-block;
+}
+.openerp .oe_kanban_view .oe_kanban_salesteams_avatars {
+  margin-top: 20px;
+}
+.openerp .oe_kanban_view .oe_kanban_salesteams_avatars img {
+  width: 30px;
+  height: 30px;
+  padding-left: 0px;
+  margin-top: 3px;
+  -moz-border-radius: 2px;
+  -webkit-border-radius: 2px;
+  border-radius: 2px;
+  -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
+  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
+  -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
+}

From 8a576d5d9470762c95cb82173c61316112ffd988 Mon Sep 17 00:00:00 2001
From: "Ravish (Open ERP)" <rmu@tinyerp.com>
Date: Wed, 9 Apr 2014 17:20:31 +0530
Subject: [PATCH 012/225] [IMP] fix the issue

---
 addons/gamification_sale_crm/sale_crm_goals_demo.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/gamification_sale_crm/sale_crm_goals_demo.xml b/addons/gamification_sale_crm/sale_crm_goals_demo.xml
index d8e26551c32..5c0466f34ed 100644
--- a/addons/gamification_sale_crm/sale_crm_goals_demo.xml
+++ b/addons/gamification_sale_crm/sale_crm_goals_demo.xml
@@ -3,10 +3,10 @@
     <data>
 
         <!-- challenges -->
-        <record model="gamification.challenge" id="challenge_crm_sale">
+        <!--<record model="gamification.challenge" id="challenge_crm_sale">
             <field name="user_ids" eval="[(4,ref('base.user_demo'))]" />
             <field name="state">inprogress</field>
-        </record>
+        </record>-->
 
         <!-- goals -->
         <record model="gamification.goal" id="goal_crm_sale1">

From 2df2f7781830b5236f1d48af9f9cf9725d01fbc2 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Wed, 9 Apr 2014 18:39:42 +0530
Subject: [PATCH 013/225] Test commit

---
 addons/website_sale/controllers/main.py | 2 +-
 addons/website_sale/models/website.py   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index ca6e396acf4..816a63132a9 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -473,7 +473,7 @@ class Ecommerce(http.Controller):
 
         # must have a draft sale order with lines at this point, otherwise redirect to shop
         order = self.get_order()
-        if not order or order.state not in ['draft', 'shopping_cart'] or not order.order_line:
+        if not order or order.state != 'draft' or not order.order_line:
             request.registry['website'].ecommerce_reset(cr, uid, context=context)
             return request.redirect('/shop')
         # if transaction pending / done: redirect to confirmation
diff --git a/addons/website_sale/models/website.py b/addons/website_sale/models/website.py
index f72a79bee13..d3d8ba64ee7 100644
--- a/addons/website_sale/models/website.py
+++ b/addons/website_sale/models/website.py
@@ -147,7 +147,7 @@ class Website(orm.Model):
         quotation_values = self._ecommerce_get_quotation_values(cr, uid, context=context)
         quotation_values['user_id'] = False
         quotation_values['section_id'] = self.pool.get('crm.case.section').search(cr, SUPERUSER_ID, [('code', '=', 'SPC')], context=context)[0]
-        quotation_values['state'] = 'shopping_cart'
+        # quotation_values['state'] = 'shopping_cart'
         return SaleOrder.create(cr, SUPERUSER_ID, quotation_values, context=context)
 
     def ecommerce_get_new_order(self, cr, uid, context=None):

From 31c7c33260f977ff2bb5c4783b4a37fcd5a0f717 Mon Sep 17 00:00:00 2001
From: "Ravish (Open ERP)" <rmu@tinyerp.com>
Date: Wed, 9 Apr 2014 19:10:28 +0530
Subject: [PATCH 014/225] [imp]improve the code

---
 addons/crm/__openerp__.py            | 3 ---
 addons/crm/crm_case_section_view.xml | 4 +---
 addons/sale/sale_view.xml            | 8 ++------
 addons/sale_team/__openerp__.py      | 3 ++-
 4 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index b72fa3e5ae2..63dc175a0dd 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -119,9 +119,6 @@ Dashboard for CRM will include:
         'test/crm_lead_unlink.yml',
         'test/crm_lead_find_stage.yml',
     ],
-    'css': [
-        'static/src/css/crm.css'
-    ],
     'js': [
         'static/src/js/crm_case_section.js',
     ],
diff --git a/addons/crm/crm_case_section_view.xml b/addons/crm/crm_case_section_view.xml
index caa282c4e7f..8cc9c0bcd56 100644
--- a/addons/crm/crm_case_section_view.xml
+++ b/addons/crm/crm_case_section_view.xml
@@ -155,9 +155,7 @@
             <field name="inherit_id" ref="sale_team.crm_case_section_view_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='name']" position="after">
-                    <div name="options_active">
-                       <h6><field name="use_leads"/><label for="use_leads" string="Leads"/></h6>
-                    </div>
+                    <h6><field name="use_leads"/><label for="use_leads" string="Leads"/></h6>
                 </xpath>
                 <xpath expr="//group/field[@name='active']" position="inside">
                     <group>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 9a6ef2a2e32..fafca287f2e 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -711,7 +711,7 @@
                 </xpath>
                 <xpath expr="//div[@class='oe_clear']" position="before">
                     <div class="oe_items_list">
-                         <div class="oe_salesteams_quotations">
+                        <div class="oe_salesteams_quotations">
                             <a name="%(action_quotations_salesteams)d" type="action" class="oe_sparkline_bar_link">Quotations</a>
                             <a name="%(action_order_report_quotation_salesteam)d" type="action" class="oe_sparkline_bar_link">
                                 <field name="monthly_quoted" widget="sparkline_bar" options="{'delayIn': '3000'}">
@@ -719,8 +719,6 @@
                                 </field>
                             </a>
                         </div>
-                    </div>
-                    <div class="oe_items_list">
                         <div class="oe_salesteams_orders">
                             <a name="%(action_orders_salesteams)d" type="action">Sales Orders</a>
                             <a name="%(action_order_report_so_salesteam)d" type="action" class="oe_sparkline_bar_link">
@@ -729,8 +727,6 @@
                                 </field>
                             </a>
                         </div>
-                    </div>
-                    <div class="oe_items_list">
                         <div class="oe_salesteams_invoices" groups="account.group_account_invoice">
                             <a name="%(action_invoice_salesteams)d" type="action">Invoices</a>
                             <a name="%(action_account_invoice_report_salesteam)d" type="action" class="oe_sparkline_bar_link">
@@ -739,7 +735,7 @@
                                 </field>
                             </a>
                         </div>
-                    </div>
+                      </div>
                 </xpath>
                 <xpath expr="//div[@class='oe_clear']" position="after">
                     <div class="oe_center" t-if="record.invoiced_target.raw_value">
diff --git a/addons/sale_team/__openerp__.py b/addons/sale_team/__openerp__.py
index 9c303ae3ae3..35965f4609d 100644
--- a/addons/sale_team/__openerp__.py
+++ b/addons/sale_team/__openerp__.py
@@ -22,7 +22,7 @@
     'name' : 'Sale Team',
     'version' : '1.0',
     'author' : 'OpenERP SA',
-    'category': 'hidden',
+    'category': 'hidden',   
     'sequence': 10,
     'summary': 'Sales Team',
     'description': """ """,
@@ -30,6 +30,7 @@
     'depends' : ['base','web_kanban','calendar'],
     'data': ['sale_team.xml','sale_team_security.xml','res_config_view.xml','ir.model.access.csv'],
     'demo': [],
+    'css': ['static/src/css/sale_team.css'],
     'installable': True,
     'auto_install': True,
 }

From e5229ee8c35825a1a0d9d4a88eba5ae66d7d5861 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Thu, 10 Apr 2014 14:26:13 +0530
Subject: [PATCH 015/225] [IMP] Improved code by shifting the complete code to
 website_sale rather than doing in sale.

---
 addons/sale/sale.py                           |  1 -
 addons/sale/sale_view.xml                     |  8 +++----
 addons/website_sale/models/website.py         | 22 +++++++++++++++++--
 .../views/website_sale_backend.xml            | 20 +++++++++++++++++
 4 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index f480447f559..48b09ec7493 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -170,7 +170,6 @@ class sale_order(osv.osv):
         'client_order_ref': fields.char('Customer Reference', size=64),
         'state': fields.selection([
             ('draft', 'Draft Quotation'),
-            ('shopping_cart', 'Shopping Cart'),
             ('sent', 'Quotation Sent'),
             ('cancel', 'Cancelled'),
             ('waiting_date', 'Waiting Schedule'),
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 40daf557c6f..c9ffb94b985 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -80,14 +80,14 @@
                         <button name="action_quotation_send" string="Send by Email" type="object" states="sent,progress,manual" groups="base.group_user"/>
                         <button name="print_quotation" string="Print" type="object" states="draft" class="oe_highlight" groups="base.group_user"/>
                         <button name="print_quotation" string="Print" type="object" states="sent,progress,manual" groups="base.group_user"/>
-                        <button name="action_button_confirm" states="draft,shopping_cart" string="Confirm Sale" type="object" groups="base.group_user"/>
+                        <button name="action_button_confirm" states="draft" string="Confirm Sale" type="object" groups="base.group_user"/>
                         <button name="action_button_confirm" states="sent" string="Confirm Sale" class="oe_highlight" type="object" groups="base.group_user"/>
                         <button name="action_view_invoice" string="View Invoice" type="object" class="oe_highlight"
                             attrs="{'invisible': [('invoice_exists', '=', False)]}" groups="base.group_user"/>
                         <button name="%(action_view_sale_advance_payment_inv)d" string="Create Invoice"
                             type="action" states="manual" class="oe_highlight" groups="base.group_user"/>
                         <button name="copy_quotation" states="cancel" string="New Copy of Quotation" type="object"/>
-                        <button name="cancel" states="draft,shopping_cart,sent" string="Cancel Quotation" groups="base.group_user"/>
+                        <button name="cancel" states="draft,sent" string="Cancel Quotation" groups="base.group_user"/>
                         <button name="action_cancel" states="manual,progress" string="Cancel Order" type="object" groups="base.group_user"/>
                         <button name="invoice_cancel" states="invoice_except" string="Cancel Order" groups="base.group_user"/>
                         <field name="state" widget="statusbar" statusbar_visible="draft,sent,progress,done" statusbar_colors='{"invoice_except":"red","waiting_date":"blue"}'/>
@@ -277,7 +277,7 @@
                     'search_default_my_sale_orders_filter': 1
                 }
             </field>
-            <field name="domain">[('state', 'not in', ('draft', 'shopping_cart', 'sent', 'cancel'))]</field>
+            <field name="domain">[('state', 'not in', ('draft', 'sent', 'cancel'))]</field>
             <field name="help" type="html">
                 <p class="oe_view_nocontent_create">
                     Click to create a quotation that can be converted into a sales
@@ -321,7 +321,7 @@
             <field name="view_id" ref="view_quotation_tree"/>
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="context">{'search_default_my_sale_orders_filter': 1}</field>
-            <field name="domain">[('state','in',('draft','shopping_cart','sent','cancel'))]</field>
+            <field name="domain">[('state','in',('draft','sent','cancel'))]</field>
             <field name="search_view_id" ref="view_sales_order_filter"/>
             <field name="help" type="html">
               <p class="oe_view_nocontent_create">
diff --git a/addons/website_sale/models/website.py b/addons/website_sale/models/website.py
index d3d8ba64ee7..d79d3195394 100644
--- a/addons/website_sale/models/website.py
+++ b/addons/website_sale/models/website.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 import uuid
-from openerp.osv import orm, fields
+from openerp.osv import orm, osv, fields
 from openerp.addons.web.http import request
 from openerp import SUPERUSER_ID
 
@@ -147,7 +147,7 @@ class Website(orm.Model):
         quotation_values = self._ecommerce_get_quotation_values(cr, uid, context=context)
         quotation_values['user_id'] = False
         quotation_values['section_id'] = self.pool.get('crm.case.section').search(cr, SUPERUSER_ID, [('code', '=', 'SPC')], context=context)[0]
-        # quotation_values['state'] = 'shopping_cart'
+        quotation_values['state'] = 'shopping_cart'
         return SaleOrder.create(cr, SUPERUSER_ID, quotation_values, context=context)
 
     def ecommerce_get_new_order(self, cr, uid, context=None):
@@ -222,3 +222,21 @@ class Website(orm.Model):
 
     def ecommerce_get_product_domain(self):
         return [("sale_ok", "=", True),("product_variant_ids","!=",False)]
+
+class sale_order(osv.osv):
+    _inherit = "sale.order"
+
+    _columns = {
+        'state': fields.selection([
+            ('draft', 'Draft Quotation'),
+            ('shopping_cart', 'Shopping Cart'),
+            ('sent', 'Quotation Sent'),
+            ('cancel', 'Cancelled'),
+            ('waiting_date', 'Waiting Schedule'),
+            ('progress', 'Sales Order'),
+            ('manual', 'Sale to Invoice'),
+            ('invoice_except', 'Invoice Exception'),
+            ('done', 'Done'),
+            ], 'Status', readonly=True,
+            help="Gives the status of the quotation or sales order. \nThe exception status is automatically set when a cancel operation occurs in the processing of a document linked to the sales order. \nThe 'Waiting Schedule' status is set when the invoice is confirmed but waiting for the scheduler to run on the order date.", select=True),
+    }
diff --git a/addons/website_sale/views/website_sale_backend.xml b/addons/website_sale/views/website_sale_backend.xml
index 863c47ac565..dd5b2ce239b 100644
--- a/addons/website_sale/views/website_sale_backend.xml
+++ b/addons/website_sale/views/website_sale_backend.xml
@@ -94,5 +94,25 @@
       </field>
     </record>
 
+    <record id="sale_order_form_state_button" model="ir.ui.view">
+        <field name="name">sale.order.form.state.button</field>
+        <field name="model">sale.order</field>
+        <field name="inherit_id" ref="sale.view_order_form"/>
+        <field name="arch" type="xml">
+            <field name='state' position="before">
+                <button name="action_button_confirm" states="shopping_cart" string="Confirm Sale" type="object" groups="base.group_user"/>
+                <button name="cancel" states="shopping_cart" string="Cancel Quotation" groups="base.group_user"/>
+            </field>
+        </field>
+    </record>
+
+    <record id="sale.action_orders" model="ir.actions.act_window">
+        <field name="domain">[('state', 'not in', ('draft', 'shopping_cart', 'sent', 'cancel'))]</field>
+    </record>
+
+    <record id="sale.action_quotations" model="ir.actions.act_window">
+        <field name="domain">[('state','in',('draft','shopping_cart','sent','cancel'))]</field>
+    </record>
+
  </data>
 </openerp>

From 51c1d1c4bb9b342f4289db7a8359ccef299e6ea8 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Thu, 10 Apr 2014 15:57:00 +0530
Subject: [PATCH 016/225] [FIX] Issue of trunk reD.

---
 addons/event_sale/event_sale_view.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/addons/event_sale/event_sale_view.xml b/addons/event_sale/event_sale_view.xml
index 1d830198234..1f42108c993 100644
--- a/addons/event_sale/event_sale_view.xml
+++ b/addons/event_sale/event_sale_view.xml
@@ -20,7 +20,6 @@
         <record model="ir.ui.view" id="view_event_registration_ticket_search">
             <field name="name">event.registration.ticket.search</field>
             <field name="model">event.registration</field>
-            <field name="arch" type="xml">
             <field name="inherit_id" ref="event.view_registration_search" />
             <field name="arch" type="xml">
                 <filter name="group_event" position="after">
@@ -32,7 +31,6 @@
         <record model="ir.ui.view" id="view_event_registration_ticket_tree">
             <field name="name">event.registration.ticket.tree</field>
             <field name="model">event.registration</field>
-            <field name="arch" type="xml">
             <field name="inherit_id" ref="event.view_event_registration_tree" />
             <field name="arch" type="xml">
                 <field name="event_id" position="after">

From 8822e6a7b603ba3ff2d792f14f25e5bb7024162b Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Thu, 10 Apr 2014 17:44:04 +0530
Subject: [PATCH 017/225] [FIX]Fixed issue for delivery using context.

---
 addons/delivery/sale.py                           | 2 +-
 addons/website_sale_delivery/models/sale_order.py | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/delivery/sale.py b/addons/delivery/sale.py
index c5d032ca8a8..95af3ca9d20 100644
--- a/addons/delivery/sale.py
+++ b/addons/delivery/sale.py
@@ -74,7 +74,7 @@ class sale_order(osv.Model):
             if not grid_id:
                 raise osv.except_osv(_('No Grid Available!'), _('No grid matching for this carrier!'))
 
-            if order.state != 'draft':
+            if order.state not in ['draft', context.get('shopping_cart', False)]:
                 raise osv.except_osv(_('Order not in Draft State!'), _('The order state have to be draft to add delivery lines.'))
 
             grid = grid_obj.browse(cr, uid, grid_id, context=context)
diff --git a/addons/website_sale_delivery/models/sale_order.py b/addons/website_sale_delivery/models/sale_order.py
index c6ac851d9d4..fe81fd65df6 100644
--- a/addons/website_sale_delivery/models/sale_order.py
+++ b/addons/website_sale_delivery/models/sale_order.py
@@ -82,6 +82,7 @@ class SaleOrder(orm.Model):
                         carrier_id = delivery_id
                         break
                 order.write({'carrier_id': carrier_id}, context=context)
+                context.update({'shopping_cart': 'shopping_cart'})
                 if carrier_id:
                     order.delivery_set(context=context)
                 else:

From 458b95eacb568ae6bd1346a5a10f997df01d3a25 Mon Sep 17 00:00:00 2001
From: Randhir Mayatra rma-openerp <rma@tinyerp.com>
Date: Thu, 10 Apr 2014 18:47:17 +0530
Subject: [PATCH 018/225] [IMP] imrove yml testcases

---
 addons/crm/__openerp__.py                            | 1 +
 addons/gamification/models/goal.py                   | 4 ++--
 addons/gamification_sale_crm/sale_crm_goals_demo.xml | 5 ++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 63dc175a0dd..1b777ab3525 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -109,6 +109,7 @@ Dashboard for CRM will include:
     'test': [
         'test/crm_access_group_users.yml',
         'test/crm_lead_message.yml',
+        'test/lead2opportunity2win.yml',
         'test/lead2opportunity_assign_salesmen.yml',
         'test/crm_lead_merge.yml',
         'test/crm_lead_cancel.yml',
diff --git a/addons/gamification/models/goal.py b/addons/gamification/models/goal.py
index 8e79c43c8a6..62b4e6a9585 100644
--- a/addons/gamification/models/goal.py
+++ b/addons/gamification/models/goal.py
@@ -279,8 +279,8 @@ class gamification_goal(osv.Model):
 
                 if goal.definition_id.computation_mode == 'sum':
                     field_name = goal.definition_id.field_id.name
-                    res = obj.read_group(cr, uid, domain, [field_name], [''], context=context)
-                    new_value = res and res[0][field_name] or 0.0
+                    res = obj.read_group(cr, uid, domain, [field_name], [], context=context)
+                    new_value = res and res[res.keys()[0]][field_name] or 0.0
 
                 else:  # computation mode = count
                     new_value = obj.search(cr, uid, domain, context=context, count=True)
diff --git a/addons/gamification_sale_crm/sale_crm_goals_demo.xml b/addons/gamification_sale_crm/sale_crm_goals_demo.xml
index 5c0466f34ed..064d2cbdc20 100644
--- a/addons/gamification_sale_crm/sale_crm_goals_demo.xml
+++ b/addons/gamification_sale_crm/sale_crm_goals_demo.xml
@@ -3,10 +3,10 @@
     <data>
 
         <!-- challenges -->
-        <!--<record model="gamification.challenge" id="challenge_crm_sale">
+        <record model="gamification.challenge" id="challenge_crm_sale">
             <field name="user_ids" eval="[(4,ref('base.user_demo'))]" />
             <field name="state">inprogress</field>
-        </record>-->
+        </record>
 
         <!-- goals -->
         <record model="gamification.goal" id="goal_crm_sale1">
@@ -16,7 +16,6 @@
             <field name="start_date" eval="time.strftime('%Y-%m-01')" />
             <field name="end_date" eval="(DateTime.today().replace(day=1)+relativedelta(months=1, days=-1)).strftime('%Y-%m-%d')" />
             <field name="target_goal">2000</field>
-            <field name="state">inprogress</field>
         </record>
         
     </data>

From 7751334d9797d0a233a20369aba24d16f5dab61c Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Thu, 10 Apr 2014 20:42:29 +0530
Subject: [PATCH 019/225] Fixed order.state

---
 addons/website_sale/controllers/main.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index 224c17ee890..96094800bc3 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -417,7 +417,7 @@ class Ecommerce(http.Controller):
 
         # must have a draft sale order with lines at this point, otherwise reset
         order = self.get_order()
-        if not order or order.state != 'draft' or not order.order_line:
+        if not order or order.state not in ['draft', 'shopping_cart'] or not order.order_line:
             request.registry['website'].ecommerce_reset(cr, uid, context=context)
             return request.redirect('/shop')
         # if transaction pending / done: redirect to confirmation
@@ -473,7 +473,7 @@ class Ecommerce(http.Controller):
 
         # must have a draft sale order with lines at this point, otherwise redirect to shop
         order = self.get_order()
-        if not order or order.state != 'draft' or not order.order_line:
+        if not order or order.state not in ['draft', 'shopping_cart'] or not order.order_line:
             request.registry['website'].ecommerce_reset(cr, uid, context=context)
             return request.redirect('/shop')
         # if transaction pending / done: redirect to confirmation

From 53f71ba3d45c327badbae77cba68be26f02e06a2 Mon Sep 17 00:00:00 2001
From: Randhir Mayatra rma-openerp <rma@tinyerp.com>
Date: Fri, 11 Apr 2014 18:59:26 +0530
Subject: [PATCH 020/225] [IMP]imrpove sale_team sequence and depends

---
 addons/sale_team/__openerp__.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/sale_team/__openerp__.py b/addons/sale_team/__openerp__.py
index 35965f4609d..f2de8fb432e 100644
--- a/addons/sale_team/__openerp__.py
+++ b/addons/sale_team/__openerp__.py
@@ -23,11 +23,10 @@
     'version' : '1.0',
     'author' : 'OpenERP SA',
     'category': 'hidden',   
-    'sequence': 10,
     'summary': 'Sales Team',
     'description': """ """,
     'website': 'http://www.openerp.com',
-    'depends' : ['base','web_kanban','calendar'],
+    'depends' : ['base','web_kanban','mail'],
     'data': ['sale_team.xml','sale_team_security.xml','res_config_view.xml','ir.model.access.csv'],
     'demo': [],
     'css': ['static/src/css/sale_team.css'],

From 635739ee11a6ed099fcbdddbe3531df8f8132c44 Mon Sep 17 00:00:00 2001
From: "Mehul Mehta (OpenERP)" <mehulmehta008@gmail.com>
Date: Mon, 14 Apr 2014 14:37:26 +0530
Subject: [PATCH 021/225] [Fix] remove parseError for Extenal ID

---
 addons/website_sale/data/website_sale_data.xml | 2 +-
 addons/website_sale/data/website_sale_demo.xml | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/addons/website_sale/data/website_sale_data.xml b/addons/website_sale/data/website_sale_data.xml
index 4852df242f3..4311b0f6e22 100644
--- a/addons/website_sale/data/website_sale_data.xml
+++ b/addons/website_sale/data/website_sale_data.xml
@@ -35,7 +35,7 @@
         <record model="crm.case.section" id="crm_case_section_shopping_carts">
             <field name="name">Shopping Carts</field>
             <field name="code">SPC</field>
-            <field name="member_ids" eval="[(4, ref('base.user_root')),(4, ref('base.user_demo'))]"/>
+            <field name="member_ids" eval="[(4, ref('base.user_root'))]"/>
         </record>
 
     </data>
diff --git a/addons/website_sale/data/website_sale_demo.xml b/addons/website_sale/data/website_sale_demo.xml
index ad3b472c49d..e06139ebc28 100644
--- a/addons/website_sale/data/website_sale_demo.xml
+++ b/addons/website_sale/data/website_sale_demo.xml
@@ -547,5 +547,11 @@ Weight: 1.1 ounces</field>
             <field name="price_discount">-0.2000</field>
             <field name="sequence">1</field>
         </record>
+        
+        <record id="crm_case_section_shopping_carts_demo" model="crm.case.section">
+            <field name="implied_ids" ref="website_sale.crm_case_section_shopping_carts"/>
+            <field name="member_ids" eval="[(4, ref('base.user_demo'))]"/>
+        </record>
+        
     </data>
 </openerp>

From fdc61b6e60b77f6b410b8c956d74e5431a993c52 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Mon, 14 Apr 2014 15:43:14 +0530
Subject: [PATCH 022/225] [IMP] Highlight the confirm order button while the
 quotation in shopping cart state and added a Shopping Cart in search view.

---
 addons/website_sale/views/website_sale_backend.xml | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/addons/website_sale/views/website_sale_backend.xml b/addons/website_sale/views/website_sale_backend.xml
index dd5b2ce239b..899b428f6c6 100644
--- a/addons/website_sale/views/website_sale_backend.xml
+++ b/addons/website_sale/views/website_sale_backend.xml
@@ -100,7 +100,7 @@
         <field name="inherit_id" ref="sale.view_order_form"/>
         <field name="arch" type="xml">
             <field name='state' position="before">
-                <button name="action_button_confirm" states="shopping_cart" string="Confirm Sale" type="object" groups="base.group_user"/>
+                <button class="oe_highlight" name="action_button_confirm" states="shopping_cart" string="Confirm Sale" type="object" groups="base.group_user"/>
                 <button name="cancel" states="shopping_cart" string="Cancel Quotation" groups="base.group_user"/>
             </field>
         </field>
@@ -114,5 +114,17 @@
         <field name="domain">[('state','in',('draft','shopping_cart','sent','cancel'))]</field>
     </record>
 
+    <record id="shopping_cart_filter_search_view" model="ir.ui.view">
+        <field name="name">shopping.cart.filter.search.inherit</field>
+        <field name="model">sale.order</field>
+        <field name="inherit_id" ref="sale.view_sales_order_filter"/>
+        <field name="arch" type="xml">
+            <xpath expr="//filter[@name='draft']" position="after">
+                <filter icon="terp-document-new" string="Shopping Cart" domain="[('state','=','shopping_cart')]" help="The quotations which are in shopping cart."/>
+            </xpath>
+        </field>
+    </record>
+
+
  </data>
 </openerp>

From 5f34cb309f8c7a1edc298fa3c342d13ddf987b05 Mon Sep 17 00:00:00 2001
From: "Mehul Mehta (OpenERP)" <mehulmehta008@gmail.com>
Date: Mon, 14 Apr 2014 16:34:49 +0530
Subject: [PATCH 023/225] [IMP] improved a code according to a data file

---
 addons/website_sale/data/website_sale_demo.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/website_sale/data/website_sale_demo.xml b/addons/website_sale/data/website_sale_demo.xml
index e06139ebc28..9c8480baa8b 100644
--- a/addons/website_sale/data/website_sale_demo.xml
+++ b/addons/website_sale/data/website_sale_demo.xml
@@ -548,9 +548,8 @@ Weight: 1.1 ounces</field>
             <field name="sequence">1</field>
         </record>
         
-        <record id="crm_case_section_shopping_carts_demo" model="crm.case.section">
-            <field name="implied_ids" ref="website_sale.crm_case_section_shopping_carts"/>
-            <field name="member_ids" eval="[(4, ref('base.user_demo'))]"/>
+        <record id="website_sale.crm_case_section_shopping_carts" model="crm.case.section">
+            <field name="member_ids" eval="[(4, ref('base.user_root'), ref('base.user_demo'))]"/>
         </record>
         
     </data>

From 6925bdad967d3afc517090b99aa66a73022f5dca Mon Sep 17 00:00:00 2001
From: "Mehul Mehta (OpenERP)" <mehulmehta008@gmail.com>
Date: Tue, 15 Apr 2014 11:14:05 +0530
Subject: [PATCH 024/225] [ADD] Added a menu for 'Shopping Cart' which is
 available after installing website_sale and all the quotations generated in
 shop are directly accessable through this menu.

---
 addons/website_sale/views/website_sale_backend.xml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/addons/website_sale/views/website_sale_backend.xml b/addons/website_sale/views/website_sale_backend.xml
index 899b428f6c6..bc3d334c147 100644
--- a/addons/website_sale/views/website_sale_backend.xml
+++ b/addons/website_sale/views/website_sale_backend.xml
@@ -125,6 +125,20 @@
         </field>
     </record>
 
+    <record id="action_shopping_cart_quotations" model="ir.actions.act_window">
+        <field name="name">Shopping Cart</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">sale.order</field>
+        <field name="view_type">form</field>
+        <field name="view_id" ref="sale.view_quotation_tree"/>
+        <field name="view_mode">tree,form,calendar,graph</field>
+        <field name="domain">[('state','=','shopping_cart')]</field>
+        <field name="search_view_id" ref="sale.view_sales_order_filter"/>
+    </record>
+        
+    <menuitem id="menu_shopping_cart_quotations"
+            action="action_shopping_cart_quotations" parent="base.menu_sales"
+            sequence="5"/>
 
  </data>
 </openerp>

From e25229a6da7c5dbe4736cdbecb7aeb44f323af31 Mon Sep 17 00:00:00 2001
From: Randhir Mayatra rma-openerp <rma@tinyerp.com>
Date: Tue, 15 Apr 2014 16:08:37 +0530
Subject: [PATCH 025/225] [IMP] update depends on sale_team and sale

---
 addons/sale/__openerp__.py      | 2 +-
 addons/sale_team/__openerp__.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py
index 44cbb3227ca..ea6f0f187bd 100644
--- a/addons/sale/__openerp__.py
+++ b/addons/sale/__openerp__.py
@@ -59,7 +59,7 @@ The Dashboard for the Sales Manager will include
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'images': ['images/sale_dashboard.jpeg','images/Sale_order_line_to_invoice.jpeg','images/sale_order.jpeg','images/sales_analysis.jpeg'],
-    'depends': ['sale_team','account_voucher'],
+    'depends': ['sale_team','account_voucher','report'],
     'data': [
         'wizard/sale_make_invoice_advance.xml',
         'wizard/sale_line_invoice.xml',
diff --git a/addons/sale_team/__openerp__.py b/addons/sale_team/__openerp__.py
index f2de8fb432e..bb1e8ab5830 100644
--- a/addons/sale_team/__openerp__.py
+++ b/addons/sale_team/__openerp__.py
@@ -26,7 +26,7 @@
     'summary': 'Sales Team',
     'description': """ """,
     'website': 'http://www.openerp.com',
-    'depends' : ['base','web_kanban','mail'],
+    'depends' : ['base','web_kanban','mail', 'resource'],
     'data': ['sale_team.xml','sale_team_security.xml','res_config_view.xml','ir.model.access.csv'],
     'demo': [],
     'css': ['static/src/css/sale_team.css'],

From 7ceaefb1067924582f6e1d07282de9b9202a593c Mon Sep 17 00:00:00 2001
From: "Mehul Mehta (OpenERP)" <mehulmehta008@gmail.com>
Date: Tue, 15 Apr 2014 18:55:12 +0530
Subject: [PATCH 026/225] [IMP] draft state replace with shopping_cart state
 and remove the condition of pending which convert a draft quotation into
 quotation sent

---
 addons/website_sale/controllers/main.py | 29 +++++++++++--------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index 96094800bc3..3123703fc1c 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -347,9 +347,9 @@ class Ecommerce(http.Controller):
         cr, uid, context = request.cr, request.uid, request.context
         prod_obj = request.registry.get('product.product')
 
-        # must have a draft sale order with lines at this point, otherwise reset
+        # must have a shopping_cart sale order with lines at this point, otherwise reset
         order = self.get_order()
-        if order and order.state not in ['draft','shopping_cart']:
+        if order and order.state != 'shopping_cart':
             request.registry['website'].ecommerce_reset(cr, uid, context=context)
             return request.redirect('/shop')
 
@@ -415,14 +415,14 @@ class Ecommerce(http.Controller):
     def checkout(self, **post):
         cr, uid, context, registry = request.cr, request.uid, request.context, request.registry
 
-        # must have a draft sale order with lines at this point, otherwise reset
+        # must have a shopping_cart sale order with lines at this point, otherwise reset
         order = self.get_order()
-        if not order or order.state not in ['draft', 'shopping_cart'] or not order.order_line:
+        if not order or order.state != 'shopping_cart' or not order.order_line:
             request.registry['website'].ecommerce_reset(cr, uid, context=context)
             return request.redirect('/shop')
         # if transaction pending / done: redirect to confirmation
         tx = context.get('website_sale_transaction')
-        if tx and tx.state != 'draft':
+        if tx and tx.state != 'shopping_cart':
             return request.redirect('/shop/payment/confirmation/%s' % order.id)
 
         self.get_pricelist()
@@ -471,14 +471,14 @@ class Ecommerce(http.Controller):
         cr, uid, context, registry = request.cr, request.uid, request.context, request.registry
         order_line_obj = request.registry.get('sale.order')
 
-        # must have a draft sale order with lines at this point, otherwise redirect to shop
+        # must have a shopping_cart sale order with lines at this point, otherwise redirect to shop
         order = self.get_order()
-        if not order or order.state not in ['draft', 'shopping_cart'] or not order.order_line:
+        if not order or order.state != 'shopping_cart' or not order.order_line:
             request.registry['website'].ecommerce_reset(cr, uid, context=context)
             return request.redirect('/shop')
         # if transaction pending / done: redirect to confirmation
         tx = context.get('website_sale_transaction')
-        if tx and tx.state != 'draft':
+        if tx and tx.state != 'shopping_cart':
             return request.redirect('/shop/payment/confirmation/%s' % order.id)
 
         orm_partner = registry.get('res.partner')
@@ -577,9 +577,9 @@ class Ecommerce(http.Controller):
         """ Payment step. This page proposes several payment means based on available
         payment.acquirer. State at this point :
 
-         - a draft sale order with lines; otherwise, clean context / session and
+         - a shopping_cart sale order with lines; otherwise, clean context / session and
            back to the shop
-         - no transaction in context / session, or only a draft one, if the customer
+         - no transaction in context / session, or only a shopping_cart one, if the customer
            did go to a payment.acquirer website but closed the tab without
            paying / canceling
         """
@@ -589,12 +589,12 @@ class Ecommerce(http.Controller):
 
         # if no sale order at this stage: back to checkout beginning
         order = self.get_order()
-        if not order or order.state not in ['draft', 'shopping_cart'] or not order.order_line:
+        if not order or order.state != 'shopping_cart' or not order.order_line:
             request.registry['website'].ecommerce_reset(cr, uid, context=context)
             return request.redirect("/shop")
         # alread a transaction: forward to confirmation
         tx = context.get('website_sale_transaction')
-        if tx and tx.state != 'draft':
+        if tx and tx.state != 'shopping_cart':
             return request.redirect('/shop/confirmation/%s' % order.id)
 
         shipping_partner_id = False
@@ -666,7 +666,7 @@ class Ecommerce(http.Controller):
                 'sale_order_id': order.id,
             }, context=context)
             request.session['website_sale_transaction_id'] = tx_id
-        elif tx and tx.state == 'draft':  # button cliked but no more info -> rewrite on tx or create a new one ?
+        elif tx and tx.state == 'shopping_cart':  # button cliked but no more info -> rewrite on tx or create a new one ?
             tx.write({
                 'acquirer_id': acquirer_id,
             })
@@ -756,9 +756,6 @@ class Ecommerce(http.Controller):
             sale_order_obj.action_button_confirm(cr, SUPERUSER_ID, [order.id], context=request.context)
             # send by email
             email_act = sale_order_obj.action_quotation_send(cr, SUPERUSER_ID, [order.id], context=request.context)
-        elif tx.state == 'pending':
-            # send by email
-            email_act = sale_order_obj.action_quotation_send(cr, SUPERUSER_ID, [order.id], context=request.context)
         elif tx.state == 'cancel':
             # cancel the quotation
             sale_order_obj.action_cancel(cr, SUPERUSER_ID, [order.id], context=request.context)

From 7927f3433955ffbbb368e3fdf08ab43ca191708c Mon Sep 17 00:00:00 2001
From: "Mehul Mehta (OpenERP)" <mehulmehta008@gmail.com>
Date: Wed, 16 Apr 2014 11:21:14 +0530
Subject: [PATCH 027/225] [IMP] remove quotation domain in shopping cart state

---
 addons/website_sale/views/website_sale_backend.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/addons/website_sale/views/website_sale_backend.xml b/addons/website_sale/views/website_sale_backend.xml
index bc3d334c147..b28138d9319 100644
--- a/addons/website_sale/views/website_sale_backend.xml
+++ b/addons/website_sale/views/website_sale_backend.xml
@@ -110,10 +110,6 @@
         <field name="domain">[('state', 'not in', ('draft', 'shopping_cart', 'sent', 'cancel'))]</field>
     </record>
 
-    <record id="sale.action_quotations" model="ir.actions.act_window">
-        <field name="domain">[('state','in',('draft','shopping_cart','sent','cancel'))]</field>
-    </record>
-
     <record id="shopping_cart_filter_search_view" model="ir.ui.view">
         <field name="name">shopping.cart.filter.search.inherit</field>
         <field name="model">sale.order</field>

From 79fb080c0eac36e785bc49e81557f10f1bfe2d05 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Wed, 16 Apr 2014 15:40:52 +0530
Subject: [PATCH 028/225] [REM] REmoveD the shopping cart fliter from the
 quotations search view bcz itz not need their.

---
 addons/website_sale/views/website_sale_backend.xml | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/addons/website_sale/views/website_sale_backend.xml b/addons/website_sale/views/website_sale_backend.xml
index b28138d9319..57eda1cce5b 100644
--- a/addons/website_sale/views/website_sale_backend.xml
+++ b/addons/website_sale/views/website_sale_backend.xml
@@ -110,17 +110,6 @@
         <field name="domain">[('state', 'not in', ('draft', 'shopping_cart', 'sent', 'cancel'))]</field>
     </record>
 
-    <record id="shopping_cart_filter_search_view" model="ir.ui.view">
-        <field name="name">shopping.cart.filter.search.inherit</field>
-        <field name="model">sale.order</field>
-        <field name="inherit_id" ref="sale.view_sales_order_filter"/>
-        <field name="arch" type="xml">
-            <xpath expr="//filter[@name='draft']" position="after">
-                <filter icon="terp-document-new" string="Shopping Cart" domain="[('state','=','shopping_cart')]" help="The quotations which are in shopping cart."/>
-            </xpath>
-        </field>
-    </record>
-
     <record id="action_shopping_cart_quotations" model="ir.actions.act_window">
         <field name="name">Shopping Cart</field>
         <field name="type">ir.actions.act_window</field>

From 671cbe02e1cf5f4fa9b240b5125b3641c1ac5fd1 Mon Sep 17 00:00:00 2001
From: "Mehul Mehta (OpenERP)" <mehulmehta008@gmail.com>
Date: Wed, 16 Apr 2014 15:58:08 +0530
Subject: [PATCH 029/225] [IMP] remove unnecessary reference bcaz which id
 override on this modules

---
 addons/website_sale/data/website_sale_demo.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_sale/data/website_sale_demo.xml b/addons/website_sale/data/website_sale_demo.xml
index 9c8480baa8b..e869f57a6e6 100644
--- a/addons/website_sale/data/website_sale_demo.xml
+++ b/addons/website_sale/data/website_sale_demo.xml
@@ -548,7 +548,7 @@ Weight: 1.1 ounces</field>
             <field name="sequence">1</field>
         </record>
         
-        <record id="website_sale.crm_case_section_shopping_carts" model="crm.case.section">
+        <record id="crm_case_section_shopping_carts" model="crm.case.section">
             <field name="member_ids" eval="[(4, ref('base.user_root'), ref('base.user_demo'))]"/>
         </record>
         

From be8a180bc5838d2dad420ba5c7f701151c30c4e7 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Wed, 16 Apr 2014 17:09:32 +0530
Subject: [PATCH 030/225] [ADD] Added a search view for the shopping_cart menu.

---
 .../views/website_sale_backend.xml            | 47 ++++++++++++++++++-
 1 file changed, 45 insertions(+), 2 deletions(-)

diff --git a/addons/website_sale/views/website_sale_backend.xml b/addons/website_sale/views/website_sale_backend.xml
index 57eda1cce5b..858bb0a3c71 100644
--- a/addons/website_sale/views/website_sale_backend.xml
+++ b/addons/website_sale/views/website_sale_backend.xml
@@ -110,6 +110,49 @@
         <field name="domain">[('state', 'not in', ('draft', 'shopping_cart', 'sent', 'cancel'))]</field>
     </record>
 
+    <record id="view_shopping_cart_order_filter" model="ir.ui.view">
+        <field name="name">shopping.cart.order.filter</field>
+        <field name="model">sale.order</field>
+        <field name="arch" type="xml">
+            <search string="Search Sales Order">
+                <field name="name" string="Sales Order" filter_domain="['|',('name','ilike',self),('client_order_ref','ilike',self)]"/>
+                <filter icon="terp-mail-message-new" string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
+                <separator/>
+                <filter string="My" domain="[('user_id','=',uid)]" help="My Shopping Cart Orders" icon="terp-personal" name="my_sale_orders_filter"/>
+                <field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/>
+                <field name="user_id"/>
+                <group expand="0" string="Group By...">
+                    <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
+                    <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                    <filter string="Order Month" icon="terp-go-month" domain="[]" context="{'group_by':'date_order'}"/>
+                </group>
+           </search>
+        </field>
+    </record>
+
+    <record id="action_shopping_cart_orders" model="ir.actions.act_window">
+        <field name="name">Sales Orders</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">sale.order</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form,calendar,graph</field>
+        <field name="search_view_id" ref="view_shopping_cart_order_filter"/>
+        <field name="context">{
+                'search_default_my_sale_orders_filter': 1
+            }
+        </field>
+        <field name="domain">[('state', 'not in', ('draft', 'shopping_cart', 'sent', 'cancel'))]</field>
+        <field name="help" type="html">
+            <p class="oe_view_nocontent_create">
+                Click to create a quotation that can be converted into a sales
+                order.
+            </p><p>
+                OpenERP will help you efficiently handle the complete sales flow:
+                quotation, sales order, delivery, invoicing and payment.
+            </p>
+        </field>
+    </record>
+
     <record id="action_shopping_cart_quotations" model="ir.actions.act_window">
         <field name="name">Shopping Cart</field>
         <field name="type">ir.actions.act_window</field>
@@ -118,9 +161,9 @@
         <field name="view_id" ref="sale.view_quotation_tree"/>
         <field name="view_mode">tree,form,calendar,graph</field>
         <field name="domain">[('state','=','shopping_cart')]</field>
-        <field name="search_view_id" ref="sale.view_sales_order_filter"/>
+        <field name="search_view_id" ref="view_shopping_cart_order_filter"/>
     </record>
-        
+
     <menuitem id="menu_shopping_cart_quotations"
             action="action_shopping_cart_quotations" parent="base.menu_sales"
             sequence="5"/>

From 97711ed282046f1dbd0e9d567d6b3835dacd1eed Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Thu, 17 Apr 2014 10:45:01 +0530
Subject: [PATCH 031/225] [ImP] Improved typo's AND searched the section_id
 direct from the xml id AND directly inserted the state on the 2nd position in
 sale.order rather than declaring the states again.

---
 addons/delivery/sale.py                       |  2 +-
 addons/sale/sale.py                           | 22 ++++++++++---------
 .../website_sale/data/website_sale_data.xml   |  4 ++--
 .../website_sale/data/website_sale_demo.xml   |  2 +-
 addons/website_sale/models/sale_order.py      |  3 +++
 addons/website_sale/models/website.py         | 20 +----------------
 6 files changed, 20 insertions(+), 33 deletions(-)

diff --git a/addons/delivery/sale.py b/addons/delivery/sale.py
index 95af3ca9d20..47c8d6e9676 100644
--- a/addons/delivery/sale.py
+++ b/addons/delivery/sale.py
@@ -74,7 +74,7 @@ class sale_order(osv.Model):
             if not grid_id:
                 raise osv.except_osv(_('No Grid Available!'), _('No grid matching for this carrier!'))
 
-            if order.state not in ['draft', context.get('shopping_cart', False)]:
+            if order.state in ['sent', 'cancel', 'progress', 'manual', 'done']:
                 raise osv.except_osv(_('Order not in Draft State!'), _('The order state have to be draft to add delivery lines.'))
 
             grid = grid_obj.browse(cr, uid, grid_id, context=context)
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 782030a9494..55a0b53800d 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -28,6 +28,17 @@ from openerp.tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FO
 import openerp.addons.decimal_precision as dp
 from openerp import workflow
 
+AVAILABLE_STATES = [
+    ('draft', 'Draft Quotation'),
+    ('sent', 'Quotation Sent'),
+    ('cancel', 'Cancelled'),
+    ('waiting_date', 'Waiting Schedule'),
+    ('progress', 'Sales Order'),
+    ('manual', 'Sale to Invoice'),
+    ('invoice_except', 'Invoice Exception'),
+    ('done', 'Done'),
+]
+
 class sale_order(osv.osv):
     _name = "sale.order"
     _inherit = ['mail.thread', 'ir.needaction_mixin']
@@ -168,16 +179,7 @@ class sale_order(osv.osv):
             readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, select=True),
         'origin': fields.char('Source Document', size=64, help="Reference of the document that generated this sales order request."),
         'client_order_ref': fields.char('Reference/Description', size=64),
-        'state': fields.selection([
-            ('draft', 'Draft Quotation'),
-            ('sent', 'Quotation Sent'),
-            ('cancel', 'Cancelled'),
-            ('waiting_date', 'Waiting Schedule'),
-            ('progress', 'Sales Order'),
-            ('manual', 'Sale to Invoice'),
-            ('invoice_except', 'Invoice Exception'),
-            ('done', 'Done'),
-            ], 'Status', readonly=True, track_visibility='onchange',
+        'state': fields.selection(AVAILABLE_STATES , 'Status', readonly=True, track_visibility='onchange',
             help="Gives the status of the quotation or sales order. \nThe exception status is automatically set when a cancel operation occurs in the processing of a document linked to the sales order. \nThe 'Waiting Schedule' status is set when the invoice is confirmed but waiting for the scheduler to run on the order date.", select=True),
         'date_order': fields.date('Date', required=True, readonly=True, select=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}),
         'create_date': fields.datetime('Creation Date', readonly=True, select=True, help="Date on which sales order is created."),
diff --git a/addons/website_sale/data/website_sale_data.xml b/addons/website_sale/data/website_sale_data.xml
index 4311b0f6e22..57b7863a149 100644
--- a/addons/website_sale/data/website_sale_data.xml
+++ b/addons/website_sale/data/website_sale_data.xml
@@ -32,8 +32,8 @@
             <field name="html_class">oe_image_full</field>
         </record>
 
-        <record model="crm.case.section" id="crm_case_section_shopping_carts">
-            <field name="name">Shopping Carts</field>
+        <record model="crm.case.section" id="crm_case_section_shopping_cart">
+            <field name="name">Shopping Cart</field>
             <field name="code">SPC</field>
             <field name="member_ids" eval="[(4, ref('base.user_root'))]"/>
         </record>
diff --git a/addons/website_sale/data/website_sale_demo.xml b/addons/website_sale/data/website_sale_demo.xml
index e869f57a6e6..eb2f2090207 100644
--- a/addons/website_sale/data/website_sale_demo.xml
+++ b/addons/website_sale/data/website_sale_demo.xml
@@ -548,7 +548,7 @@ Weight: 1.1 ounces</field>
             <field name="sequence">1</field>
         </record>
         
-        <record id="crm_case_section_shopping_carts" model="crm.case.section">
+        <record id="crm_case_section_shopping_cart" model="crm.case.section">
             <field name="member_ids" eval="[(4, ref('base.user_root'), ref('base.user_demo'))]"/>
         </record>
         
diff --git a/addons/website_sale/models/sale_order.py b/addons/website_sale/models/sale_order.py
index 8d0027337ff..c9c37a73f8c 100644
--- a/addons/website_sale/models/sale_order.py
+++ b/addons/website_sale/models/sale_order.py
@@ -2,12 +2,15 @@
 from openerp import SUPERUSER_ID
 from openerp.osv import osv, fields
 from openerp.addons.web.http import request
+from openerp.addons.sale import sale
 
+sale.AVAILABLE_STATES.insert(1,('shopping_cart', 'Shopping Cart'))
 
 class SaleOrder(osv.Model):
     _inherit = "sale.order"
 
     _columns = {
+        'state': fields.selection(sale.AVAILABLE_STATES, 'Status'),
         'website_session_id': fields.char('Session UUID4'),
         'website_order_line': fields.one2many(
             'sale.order.line', 'order_id',
diff --git a/addons/website_sale/models/website.py b/addons/website_sale/models/website.py
index d79d3195394..aa86beed21a 100644
--- a/addons/website_sale/models/website.py
+++ b/addons/website_sale/models/website.py
@@ -146,7 +146,7 @@ class Website(orm.Model):
         SaleOrder = self.pool.get('sale.order')
         quotation_values = self._ecommerce_get_quotation_values(cr, uid, context=context)
         quotation_values['user_id'] = False
-        quotation_values['section_id'] = self.pool.get('crm.case.section').search(cr, SUPERUSER_ID, [('code', '=', 'SPC')], context=context)[0]
+        quotation_values['section_id'] = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'website_sale', 'crm_case_section_shopping_cart')[1]
         quotation_values['state'] = 'shopping_cart'
         return SaleOrder.create(cr, SUPERUSER_ID, quotation_values, context=context)
 
@@ -222,21 +222,3 @@ class Website(orm.Model):
 
     def ecommerce_get_product_domain(self):
         return [("sale_ok", "=", True),("product_variant_ids","!=",False)]
-
-class sale_order(osv.osv):
-    _inherit = "sale.order"
-
-    _columns = {
-        'state': fields.selection([
-            ('draft', 'Draft Quotation'),
-            ('shopping_cart', 'Shopping Cart'),
-            ('sent', 'Quotation Sent'),
-            ('cancel', 'Cancelled'),
-            ('waiting_date', 'Waiting Schedule'),
-            ('progress', 'Sales Order'),
-            ('manual', 'Sale to Invoice'),
-            ('invoice_except', 'Invoice Exception'),
-            ('done', 'Done'),
-            ], 'Status', readonly=True,
-            help="Gives the status of the quotation or sales order. \nThe exception status is automatically set when a cancel operation occurs in the processing of a document linked to the sales order. \nThe 'Waiting Schedule' status is set when the invoice is confirmed but waiting for the scheduler to run on the order date.", select=True),
-    }

From ed6fa487f99754c077c0b47d29fe0a732586bfd8 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Thu, 17 Apr 2014 10:49:12 +0530
Subject: [PATCH 032/225] [IMP] Missed to remove the unused code.

---
 addons/website_sale_delivery/models/sale_order.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/website_sale_delivery/models/sale_order.py b/addons/website_sale_delivery/models/sale_order.py
index fe81fd65df6..c6ac851d9d4 100644
--- a/addons/website_sale_delivery/models/sale_order.py
+++ b/addons/website_sale_delivery/models/sale_order.py
@@ -82,7 +82,6 @@ class SaleOrder(orm.Model):
                         carrier_id = delivery_id
                         break
                 order.write({'carrier_id': carrier_id}, context=context)
-                context.update({'shopping_cart': 'shopping_cart'})
                 if carrier_id:
                     order.delivery_set(context=context)
                 else:

From 9bb0e6f30ec3a2ef1055e167c2fae8ec0005ba2e Mon Sep 17 00:00:00 2001
From: Randhir Mayatra rma-openerp <rma@tinyerp.com>
Date: Mon, 21 Apr 2014 15:32:12 +0530
Subject: [PATCH 033/225] [IMP] improve demo data and menu items

---
 addons/crm/crm.py                       | 17 ++------
 addons/crm/crm_data.xml                 | 14 +++----
 addons/crm/crm_demo.xml                 | 16 --------
 addons/crm/crm_lead.py                  |  1 +
 addons/crm/crm_lead_data.xml            | 34 ++++++++--------
 addons/crm/crm_lead_demo.xml            | 52 ++++++++++++-------------
 addons/crm/crm_phonecall_data.xml       |  4 +-
 addons/crm/crm_phonecall_demo.xml       | 12 +++---
 addons/sale_team/__openerp__.py         | 12 ++++--
 addons/sale_team/sale_team.py           | 14 ++++++-
 addons/sale_team/sale_team.xml          |  4 +-
 addons/sale_team/sale_team_security.xml | 18 ---------
 12 files changed, 83 insertions(+), 115 deletions(-)
 delete mode 100644 addons/sale_team/sale_team_security.xml

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 166cfc7f435..da57ae628b3 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -91,7 +91,6 @@ class crm_case_stage(osv.osv):
 class crm_case_section(osv.osv):
     """ Model for sales teams. """
     _name = "crm.case.section"
-    _inherits = {'mail.alias': 'alias_id'}
     _inherit = 'crm.case.section'
     _description = "Sales Teams"
 
@@ -120,18 +119,17 @@ class crm_case_section(osv.osv):
         return res
 
     _columns = {
-    
-        'alias_id': fields.many2one('mail.alias', 'Alias', ondelete="restrict", required=True, help="The email address associated with this team. New emails received will automatically ""create new leads assigned to the team."),
         'stage_ids': fields.many2many('crm.case.stage', 'section_stage_rel', 'section_id', 'stage_id', 'Stages'),
         'use_leads': fields.boolean('Leads',
             help="The first contact you get with a potential customer is a lead you qualify before converting it into a real business opportunity. Check this box to manage leads in this sales team."),
-
+                
         'monthly_open_leads': fields.function(_get_opportunities_data,
             type="string", readonly=True, multi='_get_opportunities_data',
             string='Open Leads per Month'),
         'monthly_planned_revenue': fields.function(_get_opportunities_data,
             type="string", readonly=True, multi='_get_opportunities_data',
-            string='Planned Revenue per Month')
+            string='Planned Revenue per Month'),
+        'resource_calendar_id': fields.many2one('resource.calendar', "Working Time", help="Used to compute open days"),
     }
 
     def _get_stage_common(self, cr, uid, context):
@@ -142,15 +140,6 @@ class crm_case_section(osv.osv):
         'stage_ids': _get_stage_common,
         'use_leads': True,
     }
-    
-    def create(self, cr, uid, vals, context=None):
-        if context is None:
-            context = {}
-        create_context = dict(context, alias_model_name='crm.lead', alias_parent_model_name=self._name)
-        section_id = super(crm_case_section, self).create(cr, uid, vals, context=create_context)
-        section = self.browse(cr, uid, section_id, context=context)
-        self.pool.get('mail.alias').write(cr, uid, [section.alias_id.id], {'alias_parent_thread_id': section_id, 'alias_defaults': {'section_id': section_id, 'type': 'lead'}}, context=context)
-        return section_id
 
     def unlink(self, cr, uid, ids, context=None):
         # Cascade-delete mail aliases as well, as they should not exist without the sales team.
diff --git a/addons/crm/crm_data.xml b/addons/crm/crm_data.xml
index 231a7124824..41f4819e500 100644
--- a/addons/crm/crm_data.xml
+++ b/addons/crm/crm_data.xml
@@ -26,34 +26,30 @@
             <field name="name">Email</field>
         </record>
 
-        <record model="crm.case.section" id="section_sales_department">
-            <field name="name">Direct Sales</field>
-            <field name="code">DM</field>
+        <record model="crm.case.section" id="sale_team.section_sales_department">
             <field name="use_leads">True</field>
-            <field name="alias_name">sales</field>
-            <field name="member_ids" eval="[(4, ref('base.user_root'))]"/>
         </record>
 
         <!-- Payment Mode -->
 
         <record model="crm.payment.mode" id="payment_mode_1">
             <field name="name">Cash</field>
-            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
         </record>
 
         <record model="crm.payment.mode" id="payment_mode_2">
             <field name="name">Check</field>
-            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
         </record>
 
         <record model="crm.payment.mode" id="payment_mode_3">
             <field name="name">Credit Card</field>
-            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
         </record>
 
         <record model="crm.payment.mode" id="payment_mode_4">
             <field name="name">Demand Draft</field>
-            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
         </record>
 
         <!--default alias for leads-->
diff --git a/addons/crm/crm_demo.xml b/addons/crm/crm_demo.xml
index 82bdcd8fcd9..1541753523a 100644
--- a/addons/crm/crm_demo.xml
+++ b/addons/crm/crm_demo.xml
@@ -6,22 +6,6 @@
             <field name="groups_id" eval="[(4,ref('base.group_sale_salesman'))]"/>
         </record>
 
-        <record id="crm.section_sales_department" model="crm.case.section">
-            <field name="member_ids" eval="[(4, ref('base.user_demo'))]"/>
-        </record>
-
-        <record model="crm.case.section" id="crm_case_section_1">
-            <field name="name">Indirect Sales</field>
-            <field name="code">IM</field>
-            <field name="member_ids" eval="[(4, ref('base.user_root')),(4, ref('base.user_demo'))]"/>
-        </record>
-
-        <record model="crm.case.section" id="crm_case_section_2">
-            <field name="name">Marketing</field>
-            <field name="code">SPD</field>
-            <field name="member_ids" eval="[(4, ref('base.user_root')),(4, ref('base.user_demo'))]"/>
-        </record>
-
         <record model="crm.segmentation" id="crm_segmentation0">
             <field name="name">OpenERP partners</field>
             <field name="exclusif">True</field>
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 32891c21981..e0149269243 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -195,6 +195,7 @@ class crm_lead(format_address, osv.osv):
                             resource_id = resource_ids[0]
 
                     duration = float(ans.days)
+                    
                     if lead.section_id and lead.section_id.resource_calendar_id:
                         duration =  float(ans.days) * 24
                         new_dates = cal_obj.interval_get(cr,
diff --git a/addons/crm/crm_lead_data.xml b/addons/crm/crm_lead_data.xml
index 1abcdac9712..6dbe9b2ba88 100644
--- a/addons/crm/crm_lead_data.xml
+++ b/addons/crm/crm_lead_data.xml
@@ -60,7 +60,7 @@
             <field name="type">opportunity</field>
         </record>
         
-        <record model="crm.case.section" id="section_sales_department">
+        <record model="crm.case.section" id="sale_team.section_sales_department">
             <field name="stage_ids" eval="[ (4, ref('stage_lead1')), (4, ref('stage_lead2')),
                                             (4, ref('stage_lead3')), (4, ref('stage_lead4')),
                                             (4, ref('stage_lead5')), (4, ref('stage_lead6')),
@@ -70,76 +70,76 @@
         <!-- Crm campain -->
         <record model="crm.case.resource.type" id="type_lead1">
             <field name="name">Telesales</field>
-            <field name="section_id" ref="section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
         </record>
         <record model="crm.case.resource.type" id="type_lead2">
             <field name="name">Email Campaign - Services</field>
-            <field name="section_id" ref="section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
         </record>
         <record model="crm.case.resource.type" id="type_lead3">
             <field name="name">Email Campaign - Products</field>
-            <field name="section_id" ref="section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
         </record>
         <record model="crm.case.resource.type" id="type_lead4">
             <field name="name">Twitter Ads</field>
-            <field name="section_id" ref="section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
         </record>
         <record model="crm.case.resource.type" id="type_lead5">
             <field name="name">Google Adwords</field>
-            <field name="section_id" ref="section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
         </record>
         <record model="crm.case.resource.type" id="type_lead6">
             <field name="name">Banner Ads</field>
-            <field name="section_id" ref="section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
         </record>
         <record model="crm.case.resource.type" id="type_lead7">
             <field name="name">Television</field>
-            <field name="section_id" ref="section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
         </record>
         <record model="crm.case.resource.type" id="type_lead8">
             <field name="name">Newsletter</field>
-            <field name="section_id" ref="section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
         </record>
 
         <!--  crm categories -->
         <record model="crm.case.categ" id="categ_oppor1">
             <field name="name">Product</field>
-            <field name="section_id" ref="section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
             <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
         </record>
         <record model="crm.case.categ" id="categ_oppor2">
             <field name="name">Software</field>
-            <field name="section_id" ref="section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
             <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
         </record>
         <record model="crm.case.categ" id="categ_oppor3">
             <field name="name">Services</field>
-            <field name="section_id" ref="section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
             <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
         </record>
         <record model="crm.case.categ" id="categ_oppor4">
             <field name="name">Information</field>
-            <field name="section_id" ref="section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
             <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
         </record>
         <record model="crm.case.categ" id="categ_oppor5">
             <field name="name">Design</field>
-            <field name="section_id" ref="section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
             <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
         </record>
         <record model="crm.case.categ" id="categ_oppor6">
             <field name="name">Training</field>
-            <field name="section_id" ref="section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
             <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
         </record>
         <record model="crm.case.categ" id="categ_oppor7">
             <field name="name">Consulting</field>
-            <field name="section_id" ref="section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
             <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
         </record>
         <record model="crm.case.categ" id="categ_oppor8">
             <field name="name">Other</field>
-            <field name="section_id" ref="section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
             <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
         </record>
 
diff --git a/addons/crm/crm_lead_demo.xml b/addons/crm/crm_lead_demo.xml
index dab17888d7a..0187f14555f 100644
--- a/addons/crm/crm_lead_demo.xml
+++ b/addons/crm/crm_lead_demo.xml
@@ -20,7 +20,7 @@
             <field name="categ_ids" eval="[(6, 0, [categ_oppor6])]"/>
             <field name="channel_id" ref="crm_case_channel_email"/>
             <field name="priority">1</field>
-            <field name="section_id" ref="section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="stage_lead1"/>
             <field name="description">Hello,
@@ -55,7 +55,7 @@ Could you please send me the details ?</field>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor2])]"/>
             <field name="channel_id" ref="crm_case_channel_website"/>
             <field name="priority">4</field>
-            <field name="section_id" ref="section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="stage_lead1"/>
         </record>
@@ -84,7 +84,7 @@ Could you please send me the details ?</field>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor4])]"/>
             <field name="channel_id" ref=""/>
             <field name="priority">2</field>
-            <field name="section_id" ref="crm_case_section_1"/>
+            <field name="section_id" ref="sale_team.crm_case_section_1"/>
             <field name="user_id" ref="base.user_demo"/>
             <field name="stage_id" ref="stage_lead1"/>
         </record>
@@ -105,7 +105,7 @@ Could you please send me the details ?</field>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor5])]"/>
             <field name="channel_id" ref=""/>
             <field name="priority">3</field>
-            <field name="section_id" ref="crm_case_section_2"/>
+            <field name="section_id" ref="sale_team.crm_case_section_2"/>
             <field name="user_id" ref="base.user_demo"/>
             <field name="stage_id" ref="stage_lead6"/>
         </record>
@@ -130,7 +130,7 @@ Could you please send me the details ?</field>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor1])]"/>
             <field name="channel_id" ref="crm_case_channel_website"/>
             <field name="priority">3</field>
-            <field name="section_id" ref="crm_case_section_1"/>
+            <field name="section_id" ref="sale_team.crm_case_section_1"/>
             <field name="user_id" ref=""/>
             <field name="stage_id" ref="stage_lead1"/>
             <field name="description">Hi,
@@ -157,7 +157,7 @@ Contact: +1 813 494 5005</field>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor3,categ_oppor4])]"/>
             <field name="channel_id" ref=""/>
             <field name="priority">3</field>
-            <field name="section_id" ref="crm_case_section_2"/>
+            <field name="section_id" ref="sale_team.crm_case_section_2"/>
             <field name="user_id" ref=""/>
             <field name="stage_id" ref="stage_lead1"/>
         </record>
@@ -175,7 +175,7 @@ Contact: +1 813 494 5005</field>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor4])]"/>
             <field name="channel_id" ref=""/>
             <field name="priority">5</field>
-            <field name="section_id" ref="crm_case_section_2"/>
+            <field name="section_id" ref="sale_team.crm_case_section_2"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="stage_lead1"/>
         </record>
@@ -194,7 +194,7 @@ Contact: +1 813 494 5005</field>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor6,categ_oppor8])]"/>
             <field name="channel_id" ref=""/>
             <field name="priority">4</field>
-            <field name="section_id" ref="section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="stage_lead1"/>
         </record>
@@ -213,7 +213,7 @@ Contact: +1 813 494 5005</field>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor7])]"/>
             <field name="channel_id" ref="crm_case_channel_phone"/>
             <field name="priority">2</field>
-            <field name="section_id" ref="section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
             <field name="user_id" ref="base.user_demo"/>
             <field name="stage_id" ref="stage_lead1"/>
         </record>
@@ -231,7 +231,7 @@ Contact: +1 813 494 5005</field>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor1])]"/>
             <field name="channel_id" ref="crm_case_channel_email"/>
             <field name="priority">2</field>
-            <field name="section_id" ref="crm_case_section_2"/>
+            <field name="section_id" ref="sale_team.crm_case_section_2"/>
             <field name="user_id" ref="base.user_demo"/>
             <field name="stage_id" ref="stage_lead1"/>
             <field name="description">Hi,
@@ -254,7 +254,7 @@ Andrew</field>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor7])]"/>
             <field name="channel_id" ref="crm_case_channel_direct"/>
             <field name="priority">3</field>
-            <field name="section_id" ref="crm_case_section_1"/>
+            <field name="section_id" ref="sale_team.crm_case_section_1"/>
             <field name="user_id" ref=""/>
             <field name="stage_id" ref="stage_lead1"/>
         </record>
@@ -272,7 +272,7 @@ Andrew</field>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor1])]"/>
             <field name="channel_id" ref="crm_case_channel_website"/>
             <field name="priority">2</field>
-            <field name="section_id" ref="section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
             <field name="user_id" ref=""/>
             <field name="stage_id" ref="stage_lead1"/>
         </record>
@@ -310,7 +310,7 @@ Andrew</field>
             <field eval="time.strftime('%Y-%m-25')" name="date_deadline"/>
             <field eval="time.strftime('%Y-%m-12')" name="date_action"/>
             <field name="title_action">Meeting for pricing information.</field>
-            <field name="section_id" ref="section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="crm.stage_lead1"/>
         </record>
@@ -335,7 +335,7 @@ Andrew</field>
             <field eval="time.strftime('%Y-%m-23')" name="date_deadline"/>
             <field eval="time.strftime('%Y-%m-10')" name="date_action"/>
             <field name="title_action">Send Catalogue by Email</field>
-            <field name="section_id" ref="section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
             <field name="user_id" ref="base.user_demo"/>
             <field name="stage_id" ref="crm.stage_lead3"/>
         </record>
@@ -356,7 +356,7 @@ Andrew</field>
             <field eval="time.strftime('%Y-%m-12')" name="date_deadline"/>
             <field eval="time.strftime('%Y-%m-10')" name="date_action"/>
             <field name="title_action">Call to ask system requirement</field>
-            <field name="section_id" ref="section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
             <field name="user_id" ref="base.user_demo"/>
             <field name="stage_id" ref="crm.stage_lead3"/>
             <field name="date_closed" eval="(DateTime.today() - relativedelta(months=2)).strftime('%Y-%m-%d %H:%M')"/>
@@ -383,7 +383,7 @@ Andrew</field>
             <field eval="time.strftime('%Y-%m-28')" name="date_deadline"/>
             <field eval="time.strftime('%Y-%m-1')" name="date_action"/>
             <field name="title_action">Convert to quote</field>
-            <field name="section_id" ref="crm_case_section_1"/>
+            <field name="section_id" ref="sale_team.crm_case_section_1"/>
             <field name="user_id" ref="base.user_demo"/>
             <field name="stage_id" ref="crm.stage_lead3"/>
             <field name="date_closed" eval="(DateTime.today() - relativedelta(hours=1)).strftime('%Y-%m-%d %H:%M')"/>
@@ -408,7 +408,7 @@ Andrew</field>
             <field eval="time.strftime('%Y-%m-8')" name="date_deadline"/>
             <field eval="time.strftime('%Y-%m-3')" name="date_action"/>
             <field name="title_action">Send price list regarding our interventions</field>
-            <field name="section_id" ref="crm_case_section_1"/>
+            <field name="section_id" ref="sale_team.crm_case_section_1"/>
             <field name="user_id" ref="base.user_demo"/>
             <field name="stage_id" ref="crm.stage_lead4"/>
             <field name="date_closed" eval="(DateTime.today() - relativedelta(hours=1)).strftime('%Y-%m-%d %H:%M')"/>
@@ -435,7 +435,7 @@ Andrew</field>
             <field eval="time.strftime('%Y-%m-13')" name="date_deadline"/>
             <field eval="time.strftime('%Y-%m-4')" name="date_action"/>
             <field name="title_action">Call to define real needs about training</field>
-            <field name="section_id" ref="crm_case_section_1"/>
+            <field name="section_id" ref="sale_team.crm_case_section_1"/>
             <field name="user_id" ref="base.user_demo"/>
             <field name="stage_id" ref="crm.stage_lead4"/>
             <field eval="1" name="active"/>
@@ -462,7 +462,7 @@ Andrew</field>
             <field eval="time.strftime('%Y-%m-10')" name="date_deadline"/>
             <field eval="time.strftime('%Y-%m-5')" name="date_action"/>
             <field name="title_action">Ask for the good receprion of the proposition</field>
-            <field name="section_id" ref="crm_case_section_1"/>
+            <field name="section_id" ref="sale_team.crm_case_section_1"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="crm.stage_lead4"/>
             <field name="date_closed" eval="(DateTime.today() - relativedelta(months=3)).strftime('%Y-%m-%d %H:%M')"/>
@@ -479,7 +479,7 @@ Andrew</field>
             <field name="type_id" ref="type_lead3"/>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor4,categ_oppor8])]"/>
             <field name="priority">2</field>
-            <field name="section_id" ref="crm_case_section_1"/>
+            <field name="section_id" ref="sale_team.crm_case_section_1"/>
             <field name="user_id" ref="base.user_demo"/>
             <field name="stage_id" ref="crm.stage_lead4"/>
         </record>
@@ -493,7 +493,7 @@ Andrew</field>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor7])]"/>
             <field name="channel_id" ref="crm_case_channel_phone"/>
             <field name="priority">3</field>
-            <field name="section_id" ref="crm_case_section_2"/>
+            <field name="section_id" ref="sale_team.crm_case_section_2"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="crm.stage_lead4"/>
             <field name="date_closed" eval="(DateTime.today() - relativedelta(months=1)).strftime('%Y-%m-%d %H:%M')"/>
@@ -511,7 +511,7 @@ Andrew</field>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor3])]"/>
             <field name="channel_id" ref="crm_case_channel_email"/>
             <field name="priority">3</field>
-            <field name="section_id" ref="crm_case_section_2"/>
+            <field name="section_id" ref="sale_team.crm_case_section_2"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="crm.stage_lead5"/>
         </record>
@@ -526,7 +526,7 @@ Andrew</field>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor3])]"/>
             <field name="channel_id" ref="crm_case_channel_direct"/>
             <field name="priority">5</field>
-            <field name="section_id" ref="section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
             <field name="user_id" ref="base.user_demo"/>
             <field name="stage_id" ref="crm.stage_lead5"/>
             <field name="date_closed" eval="(DateTime.today() - relativedelta(hours=1)).strftime('%Y-%m-%d %H:%M')"/>
@@ -545,7 +545,7 @@ Andrew</field>
             <field name="channel_id" ref="crm_case_channel_website"/>
             <field name="priority">5</field>
             <field eval="time.strftime('%Y-%m-6')" name="date_deadline"/>
-            <field name="section_id" ref="section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="crm.stage_lead5"/>
             <field name="date_closed" eval="(DateTime.today() - relativedelta(month=1)).strftime('%Y-%m-%d %H:%M')"/>
@@ -568,7 +568,7 @@ Andrew</field>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor4])]"/>
             <field name="priority">2</field>
             <field name="title_action">Conf call with technical service</field>
-            <field name="section_id" ref="crm_case_section_1"/>
+            <field name="section_id" ref="sale_team.crm_case_section_1"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="crm.stage_lead5"/>
         </record>
@@ -592,7 +592,7 @@ Andrew</field>
             <field eval="time.strftime('%Y-%m-23')" name="date_deadline"/>
             <field eval="time.strftime('%Y-%m-10')" name="date_action"/>
             <field name="title_action">Send Catalogue by Email</field>
-            <field name="section_id" ref="crm_case_section_2"/>
+            <field name="section_id" ref="sale_team.crm_case_section_2"/>
             <field name="user_id" ref="base.user_demo"/>
             <field name="stage_id" ref="crm.stage_lead5"/>
             <!-- <field name="date_closed" eval="(DateTime.today() - relativedelta(hours=1)).strftime('%Y-%m-%d %H:%M')"/> -->
diff --git a/addons/crm/crm_phonecall_data.xml b/addons/crm/crm_phonecall_data.xml
index 0e2bb6511c5..4e613e7f72a 100644
--- a/addons/crm/crm_phonecall_data.xml
+++ b/addons/crm/crm_phonecall_data.xml
@@ -6,13 +6,13 @@
     -->
     <record model="crm.case.categ" id="categ_phone1">
         <field name="name">Inbound</field>
-        <field name="section_id" ref="section_sales_department"/>
+        <field name="section_id" ref="sale_team.section_sales_department"/>
         <field name="object_id" search="[('model','=','crm.phonecall')]" model="ir.model"/>
 
     </record>
     <record model="crm.case.categ" id="categ_phone2">
         <field name="name">Outbound</field>
-        <field name="section_id" ref="section_sales_department"/>
+        <field name="section_id" ref="sale_team.section_sales_department"/>
         <field name="object_id" search="[('model','=','crm.phonecall')]" model="ir.model"/>
     </record>
 
diff --git a/addons/crm/crm_phonecall_demo.xml b/addons/crm/crm_phonecall_demo.xml
index 4002e18815e..c6026c8d894 100644
--- a/addons/crm/crm_phonecall_demo.xml
+++ b/addons/crm/crm_phonecall_demo.xml
@@ -11,7 +11,7 @@
             <field name="name">Left the message</field>
             <field name="state">done</field>
             <field name="partner_phone">+34 934 340 230</field>
-            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
             <field eval="1" name="active"/>
             <field name="categ_id" ref="crm.categ_phone1"/>
             <field eval="2.3" name="duration"/>
@@ -24,7 +24,7 @@
             <field name="name">Need more information on the proposed deal</field>
             <field name="state">done</field>
             <field name="partner_phone">+44 121 690 4596</field>
-            <field name="section_id" ref="crm.crm_case_section_1"/>
+            <field name="section_id" ref="sale_team.crm_case_section_1"/>
             <field eval="1" name="active"/>
             <field name="categ_id" ref="crm.categ_phone1"/>
             <field eval="1.5" name="duration"/>
@@ -37,7 +37,7 @@
             <field name="name">Ask for convenient time of meeting</field>
             <field name="state">open</field>
             <field name="partner_phone">+1 786 525 0724</field>
-            <field name="section_id" ref="crm.crm_case_section_2"/>
+            <field name="section_id" ref="sale_team.crm_case_section_2"/>
             <field eval="1" name="active"/>
             <field name="categ_id" ref="crm.categ_phone2"/>
             <field eval="5.0" name="duration"/>
@@ -50,7 +50,7 @@
             <field name="state">done</field>
             <field name="partner_phone">(077) 582-4035</field>
             <field name="partner_mobile">(077) 341-3591</field>
-            <field name="section_id" ref="crm.crm_case_section_2"/>
+            <field name="section_id" ref="sale_team.crm_case_section_2"/>
             <field eval="1" name="active"/>
             <field name="categ_id" ref="crm.categ_phone1"/>
             <field eval="5.45" name="duration"/>
@@ -63,7 +63,7 @@
             <field name="name">More information on the proposed deal</field>
             <field name="state">pending</field>
             <field name="partner_phone">+1 312 349 2324</field>
-            <field name="section_id" ref="crm.crm_case_section_1"/>
+            <field name="section_id" ref="sale_team.crm_case_section_1"/>
             <field eval="1" name="active"/>
             <field name="categ_id" ref="crm.categ_phone1"/>
             <field eval="2.08" name="duration"/>
@@ -74,7 +74,7 @@
             <field name="name">Proposal for discount offer</field>
             <field name="state">open</field>
             <field name="partner_phone">+34 230 953 485</field>
-            <field name="section_id" ref="crm.crm_case_section_2"/>
+            <field name="section_id" ref="sale_team.crm_case_section_2"/>
             <field eval="time.strftime('%Y-%m-28 14:15:30')" name="date"/>
             <field name="categ_id" ref="crm.categ_phone2"/>
             <field eval="8.56" name="duration"/>
diff --git a/addons/sale_team/__openerp__.py b/addons/sale_team/__openerp__.py
index bb1e8ab5830..9bbdc73e876 100644
--- a/addons/sale_team/__openerp__.py
+++ b/addons/sale_team/__openerp__.py
@@ -22,13 +22,17 @@
     'name' : 'Sale Team',
     'version' : '1.0',
     'author' : 'OpenERP SA',
-    'category': 'hidden',   
+    'category': 'Sales Management',   
     'summary': 'Sales Team',
     'description': """ """,
     'website': 'http://www.openerp.com',
-    'depends' : ['base','web_kanban','mail', 'resource'],
-    'data': ['sale_team.xml','sale_team_security.xml','res_config_view.xml','ir.model.access.csv'],
-    'demo': [],
+    'depends' : ['base','mail'],
+    'data': ['security/sale_team_security.xml',
+             'res_config_view.xml',
+             'ir.model.access.csv',
+             'sale_team_data.xml',
+             'sale_team.xml',],
+    'demo': ['sale_team_demo.xml'],
     'css': ['static/src/css/sale_team.css'],
     'installable': True,
     'auto_install': True,
diff --git a/addons/sale_team/sale_team.py b/addons/sale_team/sale_team.py
index 423bb21391c..eb6c892c2e9 100644
--- a/addons/sale_team/sale_team.py
+++ b/addons/sale_team/sale_team.py
@@ -34,6 +34,7 @@ class crm_case_section(osv.osv):
     _name = "crm.case.section"
     _inherit = ['mail.thread', 'ir.needaction_mixin']
     _description = "Sales Teams"
+    _inherits = {'mail.alias': 'alias_id'}
     _order = "complete_name"
     _period_number = 5
 
@@ -71,6 +72,7 @@ class crm_case_section(osv.osv):
         return section_result
    
     _columns = {
+        'alias_id': fields.many2one('mail.alias', 'Alias', ondelete="restrict", required=True, help="The email address associated with this team. New emails received will automatically ""create new leads assigned to the team."),
         'name': fields.char('Sales Team', size=64, required=True, translate=True),
         'complete_name': fields.function(get_full_name, type='char', size=256, readonly=True, store=True),
         'code': fields.char('Code', size=8),
@@ -82,7 +84,6 @@ class crm_case_section(osv.osv):
         'reply_to': fields.char('Reply-To', size=64, help="The email address put in the 'Reply-To' of all emails sent by OpenERP about cases in this sales team"),
         'parent_id': fields.many2one('crm.case.section', 'Parent Team'),
         'child_ids': fields.one2many('crm.case.section', 'parent_id', 'Child Teams'),
-        'resource_calendar_id': fields.many2one('resource.calendar', "Working Time", help="Used to compute open days"),
         'note': fields.text('Description'),
         'working_hours': fields.float('Working Hours', digits=(16, 2)),
         'color': fields.integer('Color Index'),
@@ -115,7 +116,16 @@ class crm_case_section(osv.osv):
                 name = record['parent_id'][1] + ' / ' + name
             res.append((record['id'], name))
         return res
-        
+    
+    def create(self, cr, uid, vals, context=None):
+        if context is None:
+            context = {}
+        create_context = dict(context, alias_model_name='res.user', alias_parent_model_name=self._name)
+        section_id = super(crm_case_section, self).create(cr, uid, vals, context=create_context)
+        section = self.browse(cr, uid, section_id, context=context)
+        self.pool.get('mail.alias').write(cr, uid, [section.alias_id.id], {'alias_parent_thread_id': section_id, 'alias_defaults': {'section_id': section_id, 'type': 'lead'}}, context=context)
+        return section_id
+             
 class res_users(osv.Model):
     _inherit = 'res.users'
     _columns = {
diff --git a/addons/sale_team/sale_team.xml b/addons/sale_team/sale_team.xml
index 0120dbd21b5..f2fea79a933 100644
--- a/addons/sale_team/sale_team.xml
+++ b/addons/sale_team/sale_team.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
   <data>
-
+        <menuitem name="Sales"
+            id="base.menu_base_partner"
+            groups="base.group_sale_salesman,base.group_sale_manager"/>
  <!-- Update user form !-->
         <record model="ir.ui.view" id="res_user_form">
             <field name="name">Users Preferences</field>
diff --git a/addons/sale_team/sale_team_security.xml b/addons/sale_team/sale_team_security.xml
deleted file mode 100644
index ff8eef01678..00000000000
--- a/addons/sale_team/sale_team_security.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-<data>
-    <record id="base.group_mono_salesteams" model="res.groups">
-        <field name="name">Do Not Use Sales Teams</field>
-        <field name="category_id" ref="base.module_category_hidden"/>
-    </record>
-    <record id="base.group_user" model="res.groups">
-        <field name="implied_ids" eval="[(4, ref('base.group_mono_salesteams'))]"/>
-    </record>
-
-    <record id="base.group_multi_salesteams" model="res.groups">
-        <field name="name">Manage Sales Teams</field>
-        <field name="category_id" ref="base.module_category_hidden"/>
-    </record>
-</data>
-</openerp>
-

From 3bc6bf2d99d000d0c47b19a07cd39e65e878e43f Mon Sep 17 00:00:00 2001
From: Randhir Mayatra rma-openerp <rma@tinyerp.com>
Date: Mon, 21 Apr 2014 16:40:57 +0530
Subject: [PATCH 034/225] [IMP] add demo data files

---
 addons/crm/crm.py                             |  9 +----
 addons/crm/crm_case_section_view.xml          |  1 -
 addons/crm/crm_lead_menu.xml                  |  2 +-
 addons/sale_crm/sale_crm_demo.xml             | 24 +++++------
 addons/sale_team/sale_team.py                 | 10 ++++-
 addons/sale_team/sale_team.xml                |  1 +
 addons/sale_team/sale_team_data.xml           | 11 +++++
 addons/sale_team/sale_team_demo.xml           | 20 ++++++++++
 .../sale_team/security/sale_team_security.xml | 40 +++++++++++++++++++
 9 files changed, 95 insertions(+), 23 deletions(-)
 create mode 100644 addons/sale_team/sale_team_data.xml
 create mode 100644 addons/sale_team/sale_team_demo.xml
 create mode 100644 addons/sale_team/security/sale_team_security.xml

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index da57ae628b3..c43a3feabb8 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -93,6 +93,7 @@ class crm_case_section(osv.osv):
     _name = "crm.case.section"
     _inherit = 'crm.case.section'
     _description = "Sales Teams"
+    _alias_model_name = 'crm.lead'
 
     def _get_opportunities_data(self, cr, uid, ids, field_name, arg, context=None):
         """ Get opportunities-related data for salesteam kanban view
@@ -140,14 +141,6 @@ class crm_case_section(osv.osv):
         'stage_ids': _get_stage_common,
         'use_leads': True,
     }
-
-    def unlink(self, cr, uid, ids, context=None):
-        # Cascade-delete mail aliases as well, as they should not exist without the sales team.
-        mail_alias = self.pool.get('mail.alias')
-        alias_ids = [team.alias_id.id for team in self.browse(cr, uid, ids, context=context) if team.alias_id]
-        res = super(crm_case_section, self).unlink(cr, uid, ids, context=context)
-        mail_alias.unlink(cr, uid, alias_ids, context=context)
-        return res
  
 class crm_case_categ(osv.osv):
     """ Category of Case """
diff --git a/addons/crm/crm_case_section_view.xml b/addons/crm/crm_case_section_view.xml
index 8cc9c0bcd56..10888377050 100644
--- a/addons/crm/crm_case_section_view.xml
+++ b/addons/crm/crm_case_section_view.xml
@@ -89,7 +89,6 @@
             <data>
                 <xpath expr="//field[@name='name']" position="after">
                     <field name="use_leads"/>
-                    <field name="alias_id"/>
                     <field name="monthly_open_leads"/>
                     <field name="monthly_planned_revenue"/>
                 </xpath>
diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml
index dffe03dd4b3..60dc307cc0f 100644
--- a/addons/crm/crm_lead_menu.xml
+++ b/addons/crm/crm_lead_menu.xml
@@ -81,7 +81,7 @@
             action="crm_case_category_act_leads_all"/>
     <menuitem name="Opportunities" id="menu_crm_opportunities" parent="base.menu_sales" sequence="4"
             action="crm_case_category_act_oppor11"
-            groups="base.group_mono_salesteams,base.group_sale_manager"/>
+            groups="base.group_sale_salesman,base.group_sale_manager"/>
 
 </data>
 </openerp>
diff --git a/addons/sale_crm/sale_crm_demo.xml b/addons/sale_crm/sale_crm_demo.xml
index 25f653548d1..9af5ae7ebce 100644
--- a/addons/sale_crm/sale_crm_demo.xml
+++ b/addons/sale_crm/sale_crm_demo.xml
@@ -2,12 +2,12 @@
 <openerp>
     <data>
 
-        <record model="crm.case.section" id="crm.section_sales_department">
+        <record model="crm.case.section" id="sale_team.section_sales_department">
             <field name="invoiced_forecast">52700</field>
             <field name="invoiced_target">60000</field>
         </record>
         
-        <record model="crm.case.section" id="crm.crm_case_section_1">
+        <record model="crm.case.section" id="sale_team.crm_case_section_1">
             <field name="name">Indirect Sales</field>
             <field name="code">IM</field>
             <field name="invoiced_forecast">36000</field>
@@ -21,7 +21,7 @@
             <field name="company_id" ref="base.main_company"/>
             <field name="partner_id" ref="base.res_partner_1"/>
             <field name="journal_id" ref="account.sales_journal"/>
-            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
             <field name="state">draft</field>
             <field name="type">in_invoice</field>
             <field name="account_id" ref="account.a_recv"/>
@@ -69,7 +69,7 @@
             <field name="company_id" ref="base.main_company"/>
             <field name="partner_id" ref="base.res_partner_1"/>
             <field name="journal_id" ref="account.sales_journal"/>
-            <field name="section_id" ref="crm.crm_case_section_1"/>
+            <field name="section_id" ref="sale_team.crm_case_section_1"/>
             <field name="state">draft</field>
             <field name="type">out_invoice</field>
             <field name="account_id" ref="account.a_recv"/>
@@ -98,32 +98,32 @@
 
 
         <record id="sale.sale_order_1" model="sale.order">
-            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
             <field name="date_order" eval="(DateTime.today() - relativedelta(months=1)).strftime('%Y-%m-%d %H:%M')"/>
         </record>
         <record id="sale.sale_order_2" model="sale.order">
-            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
             <field name="date_order" eval="(DateTime.today() - relativedelta(months=1)).strftime('%Y-%m-%d %H:%M')"/>
         </record>
         <record id="sale.sale_order_3" model="sale.order">
-            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
         </record>
         <record id="sale.sale_order_4" model="sale.order">
-            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
         </record>
         <record id="sale.sale_order_5" model="sale.order">
-            <field name="section_id" ref="crm.crm_case_section_1"/>
+            <field name="section_id" ref="sale_team.crm_case_section_1"/>
             <field name="date_order" eval="(DateTime.today() - relativedelta(months=1)).strftime('%Y-%m-%d %H:%M')"/>
         </record>
         <record id="sale.sale_order_6" model="sale.order">
-            <field name="section_id" ref="crm.crm_case_section_1"/>
+            <field name="section_id" ref="sale_team.crm_case_section_1"/>
         </record>
         <record id="sale.sale_order_7" model="sale.order">
-            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
             <field name="date_confirm" eval="(DateTime.today() - relativedelta(months=1)).strftime('%Y-%m-%d %H:%M')"/>
         </record>
         <record id="sale.sale_order_8" model="sale.order">
-            <field name="section_id" ref="crm.crm_case_section_1"/>
+            <field name="section_id" ref="sale_team.crm_case_section_1"/>
         </record>
 
     </data>
diff --git a/addons/sale_team/sale_team.py b/addons/sale_team/sale_team.py
index eb6c892c2e9..3c13514bd11 100644
--- a/addons/sale_team/sale_team.py
+++ b/addons/sale_team/sale_team.py
@@ -37,6 +37,7 @@ class crm_case_section(osv.osv):
     _inherits = {'mail.alias': 'alias_id'}
     _order = "complete_name"
     _period_number = 5
+    _alias_model_name = 'mail.message'
 
     def get_full_name(self, cr, uid, ids, field_name, arg, context=None):
         return dict(self.name_get(cr, uid, ids, context=context))
@@ -120,11 +121,18 @@ class crm_case_section(osv.osv):
     def create(self, cr, uid, vals, context=None):
         if context is None:
             context = {}
-        create_context = dict(context, alias_model_name='res.user', alias_parent_model_name=self._name)
+        create_context = dict(context, alias_model_name=self._alias_model_name, alias_parent_model_name=self._name)
         section_id = super(crm_case_section, self).create(cr, uid, vals, context=create_context)
         section = self.browse(cr, uid, section_id, context=context)
         self.pool.get('mail.alias').write(cr, uid, [section.alias_id.id], {'alias_parent_thread_id': section_id, 'alias_defaults': {'section_id': section_id, 'type': 'lead'}}, context=context)
         return section_id
+    def unlink(self, cr, uid, ids, context=None):
+        # Cascade-delete mail aliases as well, as they should not exist without the sales team.
+        mail_alias = self.pool.get('mail.alias')
+        alias_ids = [team.alias_id.id for team in self.browse(cr, uid, ids, context=context) if team.alias_id]
+        res = super(crm_case_section, self).unlink(cr, uid, ids, context=context)
+        mail_alias.unlink(cr, uid, alias_ids, context=context)
+        return res
              
 class res_users(osv.Model):
     _inherit = 'res.users'
diff --git a/addons/sale_team/sale_team.xml b/addons/sale_team/sale_team.xml
index f2fea79a933..b3972e71342 100644
--- a/addons/sale_team/sale_team.xml
+++ b/addons/sale_team/sale_team.xml
@@ -42,6 +42,7 @@
                     <field name="name"/>
                     <field name="user_id"/>
                     <field name="member_ids"/>
+                    <field name="alias_id"/>
                     <field name="note"/>
                     <field name="color"/>
                     <templates>
diff --git a/addons/sale_team/sale_team_data.xml b/addons/sale_team/sale_team_data.xml
new file mode 100644
index 00000000000..eef5e5809a1
--- /dev/null
+++ b/addons/sale_team/sale_team_data.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+        <record model="crm.case.section" id="section_sales_department">
+            <field name="name">Direct Sales</field>
+            <field name="code">DM</field>
+            <field name="alias_name">sales</field>
+            <field name="member_ids" eval="[(4, ref('base.user_root'))]"/>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/sale_team/sale_team_demo.xml b/addons/sale_team/sale_team_demo.xml
new file mode 100644
index 00000000000..b24c047fba1
--- /dev/null
+++ b/addons/sale_team/sale_team_demo.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+        <record id="section_sales_department" model="crm.case.section">
+            <field name="member_ids" eval="[(4, ref('base.user_demo'))]"/>
+        </record>
+        <record model="crm.case.section" id="crm_case_section_1">
+            <field name="name">Indirect Sales</field>
+            <field name="code">IM</field>
+            <field name="member_ids" eval="[(4, ref('base.user_root')),(4, ref('base.user_demo'))]"/>
+        </record>
+
+        <record model="crm.case.section" id="crm_case_section_2">
+            <field name="name">Marketing</field>
+            <field name="code">SPD</field>
+            <field name="member_ids" eval="[(4, ref('base.user_root')),(4, ref('base.user_demo'))]"/>
+        </record>
+
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/sale_team/security/sale_team_security.xml b/addons/sale_team/security/sale_team_security.xml
new file mode 100644
index 00000000000..53fb560e332
--- /dev/null
+++ b/addons/sale_team/security/sale_team_security.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="0">
+
+        <record id="base.group_sale_salesman" model="res.groups">
+            <field name="name">User: Own Leads Only</field>
+            <field name="category_id" ref="base.module_category_sales_management"/>
+            <field name="implied_ids" eval="[(4, ref('base.group_user'))]"/>
+            <field name="comment">the user will have access to his own data in the sales application.</field>
+        </record>
+    
+        <record id="base.group_sale_salesman_all_leads" model="res.groups">
+            <field name="name">User: All Leads</field>
+            <field name="category_id" ref="base.module_category_sales_management"/>
+            <field name="implied_ids" eval="[(4, ref('base.group_sale_salesman'))]"/>
+            <field name="comment">the user will have access to all records of everyone in the sales application.</field>
+        </record>
+    
+        <record id="base.group_sale_manager" model="res.groups">
+            <field name="name">Manager</field>
+            <field name="comment">the user will have an access to the sales configuration as well as statistic reports.</field>
+            <field name="category_id" ref="base.module_category_sales_management"/>
+            <field name="implied_ids" eval="[(4, ref('base.group_sale_salesman_all_leads'))]"/>
+            <field name="users" eval="[(4, ref('base.user_root'))]"/>
+        </record>
+    
+        <record model="res.users" id="base.user_root">
+            <field eval="[(4,ref('base.group_partner_manager'))]" name="groups_id"/>
+        </record>
+    
+        <record model='ir.ui.menu' id='base.menu_base_partner'>
+            <field name="groups_id" eval="[(4,ref('base.group_sale_manager')),(4,ref('base.group_sale_salesman'))]"/>
+        </record>
+    
+        <record model="ir.ui.menu" id="base.menu_base_config">
+            <field eval="[(4, ref('base.group_sale_manager'))]" name="groups_id"/>
+        </record>
+
+    </data>
+</openerp>

From 2d4ebc9edcf1f53f24f0e99e13753c5649360a50 Mon Sep 17 00:00:00 2001
From: Randhir Mayatra rma-openerp <rma@tinyerp.com>
Date: Mon, 21 Apr 2014 17:54:27 +0530
Subject: [PATCH 035/225] [IMP] improve kanban view and dependent demo data
 record

---
 addons/crm/crm_case_section_view.xml | 36 ++++++++++++++--------------
 addons/crm_claim/crm_claim_data.xml  | 10 ++++----
 addons/crm_claim/crm_claim_demo.xml  | 14 +++++------
 addons/sale_team/sale_team.xml       |  5 +++-
 4 files changed, 34 insertions(+), 31 deletions(-)

diff --git a/addons/crm/crm_case_section_view.xml b/addons/crm/crm_case_section_view.xml
index 10888377050..4c313d488b2 100644
--- a/addons/crm/crm_case_section_view.xml
+++ b/addons/crm/crm_case_section_view.xml
@@ -93,26 +93,26 @@
                     <field name="monthly_planned_revenue"/>
                 </xpath>
                 <xpath expr="//div[@class='oe_clear']" position="before">
-                <div class="oe_kanban_alias oe_center" t-if="record.use_leads.raw_value and record.alias_id.value">
-                    <small><span class="oe_e oe_e_alias" style="float: none;">%%</span><t t-raw="record.alias_id.raw_value[1]"/></small>
-                </div>
-                <div class="oe_items_list">
-                    <div class="oe_salesteams_leads" t-if="record.use_leads.raw_value">
-                        <a name="%(crm_case_form_view_salesteams_lead)d" type="action">Leads</a>
-                        <a name="%(action_report_crm_lead_salesteam)d" type="action" class="oe_sparkline_bar_link">
-                            <field name="monthly_open_leads" widget="sparkline_bar"
-                                options="{'height': '20px', 'barWidth': 4, 'barSpacing': 1, 'delayIn': '3000', 'tooltip_suffix': ' Leads'}">Open Leads per Month<br/>Click to see a detailed analysis of leads.</field>
-                        </a>
+                    <div class="oe_kanban_alias oe_center" t-if="record.use_leads.raw_value and record.alias_id.value">
+                        <small><span class="oe_e oe_e_alias" style="float: none;">%%</span><t t-raw="record.alias_id.raw_value[1]"/></small>
                     </div>
-                    <div class="oe_salesteams_opportunities">
-                        <a name="%(crm_case_form_view_salesteams_opportunity)d" type="action">Opportunities</a>
-                        <a name="%(action_report_crm_opportunity_salesteam)d" type="action">
-                            <field name="monthly_planned_revenue" widget="sparkline_bar"
-                                options="{'height': '20px', 'barWidth': '4', 'barSpacing': '1', 'delayIn': '3000', 'tooltip_suffix': ' (Planned Revenue)'}">Planned Revenue per Month<br/>Click to see a detailed analysis of opportunities.</field>
-                        </a>
+                    <div class="oe_items_list">
+                        <div class="oe_salesteams_leads" t-if="record.use_leads.raw_value">
+                            <a name="%(crm_case_form_view_salesteams_lead)d" type="action">Leads</a>
+                            <a name="%(action_report_crm_lead_salesteam)d" type="action" class="oe_sparkline_bar_link">
+                                <field name="monthly_open_leads" widget="sparkline_bar"
+                                    options="{'height': '20px', 'barWidth': 4, 'barSpacing': 1, 'delayIn': '3000', 'tooltip_suffix': ' Leads'}">Open Leads per Month<br/>Click to see a detailed analysis of leads.</field>
+                            </a>
+                        </div>
+                        <div class="oe_salesteams_opportunities">
+                            <a name="%(crm_case_form_view_salesteams_opportunity)d" type="action">Opportunities</a>
+                            <a name="%(action_report_crm_opportunity_salesteam)d" type="action">
+                                <field name="monthly_planned_revenue" widget="sparkline_bar"
+                                    options="{'height': '20px', 'barWidth': '4', 'barSpacing': '1', 'delayIn': '3000', 'tooltip_suffix': ' (Planned Revenue)'}">Planned Revenue per Month<br/>Click to see a detailed analysis of opportunities.</field>
+                            </a>
+                        </div>
                     </div>
-                </div>
-            </xpath>
+                </xpath>
           </data>
          </field>
         </record>
diff --git a/addons/crm_claim/crm_claim_data.xml b/addons/crm_claim/crm_claim_data.xml
index d897fe2bcb3..8a1bae29a2b 100644
--- a/addons/crm_claim/crm_claim_data.xml
+++ b/addons/crm_claim/crm_claim_data.xml
@@ -8,19 +8,19 @@
         
         <record model="crm.case.categ" id="categ_claim1">
             <field name="name">Factual Claims</field>
-            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
             <field name="object_id" search="[('model','=','crm.claim')]" model="ir.model"/> 
         </record>
         
         <record model="crm.case.categ" id="categ_claim2">
             <field name="name">Value Claims</field>
-            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
             <field name="object_id" search="[('model','=','crm.claim')]" model="ir.model"/> 
         </record>
         
         <record model="crm.case.categ" id="categ_claim3">
             <field name="name">Policy Claims</field>
-            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
             <field name="object_id" search="[('model','=','crm.claim')]" model="ir.model"/> 
         </record>
     
@@ -30,12 +30,12 @@
         
         <record model="crm.case.resource.type" id="type_claim1">
             <field name="name">Corrective</field>
-            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
         </record>
         
         <record model="crm.case.resource.type" id="type_claim2">
             <field name="name">Preventive</field>
-            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
         </record>
     
         <!--
diff --git a/addons/crm_claim/crm_claim_demo.xml b/addons/crm_claim/crm_claim_demo.xml
index 2448fe5d0c5..f7675599561 100644
--- a/addons/crm_claim/crm_claim_demo.xml
+++ b/addons/crm_claim/crm_claim_demo.xml
@@ -12,7 +12,7 @@
             <field eval="&quot;3&quot;" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;Problem with the delivery of goods&quot;" name="name"/>
-            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
             <field name="categ_id" ref="crm_claim.categ_claim1"/>
             <field name="stage_id" ref="crm_claim.stage_claim1"/>
             <field eval="&quot;(769) 703-274&quot;" name="partner_phone"/>
@@ -24,7 +24,7 @@
             <field eval="&quot;4&quot;" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;Damaged Products&quot;" name="name"/>
-            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
             <field name="categ_id" ref="crm_claim.categ_claim2"/>
             <field name="stage_id" ref="crm_claim.stage_claim5"/>
             <field eval="&quot;(956) 293-2595&quot;" name="partner_phone"/>
@@ -36,7 +36,7 @@
             <field eval="&quot;2&quot;" name="priority"/>
             <field name="user_id" ref="base.user_demo"/>
             <field eval="&quot;Document related problems&quot;" name="name"/>
-            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
             <field name="categ_id" ref="crm_claim.categ_claim3"/>
             <field name="stage_id" ref="crm_claim.stage_claim2"/>
             <field eval="&quot;(079) 681-2139&quot;" name="partner_phone"/>
@@ -49,7 +49,7 @@
             <field eval="&quot;3&quot;" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;Product quality not maintained&quot;" name="name"/>
-            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
             <field name="categ_id" ref="crm_claim.categ_claim1"/>
             <field name="stage_id" ref="crm_claim.stage_claim5"/>
             <field eval="&quot;(514) 698-4118&quot;" name="partner_phone"/>
@@ -61,7 +61,7 @@
             <field eval="&quot;3&quot;" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;Some products missing&quot;" name="name"/>
-            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
             <field name="categ_id" ref="crm_claim.categ_claim3"/>
             <field name="stage_id" ref="crm_claim.stage_claim3"/>
             <field eval="&quot;(855) 924-4364&quot;" name="partner_phone"/>
@@ -72,7 +72,7 @@
             <field eval="&quot;3&quot;" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;Problem with the delivery of assignments&quot;" name="name"/>
-            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
             <field eval="time.strftime('%Y-%m-28 14:15:30')" name="date"/>
             <field name="categ_id" ref="crm_claim.categ_claim1"/>
             <field name="stage_id" ref="crm_claim.stage_claim5"/>
@@ -85,7 +85,7 @@
             <field eval="&quot;3&quot;" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;Documents unclear&quot;" name="name"/>
-            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
             <field eval="time.strftime('%Y-%m-19 13:01:05')" name="date"/>
             <field name="categ_id" ref="crm_claim.categ_claim3"/>
             <field name="stage_id" ref="crm_claim.stage_claim2"/>
diff --git a/addons/sale_team/sale_team.xml b/addons/sale_team/sale_team.xml
index b3972e71342..080df844879 100644
--- a/addons/sale_team/sale_team.xml
+++ b/addons/sale_team/sale_team.xml
@@ -48,7 +48,7 @@
                     <templates>
                         <t t-name="kanban-box">
                             <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click oe_kanban_crm_salesteams">
-                                <div class="oe_dropdown_toggle oe_dropdown_kanban">
+                                <div class="oe_dropdown_toggle oe_dropdown_kanban" groups="base.group_sale_manager">
                                     <span class="oe_e">í</span>
                                     <ul class="oe_dropdown_menu">
                                         <li t-if="widget.view.is_action_enabled('edit')"><a type="edit">Sales Teams Settings</a></li>
@@ -58,6 +58,9 @@
                                 </div>
                                 <div class="oe_kanban_content">
                                     <h4 class="oe_center"><field name="name"/></h4>
+                                    <div class="oe_kanban_alias oe_center" t-if="record.alias_id.value">
+                                        <small><span class="oe_e oe_e_alias" style="float: none;">%%</span><t t-raw="record.alias_id.raw_value[1]"/></small>
+                                    </div>
                                     <div class="oe_clear"></div>
                                     <div class="oe_kanban_salesteams_avatars">
                                         <t t-foreach="record.member_ids.raw_value.slice(0,10)" t-as="member">

From 1338f91535528c37cd05b38073aa51410f4e2970 Mon Sep 17 00:00:00 2001
From: Randhir Mayatra rma-openerp <rma@tinyerp.com>
Date: Tue, 22 Apr 2014 11:04:24 +0530
Subject: [PATCH 036/225] [IMP] improve kanban view

---
 addons/crm/__openerp__.py       | 1 -
 addons/sale_team/__openerp__.py | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 1b777ab3525..97a9f26e631 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -59,7 +59,6 @@ Dashboard for CRM will include:
         'resource',
         'board',
         'fetchmail',
-        'web_kanban_sparkline',
     ],
     'data': [
         'crm_data.xml',
diff --git a/addons/sale_team/__openerp__.py b/addons/sale_team/__openerp__.py
index 9bbdc73e876..2ea88cc6a92 100644
--- a/addons/sale_team/__openerp__.py
+++ b/addons/sale_team/__openerp__.py
@@ -26,7 +26,7 @@
     'summary': 'Sales Team',
     'description': """ """,
     'website': 'http://www.openerp.com',
-    'depends' : ['base','mail'],
+    'depends' : ['base','mail','web_kanban_sparkline',],
     'data': ['security/sale_team_security.xml',
              'res_config_view.xml',
              'ir.model.access.csv',

From d0df0175ec05c32008fb09aaa4ca8577a59dc4bf Mon Sep 17 00:00:00 2001
From: Randhir Mayatra rma-openerp <rma@tinyerp.com>
Date: Tue, 22 Apr 2014 11:55:58 +0530
Subject: [PATCH 037/225] [IMP] improve order of kanban items

---
 addons/crm/crm_case_section_view.xml | 2 +-
 addons/sale_team/sale_team.xml       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/crm/crm_case_section_view.xml b/addons/crm/crm_case_section_view.xml
index 4c313d488b2..f45b3c4204e 100644
--- a/addons/crm/crm_case_section_view.xml
+++ b/addons/crm/crm_case_section_view.xml
@@ -92,7 +92,7 @@
                     <field name="monthly_open_leads"/>
                     <field name="monthly_planned_revenue"/>
                 </xpath>
-                <xpath expr="//div[@class='oe_clear']" position="before">
+                <xpath expr="//div[@name='avtar']" position="after">
                     <div class="oe_kanban_alias oe_center" t-if="record.use_leads.raw_value and record.alias_id.value">
                         <small><span class="oe_e oe_e_alias" style="float: none;">%%</span><t t-raw="record.alias_id.raw_value[1]"/></small>
                     </div>
diff --git a/addons/sale_team/sale_team.xml b/addons/sale_team/sale_team.xml
index 080df844879..e3bea558a68 100644
--- a/addons/sale_team/sale_team.xml
+++ b/addons/sale_team/sale_team.xml
@@ -58,7 +58,7 @@
                                 </div>
                                 <div class="oe_kanban_content">
                                     <h4 class="oe_center"><field name="name"/></h4>
-                                    <div class="oe_kanban_alias oe_center" t-if="record.alias_id.value">
+                                    <div class="oe_kanban_alias oe_center" t-if="record.alias_id.value" name="avtar">
                                         <small><span class="oe_e oe_e_alias" style="float: none;">%%</span><t t-raw="record.alias_id.raw_value[1]"/></small>
                                     </div>
                                     <div class="oe_clear"></div>

From 27ee024847dfde9e5a14eb26680621b60399b556 Mon Sep 17 00:00:00 2001
From: Randhir Mayatra rma-openerp <rma@tinyerp.com>
Date: Tue, 22 Apr 2014 12:53:03 +0530
Subject: [PATCH 038/225] [IMP] optimize code

---
 addons/crm/crm.py                             |  3 +-
 addons/crm/crm_case_section_view.xml          | 55 +++++++++----------
 addons/crm/crm_lead.py                        |  3 +-
 addons/crm/security/crm_security.xml          |  1 -
 addons/gamification/models/goal.py            |  2 +
 addons/sale/report/__init__.py                |  1 +
 .../sale/report/sale_analysis_report_view.xml |  4 +-
 addons/sale/sale.py                           |  4 +-
 addons/sale/sale_view.xml                     |  2 -
 addons/sale_crm/__init__.py                   |  1 -
 addons/sale_crm/report/__init__.py            | 26 ---------
 addons/sale_crm/sale_crm_view.xml             |  2 +-
 addons/sale_team/__init__.py                  |  3 +-
 addons/sale_team/__openerp__.py               |  2 +-
 addons/sale_team/res_config_view.xml          | 27 +++++----
 addons/sale_team/sale_team.py                 |  9 +--
 addons/sale_team/sale_team.xml                | 19 +------
 addons/sale_team/sale_team_config.py          | 27 +++++++--
 addons/sale_team/sale_team_demo.xml           |  1 -
 .../{ => security}/ir.model.access.csv        |  3 +-
 .../sale_team/security/sale_team_security.xml |  1 -
 21 files changed, 77 insertions(+), 119 deletions(-)
 delete mode 100644 addons/sale_crm/report/__init__.py
 rename addons/sale_team/{ => security}/ir.model.access.csv (87%)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index c43a3feabb8..86350b472a7 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -120,17 +120,16 @@ class crm_case_section(osv.osv):
         return res
 
     _columns = {
+        'resource_calendar_id': fields.many2one('resource.calendar', "Working Time", help="Used to compute open days"),
         'stage_ids': fields.many2many('crm.case.stage', 'section_stage_rel', 'section_id', 'stage_id', 'Stages'),
         'use_leads': fields.boolean('Leads',
             help="The first contact you get with a potential customer is a lead you qualify before converting it into a real business opportunity. Check this box to manage leads in this sales team."),
-                
         'monthly_open_leads': fields.function(_get_opportunities_data,
             type="string", readonly=True, multi='_get_opportunities_data',
             string='Open Leads per Month'),
         'monthly_planned_revenue': fields.function(_get_opportunities_data,
             type="string", readonly=True, multi='_get_opportunities_data',
             string='Planned Revenue per Month'),
-        'resource_calendar_id': fields.many2one('resource.calendar', "Working Time", help="Used to compute open days"),
     }
 
     def _get_stage_common(self, cr, uid, context):
diff --git a/addons/crm/crm_case_section_view.xml b/addons/crm/crm_case_section_view.xml
index f45b3c4204e..57f5b70bfe8 100644
--- a/addons/crm/crm_case_section_view.xml
+++ b/addons/crm/crm_case_section_view.xml
@@ -86,39 +86,38 @@
             <field name="model">crm.case.section</field>
             <field name="inherit_id" ref="sale_team.crm_case_section_salesteams_view_kanban"/>
             <field name="arch" type="xml">
-            <data>
-                <xpath expr="//field[@name='name']" position="after">
-                    <field name="use_leads"/>
-                    <field name="monthly_open_leads"/>
-                    <field name="monthly_planned_revenue"/>
-                </xpath>
-                <xpath expr="//div[@name='avtar']" position="after">
-                    <div class="oe_kanban_alias oe_center" t-if="record.use_leads.raw_value and record.alias_id.value">
-                        <small><span class="oe_e oe_e_alias" style="float: none;">%%</span><t t-raw="record.alias_id.raw_value[1]"/></small>
-                    </div>
-                    <div class="oe_items_list">
-                        <div class="oe_salesteams_leads" t-if="record.use_leads.raw_value">
-                            <a name="%(crm_case_form_view_salesteams_lead)d" type="action">Leads</a>
-                            <a name="%(action_report_crm_lead_salesteam)d" type="action" class="oe_sparkline_bar_link">
-                                <field name="monthly_open_leads" widget="sparkline_bar"
-                                    options="{'height': '20px', 'barWidth': 4, 'barSpacing': 1, 'delayIn': '3000', 'tooltip_suffix': ' Leads'}">Open Leads per Month<br/>Click to see a detailed analysis of leads.</field>
-                            </a>
+                <data>
+                    <xpath expr="//field[@name='name']" position="after">
+                        <field name="use_leads"/>
+                        <field name="monthly_open_leads"/>
+                        <field name="monthly_planned_revenue"/>
+                    </xpath>
+                    <xpath expr="//div[@name='avtar']" position="after">
+                        <div class="oe_kanban_alias oe_center" t-if="record.use_leads.raw_value and record.alias_id.value">
+                            <small><span class="oe_e oe_e_alias" style="float: none;">%%</span><t t-raw="record.alias_id.raw_value[1]"/></small>
                         </div>
-                        <div class="oe_salesteams_opportunities">
-                            <a name="%(crm_case_form_view_salesteams_opportunity)d" type="action">Opportunities</a>
-                            <a name="%(action_report_crm_opportunity_salesteam)d" type="action">
-                                <field name="monthly_planned_revenue" widget="sparkline_bar"
-                                    options="{'height': '20px', 'barWidth': '4', 'barSpacing': '1', 'delayIn': '3000', 'tooltip_suffix': ' (Planned Revenue)'}">Planned Revenue per Month<br/>Click to see a detailed analysis of opportunities.</field>
-                            </a>
+                        <div class="oe_items_list">
+                            <div class="oe_salesteams_leads" t-if="record.use_leads.raw_value">
+                                <a name="%(crm_case_form_view_salesteams_lead)d" type="action">Leads</a>
+                                <a name="%(action_report_crm_lead_salesteam)d" type="action" class="oe_sparkline_bar_link">
+                                    <field name="monthly_open_leads" widget="sparkline_bar"
+                                        options="{'height': '20px', 'barWidth': 4, 'barSpacing': 1, 'delayIn': '3000', 'tooltip_suffix': ' Leads'}">Open Leads per Month<br/>Click to see a detailed analysis of leads.</field>
+                                </a>
+                            </div>
+                            <div class="oe_salesteams_opportunities">
+                                <a name="%(crm_case_form_view_salesteams_opportunity)d" type="action">Opportunities</a>
+                                <a name="%(action_report_crm_opportunity_salesteam)d" type="action">
+                                    <field name="monthly_planned_revenue" widget="sparkline_bar"
+                                        options="{'height': '20px', 'barWidth': '4', 'barSpacing': '1', 'delayIn': '3000', 'tooltip_suffix': ' (Planned Revenue)'}">Planned Revenue per Month<br/>Click to see a detailed analysis of opportunities.</field>
+                                </a>
+                            </div>
                         </div>
-                    </div>
-                </xpath>
-          </data>
-         </field>
+                    </xpath>
+                </data>
+            </field>
         </record>
 
         <!-- Case Sections Action -->
-
         <record model="ir.actions.act_window.view" id="action_crm_tag_kanban_view_salesteams_oppor11">
             <field name="sequence" eval="0"/>
             <field name="view_mode">kanban</field>
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index e0149269243..cc2488f9589 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -195,7 +195,6 @@ class crm_lead(format_address, osv.osv):
                             resource_id = resource_ids[0]
 
                     duration = float(ans.days)
-                    
                     if lead.section_id and lead.section_id.resource_calendar_id:
                         duration =  float(ans.days) * 24
                         new_dates = cal_obj.interval_get(cr,
@@ -351,7 +350,7 @@ class crm_lead(format_address, osv.osv):
             if user.default_section_id and user.default_section_id.id:
                 return {'value': {'section_id': user.default_section_id.id}}
         return {'value': {'section_id': section_id}}
-        
+    
     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:
diff --git a/addons/crm/security/crm_security.xml b/addons/crm/security/crm_security.xml
index bd2c3cdb3a4..7539b699614 100644
--- a/addons/crm/security/crm_security.xml
+++ b/addons/crm/security/crm_security.xml
@@ -24,7 +24,6 @@
         <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
 
-        
     <record id="group_fund_raising" model="res.groups">
         <field name="name">Manage Fund Raising</field>
         <field name="category_id" ref="base.module_category_hidden"/>
diff --git a/addons/gamification/models/goal.py b/addons/gamification/models/goal.py
index 2a9b6788360..f6f7165c41b 100644
--- a/addons/gamification/models/goal.py
+++ b/addons/gamification/models/goal.py
@@ -282,6 +282,7 @@ class gamification_goal(osv.Model):
                         _logger.exception(_('Invalid return content from the evaluation of code for definition %s' % definition.name))
 
             else:  # count or sum
+                
                 obj = self.pool.get(definition.model_id.model)
                 field_date_name = definition.field_date_id and definition.field_date_id.name or False
 
@@ -345,6 +346,7 @@ class gamification_goal(osv.Model):
             if not value:
                 continue
             goal = all_goals[goal_id]
+            
             # check goal target reached
             if (goal.definition_condition == 'higher' and value.get('current', goal.current) >= goal.target_goal) \
               or (goal.definition_condition == 'lower' and value.get('current', goal.current) <= goal.target_goal):
diff --git a/addons/sale/report/__init__.py b/addons/sale/report/__init__.py
index f1d48dd38e9..0ce593424d3 100644
--- a/addons/sale/report/__init__.py
+++ b/addons/sale/report/__init__.py
@@ -18,6 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 import sales_crm_account_invoice_report
 import sale_report
 import sale_analysis_report
diff --git a/addons/sale/report/sale_analysis_report_view.xml b/addons/sale/report/sale_analysis_report_view.xml
index fb62468ec91..83613219046 100644
--- a/addons/sale/report/sale_analysis_report_view.xml
+++ b/addons/sale/report/sale_analysis_report_view.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-     <data>
+    <data>
         <record id="view_order_product_search_sale_crm_inherit" model="ir.ui.view">
             <field name="name">sale.report.search.sale.crm</field>
             <field name="model">sale.report</field>
@@ -12,5 +12,5 @@
                 </filter>
             </field>
         </record>
-     </data>
+    </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 09008e1dc81..d597d0d1743 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -18,6 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 import calendar
 from openerp import tools
 from datetime import date, datetime, timedelta
@@ -389,7 +390,6 @@ class sale_order(osv.osv):
         # Care for deprecated _inv_get() hook - FIXME: to be removed after 6.1
         invoice_vals.update(self._inv_get(cr, uid, order, context=context))
         return invoice_vals
-        
 
     def _make_invoice(self, cr, uid, order, lines, context=None):
         inv_obj = self.pool.get('account.invoice')
@@ -1012,10 +1012,10 @@ class mail_compose_message(osv.Model):
             context = dict(context, mail_post_autofollow=True)
             self.pool.get('sale.order').signal_quotation_sent(cr, uid, [context['default_res_id']])
         return super(mail_compose_message, self).send_mail(cr, uid, ids, context=context)
-        
 
 class account_invoice(osv.Model):
     _inherit = 'account.invoice'
+    
     _columns = {
         'section_id': fields.many2one('crm.case.section', 'Sales Team'),
     }
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index fafca287f2e..790e71ee37b 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -565,9 +565,7 @@
             </field>
         </record>
 
-       
         <!-- search by Salesteams -->
-
         <record id="action_orders_salesteams" model="ir.actions.act_window">
             <field name="name">Sales Orders</field>
             <field name="type">ir.actions.act_window</field>
diff --git a/addons/sale_crm/__init__.py b/addons/sale_crm/__init__.py
index cda0cd795a2..ac44586e7db 100644
--- a/addons/sale_crm/__init__.py
+++ b/addons/sale_crm/__init__.py
@@ -21,6 +21,5 @@
 
 import wizard
 import sale_crm
-import report
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale_crm/report/__init__.py b/addons/sale_crm/report/__init__.py
deleted file mode 100644
index 3fd45ac3f8f..00000000000
--- a/addons/sale_crm/report/__init__.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index 102eb9462fa..070b8ef4fa7 100644
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -31,5 +31,5 @@
                 </field>
             </field>
         </record>
-      </data>
+    </data>
 </openerp>
diff --git a/addons/sale_team/__init__.py b/addons/sale_team/__init__.py
index 6bac200f0db..f6973d5f845 100644
--- a/addons/sale_team/__init__.py
+++ b/addons/sale_team/__init__.py
@@ -21,5 +21,4 @@
 import sale_team
 import sale_team_config
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/sale_team/__openerp__.py b/addons/sale_team/__openerp__.py
index 2ea88cc6a92..ea45d3c1e68 100644
--- a/addons/sale_team/__openerp__.py
+++ b/addons/sale_team/__openerp__.py
@@ -28,8 +28,8 @@
     'website': 'http://www.openerp.com',
     'depends' : ['base','mail','web_kanban_sparkline',],
     'data': ['security/sale_team_security.xml',
+             'security/ir.model.access.csv',
              'res_config_view.xml',
-             'ir.model.access.csv',
              'sale_team_data.xml',
              'sale_team.xml',],
     'demo': ['sale_team_demo.xml'],
diff --git a/addons/sale_team/res_config_view.xml b/addons/sale_team/res_config_view.xml
index 7723fda48fc..ddcc72b5375 100644
--- a/addons/sale_team/res_config_view.xml
+++ b/addons/sale_team/res_config_view.xml
@@ -1,27 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-
         <record id="view_sale_config_settings" model="ir.ui.view">
             <field name="name">crm settings</field>
             <field name="model">sale.team.config.settings</field>
             <field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
             <field name="arch" type="xml">
                 <data>
-	            <div name="config_sale" position="before">
-                    <separator string="Sales Teams"/>
-                    <group>
-                        <label for="id" string="Manage Sales Teams"/>
-                        <div>
+                    <div name="config_sale" position="before">
+                        <separator string="Sales Teams"/>
+                        <group>
+                            <label for="id" string="Manage Sales Teams"/>
                             <div>
-                                <field name="group_multi_salesteams" class="oe_inline"/>
-                                <label for="group_multi_salesteams"/>
+                                <div>
+                                    <field name="group_multi_salesteams" class="oe_inline"/>
+                                    <label for="group_multi_salesteams"/>
+                                </div>
                             </div>
-                            
-                        </div>
-                    </group>
-	            </div>
-	          </data></field>
+                        </group>
+    	            </div>
+    	        </data>
+	        </field>
         </record>
-     </data>
+    </data>
 </openerp>
diff --git a/addons/sale_team/sale_team.py b/addons/sale_team/sale_team.py
index 3c13514bd11..db0e4638048 100644
--- a/addons/sale_team/sale_team.py
+++ b/addons/sale_team/sale_team.py
@@ -19,17 +19,13 @@
 #
 ##############################################################################
 
-
 import calendar
 from datetime import date, datetime
 from dateutil import relativedelta
-
 from openerp import tools
 from openerp.osv import fields
 from openerp.osv import osv
 
-
-
 class crm_case_section(osv.osv):
     _name = "crm.case.section"
     _inherit = ['mail.thread', 'ir.needaction_mixin']
@@ -145,7 +141,4 @@ class res_users(osv.Model):
         # duplicate list to avoid modifying the original reference
         self.SELF_WRITEABLE_FIELDS = list(self.SELF_WRITEABLE_FIELDS)
         self.SELF_WRITEABLE_FIELDS.extend(['default_section_id'])
-        return init_res
-
-    
-      
\ No newline at end of file
+        return init_res      
\ No newline at end of file
diff --git a/addons/sale_team/sale_team.xml b/addons/sale_team/sale_team.xml
index e3bea558a68..b2b98be643a 100644
--- a/addons/sale_team/sale_team.xml
+++ b/addons/sale_team/sale_team.xml
@@ -24,7 +24,7 @@
             <field name="model">res.users</field>
             <field name="inherit_id" ref="base.view_users_form_simple_modif"/>
             <field name="arch" type="xml">
-            <data>
+                <data>
                     <xpath expr="//field[@name='company_id']" position="before">
                         <field name="default_section_id" readonly="0"/>
                     </xpath>
@@ -75,10 +75,7 @@
             </field>
         </record>
 
-
-        
         <!-- Case Sections Search view -->
-
         <record id="crm_case_section_salesteams_search" model="ir.ui.view">
             <field name="name">Case Sections - Search</field>
             <field name="model">crm.case.section</field>
@@ -99,7 +96,6 @@
         </record>
 
         <!-- Case Sections Action -->
-
         <record id="crm_case_section_salesteams_act" model="ir.actions.act_window">
             <field name="name">Sales Teams</field>
             <field name="res_model">crm.case.section</field>
@@ -175,7 +171,6 @@
         </record>
 
         <!-- Case Sections Tree View -->
-
         <record id="crm_case_section_view_tree" model="ir.ui.view">
             <field name="name">crm.case.section.tree</field>
             <field name="model">crm.case.section</field>
@@ -189,15 +184,6 @@
             </field>
         </record>
 
-        <!-- Case Sections Action -->
-
-        <!--<record model="ir.actions.act_window.view" id="action_crm_tag_kanban_view_salesteams_oppor11">
-            <field name="sequence" eval="0"/>
-            <field name="view_mode">kanban</field>
-            <field name="view_id" ref="crm_case_kanban_view_leads"/>
-            <field name="act_window_id" ref="crm_case_form_view_salesteams_opportunity"/>
-        </record>-->
-
         <record id="crm_case_section_act" model="ir.actions.act_window">
             <field name="name">Sales Teams</field>
             <field name="res_model">crm.case.section</field>
@@ -213,7 +199,6 @@
                 </p>
             </field>
         </record>
-        
     <menuitem id="sale_team.menu_sale_team_act" action="crm_case_section_salesteams_act" sequence="1" parent="base.menu_sales"/>
-  </data>
+    </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/sale_team/sale_team_config.py b/addons/sale_team/sale_team_config.py
index 33a5e84b8de..2ae861e34b5 100644
--- a/addons/sale_team/sale_team_config.py
+++ b/addons/sale_team/sale_team_config.py
@@ -1,8 +1,27 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-today OpenERP SA (<http://www.openerp.com>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
 
 from openerp import SUPERUSER_ID
 from openerp.osv import fields, osv
 
-
 class sala_team_configuration(osv.TransientModel):
     _name = 'sale.team.config.settings'
     _inherit = ['sale.config.settings', 'fetchmail.config.settings']
@@ -35,11 +54,7 @@ class sala_team_configuration(osv.TransientModel):
         return True
 
     _columns = {
-       
         'group_multi_salesteams': fields.boolean("Organize Sales activities into multiple Sales Teams",
             implied_group='base.group_multi_salesteams',
             help="""Allows you to use Sales Teams to manage your leads and opportunities."""),
-    }
-
-
-    
+    }
\ No newline at end of file
diff --git a/addons/sale_team/sale_team_demo.xml b/addons/sale_team/sale_team_demo.xml
index b24c047fba1..58f5ac66b69 100644
--- a/addons/sale_team/sale_team_demo.xml
+++ b/addons/sale_team/sale_team_demo.xml
@@ -15,6 +15,5 @@
             <field name="code">SPD</field>
             <field name="member_ids" eval="[(4, ref('base.user_root')),(4, ref('base.user_demo'))]"/>
         </record>
-
     </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/sale_team/ir.model.access.csv b/addons/sale_team/security/ir.model.access.csv
similarity index 87%
rename from addons/sale_team/ir.model.access.csv
rename to addons/sale_team/security/ir.model.access.csv
index 9817ad834f6..e3c55739176 100644
--- a/addons/sale_team/ir.model.access.csv
+++ b/addons/sale_team/security/ir.model.access.csv
@@ -1,5 +1,4 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_crm_case_section,crm.case.section,model_crm_case_section,base.group_user,1,0,0,0
 access_crm_case_section_user,crm.case.section.user,model_crm_case_section,base.group_sale_salesman,1,0,0,0
-access_crm_case_section_manager,crm.case.section.manager,model_crm_case_section,base.group_sale_manager,1,1,1,1
-
+access_crm_case_section_manager,crm.case.section.manager,model_crm_case_section,base.group_sale_manager,1,1,1,1
\ No newline at end of file
diff --git a/addons/sale_team/security/sale_team_security.xml b/addons/sale_team/security/sale_team_security.xml
index 53fb560e332..11e4f583dda 100644
--- a/addons/sale_team/security/sale_team_security.xml
+++ b/addons/sale_team/security/sale_team_security.xml
@@ -35,6 +35,5 @@
         <record model="ir.ui.menu" id="base.menu_base_config">
             <field eval="[(4, ref('base.group_sale_manager'))]" name="groups_id"/>
         </record>
-
     </data>
 </openerp>

From d4826eb6d776dbc80b2099915bcc149a3892c027 Mon Sep 17 00:00:00 2001
From: Randhir Mayatra rma-openerp <rma@tinyerp.com>
Date: Tue, 22 Apr 2014 14:12:07 +0530
Subject: [PATCH 039/225] [IMP] improve dependancy for section_sales_department

---
 addons/crm_helpdesk/crm_helpdesk_demo.xml   |  6 ++---
 addons/project_issue/project_issue_demo.xml | 30 ++++++++++-----------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/addons/crm_helpdesk/crm_helpdesk_demo.xml b/addons/crm_helpdesk/crm_helpdesk_demo.xml
index 1370bf6d906..c76949f78f8 100644
--- a/addons/crm_helpdesk/crm_helpdesk_demo.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_demo.xml
@@ -7,7 +7,7 @@
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">3</field>
             <field name="state">draft</field>
-            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
             <field name="date" eval="time.strftime('%Y-%m-04 11:10:36')"/>
             <field name="name">Download old version of OpenERP? </field>
             <field eval="&quot;Is there any link to download old versions of OpenERP?&quot;" name="description"/>
@@ -19,7 +19,7 @@
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">3</field>
             <field name="state">draft</field>
-            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
             <field name="date" eval="time.strftime('%Y-%m-12 11:12:09')"/>
             <field name="name">Can not able to connect to Server</field>
             <field eval="&quot;I am not able to connect Server, Can anyone help?&quot;" name="description"/>
@@ -31,7 +31,7 @@
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">2</field>
             <field name="state">draft</field>
-            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
             <field name="date" eval="time.strftime('%Y-%m-12 11:13:10')"/>
             <field name="name">Documentation for CRM?</field>
             <field eval="&quot;Can anyone give link of document for CRM&quot;" name="description"/>
diff --git a/addons/project_issue/project_issue_demo.xml b/addons/project_issue/project_issue_demo.xml
index 63fa37c84c3..e16b8702551 100644
--- a/addons/project_issue/project_issue_demo.xml
+++ b/addons/project_issue/project_issue_demo.xml
@@ -38,7 +38,7 @@
             <field name="priority">5</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="partner_id" ref="base.res_partner_2"/>
-            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
             <field eval="1" name="active"/>
             <field name="project_id" ref="project.project_project_1"/>
             <field eval="15.0" name="duration"/>
@@ -54,7 +54,7 @@
             <field name="priority">3</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="partner_id" ref="base.res_partner_1"/>
-            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
             <field eval="1" name="active"/>
             <field eval="3.5" name="duration"/>
             <field name="name">Program not giving proper output</field>
@@ -66,7 +66,7 @@
             <field eval="time.strftime('%Y-%m-18 14:30:00')" name="date"/>
             <field name="priority">4</field>
             <field name="user_id" ref="base.user_demo"/>
-            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
             <field eval="1" name="active"/>
             <field eval="2.3" name="duration"/>
             <field name="project_id" ref="project.project_project_5"/>
@@ -82,7 +82,7 @@
             <field name="priority">3</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="partner_id" ref="base.res_partner_14"/>
-            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
             <field eval="1" name="active"/>
             <field eval="4.0" name="duration"/>
             <field name="project_id" ref="project.project_project_4"/>
@@ -95,7 +95,7 @@
             <field name="priority">3</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="partner_id" ref="base.res_partner_13"/>
-            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
             <field eval="1" name="active"/>
             <field eval="1.0" name="duration"/>
             <field name="project_id" ref="project.project_project_4"/>
@@ -108,7 +108,7 @@
             <field name="priority">3</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="partner_id" ref="base.res_partner_5"/>
-            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
             <field eval="1" name="active"/>
             <field eval="4.0" name="duration"/>
             <field name="project_id" ref="project.project_project_4"/>
@@ -124,7 +124,7 @@
             <field name="priority">2</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="partner_id" ref="base.res_partner_6"/>
-            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
             <field eval="1" name="active"/>
             <field eval="2.0" name="duration"/>
             <field name="project_id" ref="project.project_project_2"/>
@@ -137,7 +137,7 @@
             <field name="priority">2</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="partner_id" ref="base.res_partner_6"/>
-            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
             <field eval="1" name="active"/>
             <field eval="7.3" name="duration"/>
             <field name="project_id" ref="project.project_project_2"/>
@@ -162,7 +162,7 @@
             <field name="priority">2</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="partner_id" ref="base.res_partner_2"/>
-            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
             <field eval="1" name="active"/>
             <field eval="13.0" name="duration"/>
             <field name="project_id" ref="project.project_project_2"/>
@@ -175,7 +175,7 @@
             <field name="priority">4</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="partner_id" ref="base.res_partner_8"/>
-            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
             <field eval="1" name="active"/>
             <field eval="3.2" name="duration"/>
             <field name="project_id" ref="project.project_project_3"/>
@@ -188,7 +188,7 @@
             <field name="priority">1</field>
             <field name="user_id" ref="base.user_demo"/>
             <field name="partner_id" ref="base.res_partner_9"/>
-            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
             <field eval="1" name="active"/>
             <field eval="3.0" name="duration"/>
             <field name="project_id" ref="project.project_project_3"/>
@@ -202,7 +202,7 @@
             <field name="priority">3</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="partner_id" ref="base.res_partner_10"/>
-            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
             <field eval="1" name="active"/>
             <field eval="2.0" name="duration"/>
             <field name="project_id" ref="project.project_project_2"/>
@@ -216,7 +216,7 @@
             <field name="priority">3</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="partner_id" ref="base.res_partner_6"/>
-            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
             <field eval="1" name="active"/>
             <field eval="2.45" name="duration"/>
             <field name="project_id" ref="project.project_project_4"/>
@@ -229,7 +229,7 @@
             <field name="priority">4</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="partner_id" ref="base.res_partner_11"/>
-            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
             <field eval="1" name="active"/>
             <field eval="15.0" name="duration"/>
             <field name="project_id" ref="project.project_project_4"/>
@@ -242,7 +242,7 @@
             <field name="priority">2</field>
             <field name="user_id" ref="base.user_demo"/>
             <field name="partner_id" ref="base.res_partner_11"/>
-            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
             <field eval="1" name="active"/>
             <field eval="06.15" name="duration"/>
             <field name="project_id" ref="project.project_project_4"/>

From 5d7e462046d237f0cff14910eb63a6a5b4a96638 Mon Sep 17 00:00:00 2001
From: Randhir Mayatra rma-openerp <rma@tinyerp.com>
Date: Tue, 22 Apr 2014 15:17:25 +0530
Subject: [PATCH 040/225] [IMP] improve crm_partner_assing demo file

---
 addons/crm_partner_assign/crm_lead_demo.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm_partner_assign/crm_lead_demo.xml b/addons/crm_partner_assign/crm_lead_demo.xml
index 6631131d054..3338b392048 100644
--- a/addons/crm_partner_assign/crm_lead_demo.xml
+++ b/addons/crm_partner_assign/crm_lead_demo.xml
@@ -16,7 +16,7 @@
                   <field name="categ_ids" eval="[(6, 0, [ref('crm.categ_oppor1')])]"/>
                   <field name="channel_id" ref="crm.crm_case_channel_email"/>
                   <field name="priority">2</field>
-                  <field name="section_id" ref="crm.crm_case_section_2"/>
+                  <field name="section_id" ref="sale_team.crm_case_section_2"/>
                   <field name="user_id" ref=""/>
                   <field name="stage_id" ref="crm.stage_lead1"/>
                   <field name="description">Hi,

From 579d261468900fc9e89303deab5ed609fdaa8eeb Mon Sep 17 00:00:00 2001
From: Randhir Mayatra rma-openerp <rma@tinyerp.com>
Date: Tue, 22 Apr 2014 17:20:49 +0530
Subject: [PATCH 041/225] [IMP] solve yml issues

---
 addons/crm/crm.py                                    | 3 +++
 addons/crm/crm_action_rule_demo.xml                  | 2 +-
 addons/crm/test/crm_lead_cancel.yml                  | 2 +-
 addons/crm/test/crm_lead_find_stage.yml              | 2 +-
 addons/crm/test/lead2opportunity2win.yml             | 2 +-
 addons/crm/test/lead2opportunity_assign_salesmen.yml | 2 +-
 6 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 86350b472a7..f746893c2d6 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -118,6 +118,9 @@ class crm_case_section(osv.osv):
             res[id]['monthly_open_leads'] = self.__get_bar_values(cr, uid, obj, lead_domain, ['create_date'], 'create_date_count', 'create_date', context=context)
             res[id]['monthly_planned_revenue'] = self.__get_bar_values(cr, uid, obj, opp_domain, ['planned_revenue', 'date_deadline'], 'planned_revenue', 'date_deadline', context=context)
         return res
+    def create(self, cr, uid, vals, context=None):
+        self._alias_model_name = 'crm.lead'
+        return super(crm_case_section, self).create(cr, uid, vals, context={'alias_model_name': self._alias_model_name})
 
     _columns = {
         'resource_calendar_id': fields.many2one('resource.calendar', "Working Time", help="Used to compute open days"),
diff --git a/addons/crm/crm_action_rule_demo.xml b/addons/crm/crm_action_rule_demo.xml
index 8eac91c06e2..2524132c4d4 100644
--- a/addons/crm/crm_action_rule_demo.xml
+++ b/addons/crm/crm_action_rule_demo.xml
@@ -41,7 +41,7 @@
             <field name="condition">True</field>
             <field name="type">ir.actions.server</field>
             <field name="state">code</field>
-            <field name="code">sales_team = self.pool.get('ir.model.data').get_object(cr, uid, 'crm', 'section_sales_department')
+            <field name="code">sales_team = self.pool.get('ir.model.data').get_object(cr, uid, 'sale_team', 'section_sales_department')
 object.write({'section_id': sales_team.id})
             </field>
         </record>
diff --git a/addons/crm/test/crm_lead_cancel.yml b/addons/crm/test/crm_lead_cancel.yml
index dd475d54919..fa98f47e6ea 100644
--- a/addons/crm/test/crm_lead_cancel.yml
+++ b/addons/crm/test/crm_lead_cancel.yml
@@ -5,7 +5,7 @@
     uid: 'crm_res_users_salesmanager'
 -
   !python {model: crm.lead}: |
-    section_id = self.pool.get('crm.case.section').create(cr, uid, {'name': "Phone Marketing", 'parent_id': ref("crm.crm_case_section_2")})
+    section_id = self.pool.get('crm.case.section').create(cr, uid, {'name': "Phone Marketing", 'parent_id': ref("sale_team.crm_case_section_2")})
     self.write(cr, uid, [ref("crm_case_1")], {'section_id': section_id})
 -
   Salesman check unqualified lead .
diff --git a/addons/crm/test/crm_lead_find_stage.yml b/addons/crm/test/crm_lead_find_stage.yml
index b8a11a4af9e..9fcff6ab512 100644
--- a/addons/crm/test/crm_lead_find_stage.yml
+++ b/addons/crm/test/crm_lead_find_stage.yml
@@ -6,7 +6,7 @@
     name: 'Test lead new'
     partner_id: base.res_partner_1
     description: This is the description of the test new lead.
-    section_id: crm.section_sales_department
+    section_id: sale_team.section_sales_department
 -
   I check default stage of lead.
 -
diff --git a/addons/crm/test/lead2opportunity2win.yml b/addons/crm/test/lead2opportunity2win.yml
index 0650838e4cc..c91768bcc07 100644
--- a/addons/crm/test/lead2opportunity2win.yml
+++ b/addons/crm/test/lead2opportunity2win.yml
@@ -65,7 +65,7 @@
 -
   !python {model: crm.lead2opportunity.partner.mass}: |
     context.update({'active_model': 'crm.lead', 'active_ids': [ref("crm_case_13"), ref("crm_case_2")], 'active_id': ref("crm_case_13")})
-    id = self.create(cr, uid, {'user_ids': [(6, 0, [ref('base.user_root')])], 'section_id': ref('crm.section_sales_department')}, context=context)
+    id = self.create(cr, uid, {'user_ids': [(6, 0, [ref('base.user_root')])], 'section_id': ref('sale_team.section_sales_department')}, context=context)
     self.mass_convert(cr, uid, [id], context=context)
 -
   Now I check first lead converted on opportunity.
diff --git a/addons/crm/test/lead2opportunity_assign_salesmen.yml b/addons/crm/test/lead2opportunity_assign_salesmen.yml
index 76b35be531d..6206db33050 100644
--- a/addons/crm/test/lead2opportunity_assign_salesmen.yml
+++ b/addons/crm/test/lead2opportunity_assign_salesmen.yml
@@ -66,7 +66,7 @@
 -
   !python {model: crm.lead2opportunity.partner.mass}: |
     context.update({'active_model': 'crm.lead', 'active_ids': [ref("test_crm_lead_01"), ref("test_crm_lead_02"), ref("test_crm_lead_03"), ref("test_crm_lead_04"), ref("test_crm_lead_05"), ref("test_crm_lead_06")], 'active_id': ref("test_crm_lead_01")})
-    id = self.create(cr, uid, {'user_ids': [(6, 0, [ref('test_res_user_01'), ref('test_res_user_02'), ref('test_res_user_03'), ref('test_res_user_04')])], 'section_id': ref('crm.section_sales_department'), 'deduplicate': False, 'force_assignation': True}, context=context)
+    id = self.create(cr, uid, {'user_ids': [(6, 0, [ref('test_res_user_01'), ref('test_res_user_02'), ref('test_res_user_03'), ref('test_res_user_04')])], 'section_id': ref('sale_team.section_sales_department'), 'deduplicate': False, 'force_assignation': True}, context=context)
     self.mass_convert(cr, uid, [id], context=context)
 -
   The leads should now be opps with a salesman and a salesteam.  Also, salesmen should have been assigned following a round-robin method.

From 2f5250edfa5315b323deb23b3436606f3effc636 Mon Sep 17 00:00:00 2001
From: Randhir Mayatra rma-openerp <rma@tinyerp.com>
Date: Wed, 23 Apr 2014 15:17:33 +0530
Subject: [PATCH 042/225] [IMP] improve inherited crm_case_section

---
 addons/crm/crm.py                             | 40 ++++++++++++++-----
 addons/crm/crm_case_section_view.xml          |  3 +-
 addons/sale_team/sale_team.py                 | 19 +--------
 addons/sale_team/sale_team.xml                |  3 +-
 .../sale_team/security/sale_team_security.xml | 12 +++++-
 5 files changed, 44 insertions(+), 33 deletions(-)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index f746893c2d6..ef9cb89d5c2 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -88,13 +88,9 @@ class crm_case_stage(osv.osv):
     }
 
 
-class crm_case_section(osv.osv):
-    """ Model for sales teams. """
-    _name = "crm.case.section"
+class crm_case_section(osv.Model):
     _inherit = 'crm.case.section'
-    _description = "Sales Teams"
-    _alias_model_name = 'crm.lead'
-
+    _name = 'crm.case.section'
     def _get_opportunities_data(self, cr, uid, ids, field_name, arg, context=None):
         """ Get opportunities-related data for salesteam kanban view
             monthly_open_leads: number of open lead during the last months
@@ -118,10 +114,7 @@ class crm_case_section(osv.osv):
             res[id]['monthly_open_leads'] = self.__get_bar_values(cr, uid, obj, lead_domain, ['create_date'], 'create_date_count', 'create_date', context=context)
             res[id]['monthly_planned_revenue'] = self.__get_bar_values(cr, uid, obj, opp_domain, ['planned_revenue', 'date_deadline'], 'planned_revenue', 'date_deadline', context=context)
         return res
-    def create(self, cr, uid, vals, context=None):
-        self._alias_model_name = 'crm.lead'
-        return super(crm_case_section, self).create(cr, uid, vals, context={'alias_model_name': self._alias_model_name})
-
+    
     _columns = {
         'resource_calendar_id': fields.many2one('resource.calendar', "Working Time", help="Used to compute open days"),
         'stage_ids': fields.many2many('crm.case.stage', 'section_stage_rel', 'section_id', 'stage_id', 'Stages'),
@@ -143,7 +136,32 @@ class crm_case_section(osv.osv):
         'stage_ids': _get_stage_common,
         'use_leads': True,
     }
- 
+
+class crm_case_section_inherit(osv.Model):
+    """ Model for sales teams. """
+    _inherit = 'crm.case.section'
+    _name = 'crm.case.section.inherit'
+    _description = "Sales Teams"
+    _inherits = {'mail.alias': 'alias_id'}
+    _columns = {
+        'alias_id': fields.many2one('mail.alias', 'Alias', ondelete="restrict", required=True, help="The email address associated with this team. New emails received will automatically ""create new leads assigned to the team."),
+    }
+    def create(self, cr, uid, vals, context=None):
+        if context is None:
+            context = {}
+        create_context = dict(context, alias_model_name='crm.lead', alias_parent_model_name=self._name)
+        section_id = super(crm_case_section, self).create(cr, uid, vals, context=create_context)
+        section = self.browse(cr, uid, section_id, context=context)
+        self.pool.get('mail.alias').write(cr, uid, [section.alias_id.id], {'alias_parent_thread_id': section_id, 'alias_defaults': {'section_id': section_id, 'type': 'lead'}}, context=context)
+        return section_id
+    
+    def unlink(self, cr, uid, ids, context=None):
+        # Cascade-delete mail aliases as well, as they should not exist without the sales team.
+        mail_alias = self.pool.get('mail.alias')
+        alias_ids = [team.alias_id.id for team in self.browse(cr, uid, ids, context=context) if team.alias_id]
+        res = super(crm_case_section, self).unlink(cr, uid, ids, context=context)
+        mail_alias.unlink(cr, uid, alias_ids, context=context)
+        return res
 class crm_case_categ(osv.osv):
     """ Category of Case """
     _name = "crm.case.categ"
diff --git a/addons/crm/crm_case_section_view.xml b/addons/crm/crm_case_section_view.xml
index 57f5b70bfe8..eb86842e3bd 100644
--- a/addons/crm/crm_case_section_view.xml
+++ b/addons/crm/crm_case_section_view.xml
@@ -83,7 +83,7 @@
 
         <record model="ir.ui.view" id="crm_case_section_salesteams_view_kanban">
             <field name="name">crm.case.section.kanban</field>
-            <field name="model">crm.case.section</field>
+            <field name="model">crm.case.section.inherit</field>
             <field name="inherit_id" ref="sale_team.crm_case_section_salesteams_view_kanban"/>
             <field name="arch" type="xml">
                 <data>
@@ -91,6 +91,7 @@
                         <field name="use_leads"/>
                         <field name="monthly_open_leads"/>
                         <field name="monthly_planned_revenue"/>
+                        <field name="alias_id"/>
                     </xpath>
                     <xpath expr="//div[@name='avtar']" position="after">
                         <div class="oe_kanban_alias oe_center" t-if="record.use_leads.raw_value and record.alias_id.value">
diff --git a/addons/sale_team/sale_team.py b/addons/sale_team/sale_team.py
index db0e4638048..299e6564f56 100644
--- a/addons/sale_team/sale_team.py
+++ b/addons/sale_team/sale_team.py
@@ -30,10 +30,8 @@ class crm_case_section(osv.osv):
     _name = "crm.case.section"
     _inherit = ['mail.thread', 'ir.needaction_mixin']
     _description = "Sales Teams"
-    _inherits = {'mail.alias': 'alias_id'}
     _order = "complete_name"
     _period_number = 5
-    _alias_model_name = 'mail.message'
 
     def get_full_name(self, cr, uid, ids, field_name, arg, context=None):
         return dict(self.name_get(cr, uid, ids, context=context))
@@ -69,7 +67,6 @@ class crm_case_section(osv.osv):
         return section_result
    
     _columns = {
-        'alias_id': fields.many2one('mail.alias', 'Alias', ondelete="restrict", required=True, help="The email address associated with this team. New emails received will automatically ""create new leads assigned to the team."),
         'name': fields.char('Sales Team', size=64, required=True, translate=True),
         'complete_name': fields.function(get_full_name, type='char', size=256, readonly=True, store=True),
         'code': fields.char('Code', size=8),
@@ -114,21 +111,7 @@ class crm_case_section(osv.osv):
             res.append((record['id'], name))
         return res
     
-    def create(self, cr, uid, vals, context=None):
-        if context is None:
-            context = {}
-        create_context = dict(context, alias_model_name=self._alias_model_name, alias_parent_model_name=self._name)
-        section_id = super(crm_case_section, self).create(cr, uid, vals, context=create_context)
-        section = self.browse(cr, uid, section_id, context=context)
-        self.pool.get('mail.alias').write(cr, uid, [section.alias_id.id], {'alias_parent_thread_id': section_id, 'alias_defaults': {'section_id': section_id, 'type': 'lead'}}, context=context)
-        return section_id
-    def unlink(self, cr, uid, ids, context=None):
-        # Cascade-delete mail aliases as well, as they should not exist without the sales team.
-        mail_alias = self.pool.get('mail.alias')
-        alias_ids = [team.alias_id.id for team in self.browse(cr, uid, ids, context=context) if team.alias_id]
-        res = super(crm_case_section, self).unlink(cr, uid, ids, context=context)
-        mail_alias.unlink(cr, uid, alias_ids, context=context)
-        return res
+
              
 class res_users(osv.Model):
     _inherit = 'res.users'
diff --git a/addons/sale_team/sale_team.xml b/addons/sale_team/sale_team.xml
index b2b98be643a..a044c455b4a 100644
--- a/addons/sale_team/sale_team.xml
+++ b/addons/sale_team/sale_team.xml
@@ -42,7 +42,6 @@
                     <field name="name"/>
                     <field name="user_id"/>
                     <field name="member_ids"/>
-                    <field name="alias_id"/>
                     <field name="note"/>
                     <field name="color"/>
                     <templates>
@@ -58,7 +57,7 @@
                                 </div>
                                 <div class="oe_kanban_content">
                                     <h4 class="oe_center"><field name="name"/></h4>
-                                    <div class="oe_kanban_alias oe_center" t-if="record.alias_id.value" name="avtar">
+                                    <div class="oe_kanban_alias oe_center" name="avtar">
                                         <small><span class="oe_e oe_e_alias" style="float: none;">%%</span><t t-raw="record.alias_id.raw_value[1]"/></small>
                                     </div>
                                     <div class="oe_clear"></div>
diff --git a/addons/sale_team/security/sale_team_security.xml b/addons/sale_team/security/sale_team_security.xml
index 11e4f583dda..fe999715a7a 100644
--- a/addons/sale_team/security/sale_team_security.xml
+++ b/addons/sale_team/security/sale_team_security.xml
@@ -23,7 +23,17 @@
             <field name="implied_ids" eval="[(4, ref('base.group_sale_salesman_all_leads'))]"/>
             <field name="users" eval="[(4, ref('base.user_root'))]"/>
         </record>
-    
+        
+        <record id="base.group_mono_salesteams" model="res.groups">
+            <field name="name">Do Not Use Sales Teams</field>
+            <field name="category_id" ref="base.module_category_hidden"/>
+        </record>
+        
+        <record id="base.group_multi_salesteams" model="res.groups">
+            <field name="name">Manage Sales Teams</field>
+            <field name="category_id" ref="base.module_category_hidden"/>
+        </record>
+        
         <record model="res.users" id="base.user_root">
             <field eval="[(4,ref('base.group_partner_manager'))]" name="groups_id"/>
         </record>

From a26436c57e7fd8408d91f44b3ab11c18600a5a0b Mon Sep 17 00:00:00 2001
From: Randhir Mayatra rma-openerp <rma@tinyerp.com>
Date: Wed, 23 Apr 2014 17:51:52 +0530
Subject: [PATCH 043/225] [IMP] improve kanban view

---
 addons/crm/crm_case_section_view.xml | 22 +++++++++++++++++-----
 addons/crm/crm_demo.xml              |  4 ----
 addons/sale_team/sale_team.xml       |  3 ---
 addons/sale_team/sale_team_demo.xml  |  4 ++++
 4 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/addons/crm/crm_case_section_view.xml b/addons/crm/crm_case_section_view.xml
index eb86842e3bd..6de1a8b6094 100644
--- a/addons/crm/crm_case_section_view.xml
+++ b/addons/crm/crm_case_section_view.xml
@@ -80,7 +80,6 @@
         </record>
 
         <!-- Case Sections Salesteams kanban view -->
-
         <record model="ir.ui.view" id="crm_case_section_salesteams_view_kanban">
             <field name="name">crm.case.section.kanban</field>
             <field name="model">crm.case.section.inherit</field>
@@ -88,15 +87,28 @@
             <field name="arch" type="xml">
                 <data>
                     <xpath expr="//field[@name='name']" position="after">
-                        <field name="use_leads"/>
-                        <field name="monthly_open_leads"/>
-                        <field name="monthly_planned_revenue"/>
                         <field name="alias_id"/>
                     </xpath>
-                    <xpath expr="//div[@name='avtar']" position="after">
+                    <xpath expr="//h4[@class='oe_center']" position="after">
                         <div class="oe_kanban_alias oe_center" t-if="record.use_leads.raw_value and record.alias_id.value">
                             <small><span class="oe_e oe_e_alias" style="float: none;">%%</span><t t-raw="record.alias_id.raw_value[1]"/></small>
                         </div>
+                    </xpath>
+                </data>
+            </field>
+        </record>
+        <record model="ir.ui.view" id="crm_case_section_salesteams_view_kanban">
+            <field name="name">crm.case.section.kanban</field>
+            <field name="model">crm.case.section</field>
+            <field name="inherit_id" ref="sale_team.crm_case_section_salesteams_view_kanban"/>
+            <field name="arch" type="xml">
+                <data>
+                    <xpath expr="//field[@name='name']" position="after">
+                        <field name="use_leads"/>
+                        <field name="monthly_open_leads"/>
+                        <field name="monthly_planned_revenue"/>
+                    </xpath>
+                    <xpath expr="//h4[@class='oe_center']" position="after">
                         <div class="oe_items_list">
                             <div class="oe_salesteams_leads" t-if="record.use_leads.raw_value">
                                 <a name="%(crm_case_form_view_salesteams_lead)d" type="action">Leads</a>
diff --git a/addons/crm/crm_demo.xml b/addons/crm/crm_demo.xml
index 1541753523a..df776f92350 100644
--- a/addons/crm/crm_demo.xml
+++ b/addons/crm/crm_demo.xml
@@ -2,10 +2,6 @@
 <openerp>
     <data noupdate="1">
 
-        <record id="base.user_demo" model="res.users">
-            <field name="groups_id" eval="[(4,ref('base.group_sale_salesman'))]"/>
-        </record>
-
         <record model="crm.segmentation" id="crm_segmentation0">
             <field name="name">OpenERP partners</field>
             <field name="exclusif">True</field>
diff --git a/addons/sale_team/sale_team.xml b/addons/sale_team/sale_team.xml
index a044c455b4a..a00bbe6665b 100644
--- a/addons/sale_team/sale_team.xml
+++ b/addons/sale_team/sale_team.xml
@@ -57,9 +57,6 @@
                                 </div>
                                 <div class="oe_kanban_content">
                                     <h4 class="oe_center"><field name="name"/></h4>
-                                    <div class="oe_kanban_alias oe_center" name="avtar">
-                                        <small><span class="oe_e oe_e_alias" style="float: none;">%%</span><t t-raw="record.alias_id.raw_value[1]"/></small>
-                                    </div>
                                     <div class="oe_clear"></div>
                                     <div class="oe_kanban_salesteams_avatars">
                                         <t t-foreach="record.member_ids.raw_value.slice(0,10)" t-as="member">
diff --git a/addons/sale_team/sale_team_demo.xml b/addons/sale_team/sale_team_demo.xml
index 58f5ac66b69..0e698d8f1fa 100644
--- a/addons/sale_team/sale_team_demo.xml
+++ b/addons/sale_team/sale_team_demo.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
+        <record id="base.user_demo" model="res.users">
+            <field name="groups_id" eval="[(4,ref('base.group_sale_salesman'))]"/>
+        </record>
+        
         <record id="section_sales_department" model="crm.case.section">
             <field name="member_ids" eval="[(4, ref('base.user_demo'))]"/>
         </record>

From 5cf064805867e7de0f33f03d5efbc02a34020432 Mon Sep 17 00:00:00 2001
From: Randhir Mayatra rma-openerp <rma@tinyerp.com>
Date: Wed, 23 Apr 2014 18:21:33 +0530
Subject: [PATCH 044/225] [IMP] improve alias_name

---
 addons/crm/crm_case_section_view.xml | 2 +-
 addons/sale_team/sale_team_data.xml  | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/crm/crm_case_section_view.xml b/addons/crm/crm_case_section_view.xml
index 5053cc5c308..950f017a473 100644
--- a/addons/crm/crm_case_section_view.xml
+++ b/addons/crm/crm_case_section_view.xml
@@ -163,7 +163,7 @@
 
     <record model="ir.ui.view" id="sale_team_form_view_in_crm">
             <field name="name">crm.case.section.form</field>
-            <field name="model">crm.case.section</field>
+            <field name="model">crm.case.section.inherit</field>
             <field name="inherit_id" ref="sale_team.crm_case_section_view_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='name']" position="after">
diff --git a/addons/sale_team/sale_team_data.xml b/addons/sale_team/sale_team_data.xml
index eef5e5809a1..2f296143ec0 100644
--- a/addons/sale_team/sale_team_data.xml
+++ b/addons/sale_team/sale_team_data.xml
@@ -4,7 +4,6 @@
         <record model="crm.case.section" id="section_sales_department">
             <field name="name">Direct Sales</field>
             <field name="code">DM</field>
-            <field name="alias_name">sales</field>
             <field name="member_ids" eval="[(4, ref('base.user_root'))]"/>
         </record>
     </data>

From e8bed3e41fb97c601f8de2f53b16c3854459ee78 Mon Sep 17 00:00:00 2001
From: Randhir Mayatra rma-openerp <rma@tinyerp.com>
Date: Wed, 23 Apr 2014 18:45:33 +0530
Subject: [PATCH 045/225] [IMP] improve alias_name

---
 addons/website_sale_crm/data/website_sale_crm.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/website_sale_crm/data/website_sale_crm.xml b/addons/website_sale_crm/data/website_sale_crm.xml
index dad22228f01..716bce75766 100644
--- a/addons/website_sale_crm/data/website_sale_crm.xml
+++ b/addons/website_sale_crm/data/website_sale_crm.xml
@@ -5,7 +5,6 @@
         <record model="crm.case.section" id="website.section_sales_department">
             <field name="name">Website</field>
             <field name="code">Website</field>
-            <field name="alias_name">Website</field>
             <field name="member_ids" eval="[(4, ref('base.user_root'))]"/>
         </record>
 

From e55c51fe4028defad63dc576c1115240cb286108 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (Open ERP)" <dhr@tinyerp.com>
Date: Thu, 24 Apr 2014 15:24:29 +0530
Subject: [PATCH 046/225] [FIX]Fixed the issue of no audit logs for an object
 for which audittrail rule is created with Log Read as true

---
 addons/audittrail/audittrail.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/addons/audittrail/audittrail.py b/addons/audittrail/audittrail.py
index b68a8e201c6..3dcc72679a8 100644
--- a/addons/audittrail/audittrail.py
+++ b/addons/audittrail/audittrail.py
@@ -425,6 +425,11 @@ class audittrail_objects_proxy(object_proxy):
                             res_ids.remove(resource_id)
                     for res_id in res_ids:
                         lines.update(self.prepare_audittrail_log_line(cr, SUPERUSER_ID, pool, x2m_model, res_id, method, old_values, new_values, field_list))
+            data={
+                    'name': field_name,
+                    'old_value': key in old_values and old_values[key]['value'].get(field_name),
+                    'old_value_text': key in old_values and old_values[key]['text'].get(field_name)
+                  }
             # if the value value is different than the old value: record the change
             if key not in old_values or key not in new_values or old_values[key]['value'][field_name] != new_values[key]['value'][field_name]:
                 data = {
@@ -434,7 +439,7 @@ class audittrail_objects_proxy(object_proxy):
                       'new_value_text': key in new_values and new_values[key]['text'].get(field_name),
                       'old_value_text': key in old_values and old_values[key]['text'].get(field_name)
                 }
-                lines[key].append(data)
+            lines[key].append(data)
         return lines
 
     def process_data(self, cr, uid, pool, res_ids, model, method, old_values=None, new_values=None, field_list=None):

From 74f60e621227aea1736b3d3a337cf8e09e41f15e Mon Sep 17 00:00:00 2001
From: Ravi Gadhia <rga@tinyerp.com>
Date: Thu, 1 May 2014 14:15:42 +0530
Subject: [PATCH 047/225] [REM] crm.case.section.inherit use crm.case.section
 for get aliase_id

---
 addons/crm/crm_case_section_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/crm/crm_case_section_view.xml b/addons/crm/crm_case_section_view.xml
index 950f017a473..94f59217065 100644
--- a/addons/crm/crm_case_section_view.xml
+++ b/addons/crm/crm_case_section_view.xml
@@ -82,7 +82,7 @@
         <!-- Case Sections Salesteams kanban view -->
         <record model="ir.ui.view" id="crm_case_section_salesteams_view_kanban">
             <field name="name">crm.case.section.kanban</field>
-            <field name="model">crm.case.section.inherit</field>
+            <field name="model">crm.case.section</field>
             <field name="inherit_id" ref="sale_team.crm_case_section_salesteams_view_kanban"/>
             <field name="arch" type="xml">
                 <data>
@@ -163,7 +163,7 @@
 
     <record model="ir.ui.view" id="sale_team_form_view_in_crm">
             <field name="name">crm.case.section.form</field>
-            <field name="model">crm.case.section.inherit</field>
+            <field name="model">crm.case.section</field>
             <field name="inherit_id" ref="sale_team.crm_case_section_view_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='name']" position="after">
@@ -195,4 +195,4 @@
             </field>
         </record>
   </data>
-</openerp>
\ No newline at end of file
+</openerp>

From ca008ef74be82fa786b2388d870687f103b8dcb4 Mon Sep 17 00:00:00 2001
From: Ravi Gadhia <rga@tinyerp.com>
Date: Fri, 2 May 2014 14:53:09 +0530
Subject: [PATCH 048/225] [IMP] remove print + innecessary diff on merge

---
 addons/gamification/models/goal.py                   |  4 ++--
 addons/gamification_sale_crm/sale_crm_goals_demo.xml | 10 ----------
 addons/mail/mail_alias.py                            |  1 -
 3 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/addons/gamification/models/goal.py b/addons/gamification/models/goal.py
index 1a7c489f575..7bbecbfa052 100644
--- a/addons/gamification/models/goal.py
+++ b/addons/gamification/models/goal.py
@@ -282,7 +282,7 @@ class gamification_goal(osv.Model):
                         _logger.exception(_('Invalid return content from the evaluation of code for definition %s' % definition.name))
 
             else:  # count or sum
-                
+
                 obj = self.pool.get(definition.model_id.model)
                 field_date_name = definition.field_date_id and definition.field_date_id.name or False
 
@@ -349,7 +349,7 @@ class gamification_goal(osv.Model):
             if not value:
                 continue
             goal = all_goals[goal_id]
-            
+            #
             # check goal target reached
             if (goal.definition_condition == 'higher' and value.get('current', goal.current) >= goal.target_goal) \
               or (goal.definition_condition == 'lower' and value.get('current', goal.current) <= goal.target_goal):
diff --git a/addons/gamification_sale_crm/sale_crm_goals_demo.xml b/addons/gamification_sale_crm/sale_crm_goals_demo.xml
index dc3cc27135d..a4720b1e566 100644
--- a/addons/gamification_sale_crm/sale_crm_goals_demo.xml
+++ b/addons/gamification_sale_crm/sale_crm_goals_demo.xml
@@ -7,15 +7,5 @@
             <field name="state">inprogress</field>
         </record>
 
-        <!-- goals -->
-        <record model="gamification.goal" id="goal_crm_sale1">
-            <field name="definition_id" eval="ref('definition_crm_tot_invoices')" />
-            <field name="user_id" eval="ref('base.user_demo')" />
-            <field name="line_id" eval="ref('line_crm_sale1')" />
-            <field name="start_date" eval="time.strftime('%Y-%m-01')" />
-            <field name="end_date" eval="(DateTime.today().replace(day=1)+relativedelta(months=1, days=-1)).strftime('%Y-%m-%d')" />
-            <field name="target_goal">2000</field>
-        </record>
-        
     </data>
 </openerp>
diff --git a/addons/mail/mail_alias.py b/addons/mail/mail_alias.py
index 54200283131..d8a79dd98e0 100644
--- a/addons/mail/mail_alias.py
+++ b/addons/mail/mail_alias.py
@@ -204,7 +204,6 @@ class mail_alias(osv.Model):
             alias_vals['alias_defaults'] = dict((k, obj_data[v]) for k, v in alias_defaults.iteritems())
             alias_vals['alias_parent_thread_id'] = obj_data['id']
             alias_create_ctx = dict(context, alias_model_name=alias_model_name, alias_parent_model_name=child_model_name)
-            print 'EEEEEEEEEEEe',alias_vals, alias_create_ctx
             alias_id = mail_alias.create(cr, SUPERUSER_ID, alias_vals, context=alias_create_ctx)
             child_class_model.write(cr, SUPERUSER_ID, obj_data['id'], {'alias_id': alias_id}, context={'mail_notrack': True})
             _logger.info('Mail alias created for %s %s (id %s)', child_model_name, obj_data[alias_key], obj_data['id'])

From 6ccbd2cd8282b8301bba675efa705ca3de09dc73 Mon Sep 17 00:00:00 2001
From: Ravi Gadhia <rga@tinyerp.com>
Date: Fri, 2 May 2014 17:23:18 +0530
Subject: [PATCH 049/225] [IMP] no need to inherit sale.order report we are
 already in sale/report +change file name for invoice report

---
 addons/sale/report/__init__.py                 |  4 +---
 ...unt_invoice_report.py => invoice_report.py} |  0
 addons/sale/report/sale_analysis_report.py     | 18 ------------------
 .../sale/report/sale_analysis_report_view.xml  | 16 ----------------
 addons/sale/report/sale_report.py              |  7 +++++--
 addons/sale/report/sale_report_view.xml        |  1 +
 6 files changed, 7 insertions(+), 39 deletions(-)
 rename addons/sale/report/{sales_crm_account_invoice_report.py => invoice_report.py} (100%)
 delete mode 100644 addons/sale/report/sale_analysis_report.py
 delete mode 100644 addons/sale/report/sale_analysis_report_view.xml

diff --git a/addons/sale/report/__init__.py b/addons/sale/report/__init__.py
index 0ce593424d3..be1073205c3 100644
--- a/addons/sale/report/__init__.py
+++ b/addons/sale/report/__init__.py
@@ -19,8 +19,6 @@
 #
 ##############################################################################
 
-import sales_crm_account_invoice_report
 import sale_report
-import sale_analysis_report
-
+import invoice_report
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale/report/sales_crm_account_invoice_report.py b/addons/sale/report/invoice_report.py
similarity index 100%
rename from addons/sale/report/sales_crm_account_invoice_report.py
rename to addons/sale/report/invoice_report.py
diff --git a/addons/sale/report/sale_analysis_report.py b/addons/sale/report/sale_analysis_report.py
deleted file mode 100644
index eca020f82ad..00000000000
--- a/addons/sale/report/sale_analysis_report.py
+++ /dev/null
@@ -1,18 +0,0 @@
- # -*- coding: utf-8 -*-
-
-from openerp.osv import fields, osv
-
-
-class sale_report(osv.osv):
-    _inherit = "sale.report"
-    _columns = {
-        'section_id': fields.many2one('crm.case.section', 'Sales Team'),
-    }
-
-    def _select(self):
-        return super(sale_report, self)._select() + ", s.section_id as section_id"
-
-    def _group_by(self):
-        return super(sale_report, self)._group_by() + ", s.section_id"
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale/report/sale_analysis_report_view.xml b/addons/sale/report/sale_analysis_report_view.xml
deleted file mode 100644
index 83613219046..00000000000
--- a/addons/sale/report/sale_analysis_report_view.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <record id="view_order_product_search_sale_crm_inherit" model="ir.ui.view">
-            <field name="name">sale.report.search.sale.crm</field>
-            <field name="model">sale.report</field>
-            <field name="inherit_id" ref="sale.view_order_product_search"/>
-            <field name="arch" type="xml">
-                <filter name="User" position="after">
-                    <separator/>
-                    <filter string="Sales Team" context="{'group_by':'section_id'}"/>
-                </filter>
-            </field>
-        </record>
-    </data>
-</openerp>
\ No newline at end of file
diff --git a/addons/sale/report/sale_report.py b/addons/sale/report/sale_report.py
index 5d6a1cd759c..8a54da5901e 100644
--- a/addons/sale/report/sale_report.py
+++ b/addons/sale/report/sale_report.py
@@ -53,6 +53,7 @@ class sale_report(osv.osv):
             ], 'Order Status', readonly=True),
         'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', readonly=True),
         'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account', readonly=True),
+        'section_id': fields.many2one('crm.case.section', 'Sales Team'),
     }
     _order = 'date desc'
 
@@ -73,7 +74,8 @@ class sale_report(osv.osv):
                     s.state,
                     t.categ_id as categ_id,
                     s.pricelist_id as pricelist_id,
-                    s.project_id as analytic_account_id
+                    s.project_id as analytic_account_id,
+                    s.section_id as section_id
         """
         return select_str
 
@@ -101,7 +103,8 @@ class sale_report(osv.osv):
                     s.company_id,
                     s.state,
                     s.pricelist_id,
-                    s.project_id
+                    s.project_id,
+                    s.section_id
         """
         return group_by_str
 
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index 14b719ebd7a..b8ce36efc2b 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -34,6 +34,7 @@
                 </group>
                 <group expand="1" string="Group By...">
                     <filter string="Salesperson" icon="terp-personal" name="User" context="{'group_by':'user_id'}"/>
+                    <filter string="Sales Team" context="{'group_by':'section_id'}"/>
                     <filter string="Partner" icon="terp-partner"  name="Customer" context="{'group_by':'partner_id'}"/>
                     <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id','set_visible':True}"/>
                     <filter string="Reference Unit of Measure" icon="terp-mrp" context="{'group_by':'product_uom'}"/>

From adf1480f7104df47a80228459bca4539d399046f Mon Sep 17 00:00:00 2001
From: Ravi Gadhia <rga@tinyerp.com>
Date: Fri, 2 May 2014 18:18:40 +0530
Subject: [PATCH 050/225] [IMP] add alias name

---
 addons/crm/crm_data.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/crm/crm_data.xml b/addons/crm/crm_data.xml
index 41f4819e500..cec54a683bd 100644
--- a/addons/crm/crm_data.xml
+++ b/addons/crm/crm_data.xml
@@ -28,6 +28,7 @@
 
         <record model="crm.case.section" id="sale_team.section_sales_department">
             <field name="use_leads">True</field>
+            <field name="alias_name">sales</field>
         </record>
 
         <!-- Payment Mode -->

From 1e1c2230fd4de1e8ad044a0f7499d0eda2b1942c Mon Sep 17 00:00:00 2001
From: "Ravi Gohil (OpenERP)" <rgo@tinyerp.com>
Date: Mon, 5 May 2014 17:21:21 +0530
Subject: [PATCH 051/225] [FIX] Modifying default value for other than
 char/string/selection fields from 'Setting/Technical/Actions/User-defined
 Defaults' view sets wrong pickle value for respective record. (Maintenance
 Case: 607398)

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

bzr revid: rgo@tinyerp.com-20140505115121-lwz1crjjoxyqfgax
---
 openerp/addons/base/ir/ir_values.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/openerp/addons/base/ir/ir_values.py b/openerp/addons/base/ir/ir_values.py
index 18ced2d1e20..0f3eac6e258 100644
--- a/openerp/addons/base/ir/ir_values.py
+++ b/openerp/addons/base/ir/ir_values.py
@@ -22,6 +22,7 @@ import pickle
 
 from openerp.osv import osv, fields
 from openerp.osv.orm import except_orm
+from openerp.tools.safe_eval import safe_eval as eval
 
 EXCLUDED_FIELDS = set((
     'report_sxw_content', 'report_rml_content', 'report_sxw', 'report_rml',
@@ -121,7 +122,10 @@ class ir_values(osv.osv):
         record = self.browse(cursor, user, id, context=context)
         if record.key == 'default':
             # default values are pickled on the fly
-            value = pickle.dumps(value)
+            try:
+                value = isinstance(value, (str, unicode)) and pickle.dumps(eval(value)) or value
+            except Exception:
+                value = pickle.dumps(value)
         self.write(cursor, user, id, {name[:-9]: value}, context=ctx)
 
     def onchange_object_id(self, cr, uid, ids, object_id, context=None):

From 6ddbf83c1a4c7d590b5dabe788ba57f6389fdf47 Mon Sep 17 00:00:00 2001
From: "Prashant Panchal (OpenERP)" <ppa@tinyerp.com>
Date: Tue, 6 May 2014 12:34:38 +0530
Subject: [PATCH 052/225] [IMP]fix type + chaneg class name from
 sala_team_configuration to sale_team_configuration & change model name
 sale.config.sattings

---
 addons/sale_team/res_config_view.xml          | 28 +++++++++----------
 addons/sale_team/sale_team_config.py          |  4 +--
 addons/sale_team/security/ir.model.access.csv |  2 +-
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/addons/sale_team/res_config_view.xml b/addons/sale_team/res_config_view.xml
index ddcc72b5375..a9d9f08fdd4 100644
--- a/addons/sale_team/res_config_view.xml
+++ b/addons/sale_team/res_config_view.xml
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <record id="view_sale_config_settings" model="ir.ui.view">
+        <record id="view_sale_config_settings_test" model="ir.ui.view">
             <field name="name">crm settings</field>
-            <field name="model">sale.team.config.settings</field>
+            <field name="model">sale.config.settings</field>
             <field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
             <field name="arch" type="xml">
                 <data>
-                    <div name="config_sale" position="before">
-                        <separator string="Sales Teams"/>
-                        <group>
-                            <label for="id" string="Manage Sales Teams"/>
+	            <div name="config_sale" position="before">
+                    <separator string="Sales Teams"/>
+                    <group>
+                        <label for="id" string="Manage Sales Teams"/>
+                        <div>
                             <div>
-                                <div>
-                                    <field name="group_multi_salesteams" class="oe_inline"/>
-                                    <label for="group_multi_salesteams"/>
-                                </div>
+                                <field name="group_multi_salesteams" class="oe_inline"/>
+                                <label for="group_multi_salesteams"/>
                             </div>
-                        </group>
-    	            </div>
-    	        </data>
-	        </field>
+                        </div>
+                    </group>
+	            </div>
+                </data>
+            </field>
         </record>
     </data>
 </openerp>
diff --git a/addons/sale_team/sale_team_config.py b/addons/sale_team/sale_team_config.py
index 344c38313c9..c6adeb73a55 100644
--- a/addons/sale_team/sale_team_config.py
+++ b/addons/sale_team/sale_team_config.py
@@ -22,8 +22,8 @@
 from openerp.osv import fields, osv
 
 
-class sala_team_configuration(osv.TransientModel):
-    _name = 'sale.team.config.settings'
+class sale_team_configuration(osv.TransientModel):
+    _name = 'sale.config.settings'
     _inherit = ['sale.config.settings', 'fetchmail.config.settings']
 
     def set_group_multi_salesteams(self, cr, uid, ids, context=None):
diff --git a/addons/sale_team/security/ir.model.access.csv b/addons/sale_team/security/ir.model.access.csv
index e3c55739176..f983a2abb9d 100644
--- a/addons/sale_team/security/ir.model.access.csv
+++ b/addons/sale_team/security/ir.model.access.csv
@@ -1,4 +1,4 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_crm_case_section,crm.case.section,model_crm_case_section,base.group_user,1,0,0,0
 access_crm_case_section_user,crm.case.section.user,model_crm_case_section,base.group_sale_salesman,1,0,0,0
-access_crm_case_section_manager,crm.case.section.manager,model_crm_case_section,base.group_sale_manager,1,1,1,1
\ No newline at end of file
+access_crm_case_section_manager,crm.case.section.manager,model_crm_case_section,base.group_sale_manager,1,1,1,1

From 14cf5e1631520fa4c0793220c62165439f30f84c Mon Sep 17 00:00:00 2001
From: "Prashant Panchal (OpenERP)" <ppa@tinyerp.com>
Date: Tue, 6 May 2014 12:42:08 +0530
Subject: [PATCH 053/225] [IMP] change record id in res_config_view.xml

---
 addons/sale_team/res_config_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale_team/res_config_view.xml b/addons/sale_team/res_config_view.xml
index a9d9f08fdd4..dd5d0ffca66 100644
--- a/addons/sale_team/res_config_view.xml
+++ b/addons/sale_team/res_config_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <record id="view_sale_config_settings_test" model="ir.ui.view">
+        <record id="view_sale_config_settings" model="ir.ui.view">
             <field name="name">crm settings</field>
             <field name="model">sale.config.settings</field>
             <field name="inherit_id" ref="base_setup.view_sale_config_settings"/>

From 10beeb53ede95800f649f05449acc47f06b78454 Mon Sep 17 00:00:00 2001
From: "Prashant Panchal (OpenERP)" <ppa@tinyerp.com>
Date: Tue, 6 May 2014 15:38:12 +0530
Subject: [PATCH 054/225] [MERGE]merge with trunk

---
 addons/sale_team/res_config_view.xml | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/addons/sale_team/res_config_view.xml b/addons/sale_team/res_config_view.xml
index dd5d0ffca66..e8f2265f1e3 100644
--- a/addons/sale_team/res_config_view.xml
+++ b/addons/sale_team/res_config_view.xml
@@ -7,20 +7,23 @@
             <field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
             <field name="arch" type="xml">
                 <data>
-	            <div name="config_sale" position="before">
-                    <separator string="Sales Teams"/>
-                    <group>
-                        <label for="id" string="Manage Sales Teams"/>
-                        <div>
-                            <div>
-                                <field name="group_multi_salesteams" class="oe_inline"/>
-                                <label for="group_multi_salesteams"/>
-                            </div>
-                        </div>
-                    </group>
-	            </div>
+				    <div name="config_sale" position="before">
+				        <separator string="Sales Teams"/>
+				        <group>
+				            <label for="id" string="Manage Sales Teams"/>
+				            <div>
+				                <div>
+				                    <field name="group_multi_salesteams" class="oe_inline"/>
+				                    <label for="group_multi_salesteams"/>
+				                </div>
+				            </div>
+				        </group>
+				    </div>
                 </data>
             </field>
         </record>
+
+		<menuitem id="base.menu_sale_config" name="Sales" parent="base.menu_config"
+            sequence="1" action="base_setup.action_sale_config"/>
     </data>
 </openerp>

From e511de45cbe46f5f93358aa23d405588ed485cac Mon Sep 17 00:00:00 2001
From: "Prashant Panchal (OpenERP)" <ppa@tinyerp.com>
Date: Wed, 7 May 2014 11:50:06 +0530
Subject: [PATCH 055/225] [ADD]crm_case_section (view & py file) add in sale
 module, that file split from sale.py & sale_view.xml

---
 addons/sale/__init__.py               |  1 +
 addons/sale/__openerp__.py            |  1 +
 addons/sale/crm_case_section.py       | 85 +++++++++++++++++++++++++++
 addons/sale/crm_case_section_view.xml | 74 +++++++++++++++++++++++
 addons/sale/sale.py                   | 50 ----------------
 addons/sale/sale_view.xml             | 70 ----------------------
 addons/sale_team/res_config_view.xml  | 27 ++++-----
 addons/sale_team/sale_team.xml        |  4 +-
 8 files changed, 176 insertions(+), 136 deletions(-)
 create mode 100644 addons/sale/crm_case_section.py
 create mode 100644 addons/sale/crm_case_section_view.xml

diff --git a/addons/sale/__init__.py b/addons/sale/__init__.py
index 5a7b4b499df..509364643ae 100644
--- a/addons/sale/__init__.py
+++ b/addons/sale/__init__.py
@@ -24,6 +24,7 @@
 #----------------------------------------------------------
 
 import sale
+import crm_case_section
 import res_partner
 import wizard
 import report
diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py
index c7348e5b37d..2faeb5b3693 100644
--- a/addons/sale/__openerp__.py
+++ b/addons/sale/__openerp__.py
@@ -71,6 +71,7 @@ The Dashboard for the Sales Manager will include
         'sale_report.xml',
         'sale_data.xml',
         'sale_view.xml',
+        'crm_case_section_view.xml',
         'res_partner_view.xml',
         'report/sale_report_view.xml',
         'edi/sale_order_action_data.xml',
diff --git a/addons/sale/crm_case_section.py b/addons/sale/crm_case_section.py
new file mode 100644
index 00000000000..11c8cdc8bb4
--- /dev/null
+++ b/addons/sale/crm_case_section.py
@@ -0,0 +1,85 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import calendar
+from openerp import tools
+from datetime import date, datetime, timedelta
+from dateutil.relativedelta import relativedelta
+from dateutil import relativedelta
+import time
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
+from openerp.tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT, DATETIME_FORMATS_MAP, float_compare
+import openerp.addons.decimal_precision as dp
+from openerp import workflow
+
+
+class crm_case_section(osv.osv):
+    _inherit = 'crm.case.section'
+
+    def _get_sale_orders_data(self, cr, uid, ids, field_name, arg, context=None):
+        obj = self.pool.get('sale.order')
+        res = dict.fromkeys(ids, False)
+        month_begin = date.today().replace(day=1)
+        date_begin = (month_begin - relativedelta.relativedelta(months=self._period_number - 1)).strftime(tools.DEFAULT_SERVER_DATE_FORMAT)
+        date_end = month_begin.replace(day=calendar.monthrange(month_begin.year, month_begin.month)[1]).strftime(tools.DEFAULT_SERVER_DATE_FORMAT)
+        for id in ids:
+            res[id] = dict()
+            created_domain = [('section_id', '=', id), ('state', '=', ['draft']), ('date_order', '>=', date_begin), ('date_order', '<=', date_end)]
+            res[id]['monthly_quoted'] = self.__get_bar_values(cr, uid, obj, created_domain, ['amount_total', 'date_order'], 'amount_total', 'date_order', context=context)
+            validated_domain = [('section_id', '=', id), ('state', 'not in', ['draft', 'sent', 'cancel']), ('date_order', '>=', date_begin), ('date_order', '<=', date_end)]
+            res[id]['monthly_confirmed'] = self.__get_bar_values(cr, uid, obj, validated_domain, ['amount_total', 'date_order'], 'amount_total', 'date_order', context=context)
+        return res
+
+    def _get_invoices_data(self, cr, uid, ids, field_name, arg, context=None):
+        obj = self.pool.get('account.invoice.report')
+        res = dict.fromkeys(ids, False)
+        month_begin = date.today().replace(day=1)
+        date_begin = (month_begin - relativedelta.relativedelta(months=self._period_number - 1)).strftime(tools.DEFAULT_SERVER_DATE_FORMAT)
+        date_end = month_begin.replace(day=calendar.monthrange(month_begin.year, month_begin.month)[1]).strftime(tools.DEFAULT_SERVER_DATE_FORMAT)
+        for id in ids:
+            created_domain = [('section_id', '=', id), ('state', 'not in', ['draft', 'cancel']), ('date', '>=', date_begin), ('date', '<=', date_end)]
+            res[id] = self.__get_bar_values(cr, uid, obj, created_domain, ['price_total', 'date'], 'price_total', 'date', context=context)
+        return res
+
+    _columns = {
+        'invoiced_forecast': fields.integer(string='Invoice Forecast',
+            help="Forecast of the invoice revenue for the current month. This is the amount the sales \n"
+                    "team should invoice this month. It is used to compute the progression ratio \n"
+                    " of the current and forecast revenue on the kanban view."),
+        'invoiced_target': fields.integer(string='Invoice Target',
+            help="Target of invoice revenue for the current month. This is the amount the sales \n"
+                    "team estimates to be able to invoice this month."),
+        'monthly_quoted': fields.function(_get_sale_orders_data,
+            type='string', readonly=True, multi='_get_sale_orders_data',
+            string='Rate of created quotation per duration'),
+        'monthly_confirmed': fields.function(_get_sale_orders_data,
+            type='string', readonly=True, multi='_get_sale_orders_data',
+            string='Rate of validate sales orders per duration'),
+        'monthly_invoiced': fields.function(_get_invoices_data,
+            type='string', readonly=True,
+            string='Rate of sent invoices per duration'),
+    }
+
+    def action_forecast(self, cr, uid, id, value, context=None):
+        return self.write(cr, uid, [id], {'invoiced_forecast': round(float(value))}, context=context)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale/crm_case_section_view.xml b/addons/sale/crm_case_section_view.xml
new file mode 100644
index 00000000000..e4d36f23918
--- /dev/null
+++ b/addons/sale/crm_case_section_view.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="crm_case_section_salesteams_view_form" model="ir.ui.view">
+            <field name="name">crm.case.section.form</field>
+            <field name="model">crm.case.section</field>
+            <field name="inherit_id" ref="sale_team.crm_case_section_view_form"/>
+            <field name="arch" type="xml">
+            <data>
+                <xpath expr="//field[@name='code']" position="after">
+                    <field name="invoiced_target"/>
+                    <field name="invoiced_forecast"/>
+                </xpath>
+            </data>
+            </field>
+        </record>
+
+        <record id="crm_case_section_salesteams_view_kanban" model="ir.ui.view">
+            <field name="name">crm.case.section.kanban</field>
+            <field name="model">crm.case.section</field>
+            <field name="inherit_id" ref="sale_team.crm_case_section_salesteams_view_kanban"/>
+            <field name="arch" type="xml">
+            <data>
+                <xpath expr="//field[@name='name']" position="after">
+                    <field name="monthly_quoted"/>
+                    <field name="monthly_confirmed"/>
+                    <field name="monthly_invoiced"/>
+                    <field name="invoiced_forecast"/>
+                    <field name="invoiced_target"/>
+                </xpath>
+                <xpath expr="//div[@class='oe_clear']" position="before">
+                    <div class="oe_items_list">
+                        <div class="oe_salesteams_quotations">
+                            <a name="%(action_quotations_salesteams)d" type="action" class="oe_sparkline_bar_link">Quotations</a>
+                            <a name="%(action_order_report_quotation_salesteam)d" type="action" class="oe_sparkline_bar_link">
+                                <field name="monthly_quoted" widget="sparkline_bar" options="{'delayIn': '3000'}">
+                                    Revenue of created quotations per month.<br/>Click to see a detailed analysis.
+                                </field>
+                            </a>
+                        </div>
+                        <div class="oe_salesteams_orders">
+                            <a name="%(action_orders_salesteams)d" type="action">Sales Orders</a>
+                            <a name="%(action_order_report_so_salesteam)d" type="action" class="oe_sparkline_bar_link">
+                                <field name="monthly_confirmed" widget="sparkline_bar" options="{'delayIn': '3000'}">
+                                    Revenue of confirmed sales orders per month.<br/>Click to acces the Sales Analysis.
+                                </field>
+                            </a>
+                        </div>
+                        <div class="oe_salesteams_invoices" groups="account.group_account_invoice">
+                            <a name="%(action_invoice_salesteams)d" type="action">Invoices</a>
+                            <a name="%(action_account_invoice_report_salesteam)d" type="action" class="oe_sparkline_bar_link">
+                                <field name="monthly_invoiced" widget="sparkline_bar" options="{'delayIn': '3000'}">
+                                    Revenue of sent invoices per month.<br/>Click to see a detailed analysis of invoices.
+                                </field>
+                            </a>
+                        </div>
+                      </div>
+                </xpath>
+                <xpath expr="//div[@class='oe_clear']" position="after">
+                    <div class="oe_center" t-if="record.invoiced_target.raw_value">
+                        <field name="monthly_invoiced" widget="gauge" style="width:160px; height: 120px; cursor: pointer;"
+                            options="{'max_field': 'invoiced_target'}">Invoiced</field>
+                        <field name="invoiced_forecast" widget="gauge" style="width:160px; height: 120px; cursor: pointer;"
+                            options="{'max_field': 'invoiced_target', 'on_change': 'action_forecast'}">Forecast</field>
+                    </div>
+                    <div class="oe_center oe_salesteams_help" style="color:#bbbbbb;" t-if="!record.invoiced_target.raw_value">
+                        <br/>Define an invoicing target in the sales team settings to see the period's achievement and forecast at a glance.
+                    </div>
+                </xpath>
+            </data>
+           </field>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 1270534ae6d..53ab1c38a8b 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -1042,56 +1042,6 @@ class account_invoice(osv.Model):
     _defaults = {
        'section_id': lambda self, cr, uid, c=None: self.pool.get('res.users').browse(cr, uid, uid, c).default_section_id.id or False,
     }
-        
-class crm_case_section(osv.osv):
-    _inherit = 'crm.case.section'
-
-    def _get_sale_orders_data(self, cr, uid, ids, field_name, arg, context=None):
-        obj = self.pool.get('sale.order')
-        res = dict.fromkeys(ids, False)
-        month_begin = date.today().replace(day=1)
-        date_begin = (month_begin - relativedelta.relativedelta(months=self._period_number - 1)).strftime(tools.DEFAULT_SERVER_DATE_FORMAT)
-        date_end = month_begin.replace(day=calendar.monthrange(month_begin.year, month_begin.month)[1]).strftime(tools.DEFAULT_SERVER_DATE_FORMAT)
-        for id in ids:
-            res[id] = dict()
-            created_domain = [('section_id', '=', id), ('state', '=', ['draft']), ('date_order', '>=', date_begin), ('date_order', '<=', date_end)]
-            res[id]['monthly_quoted'] = self.__get_bar_values(cr, uid, obj, created_domain, ['amount_total', 'date_order'], 'amount_total', 'date_order', context=context)
-            validated_domain = [('section_id', '=', id), ('state', 'not in', ['draft', 'sent', 'cancel']), ('date_order', '>=', date_begin), ('date_order', '<=', date_end)]
-            res[id]['monthly_confirmed'] = self.__get_bar_values(cr, uid, obj, validated_domain, ['amount_total', 'date_order'], 'amount_total', 'date_order', context=context)
-        return res
-
-    def _get_invoices_data(self, cr, uid, ids, field_name, arg, context=None):
-        obj = self.pool.get('account.invoice.report')
-        res = dict.fromkeys(ids, False)
-        month_begin = date.today().replace(day=1)
-        date_begin = (month_begin - relativedelta.relativedelta(months=self._period_number - 1)).strftime(tools.DEFAULT_SERVER_DATE_FORMAT)
-        date_end = month_begin.replace(day=calendar.monthrange(month_begin.year, month_begin.month)[1]).strftime(tools.DEFAULT_SERVER_DATE_FORMAT)
-        for id in ids:
-            created_domain = [('section_id', '=', id), ('state', 'not in', ['draft', 'cancel']), ('date', '>=', date_begin), ('date', '<=', date_end)]
-            res[id] = self.__get_bar_values(cr, uid, obj, created_domain, ['price_total', 'date'], 'price_total', 'date', context=context)
-        return res
-
-    _columns = {
-        'invoiced_forecast': fields.integer(string='Invoice Forecast',
-            help="Forecast of the invoice revenue for the current month. This is the amount the sales \n"
-                    "team should invoice this month. It is used to compute the progression ratio \n"
-                    " of the current and forecast revenue on the kanban view."),
-        'invoiced_target': fields.integer(string='Invoice Target',
-            help="Target of invoice revenue for the current month. This is the amount the sales \n"
-                    "team estimates to be able to invoice this month."),
-        'monthly_quoted': fields.function(_get_sale_orders_data,
-            type='string', readonly=True, multi='_get_sale_orders_data',
-            string='Rate of created quotation per duration'),
-        'monthly_confirmed': fields.function(_get_sale_orders_data,
-            type='string', readonly=True, multi='_get_sale_orders_data',
-            string='Rate of validate sales orders per duration'),
-        'monthly_invoiced': fields.function(_get_invoices_data,
-            type='string', readonly=True,
-            string='Rate of sent invoices per duration'),
-    }
-
-    def action_forecast(self, cr, uid, id, value, context=None):
-        return self.write(cr, uid, [id], {'invoiced_forecast': round(float(value))}, context=context)
 
 class product_product(osv.Model):
     _inherit = 'product.product'
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 223bc5fe1f0..8aabe31fc93 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -682,75 +682,5 @@
             <field name="context">{'search_default_month':1}</field>
             <field name="help">From this report, you can have an overview of the amount invoiced to your customer. The tool search can also be used to personalise your Invoices reports and so, match this analysis to your needs.</field>
         </record>
-
-        <record id="crm_case_section_salesteams_view_form" model="ir.ui.view">
-            <field name="name">crm.case.section.form</field>
-            <field name="model">crm.case.section</field>
-            <field name="inherit_id" ref="sale_team.crm_case_section_view_form"/>
-            <field name="arch" type="xml">
-            <data>
-                <xpath expr="//field[@name='code']" position="after">
-                    <field name="invoiced_target"/>
-                    <field name="invoiced_forecast"/>
-                </xpath>
-            </data>
-            </field>
-        </record>
-
-        <record id="crm_case_section_salesteams_view_kanban" model="ir.ui.view">
-            <field name="name">crm.case.section.kanban</field>
-            <field name="model">crm.case.section</field>
-            <field name="inherit_id" ref="sale_team.crm_case_section_salesteams_view_kanban"/>
-            <field name="arch" type="xml">
-            <data>
-                <xpath expr="//field[@name='name']" position="after">
-                    <field name="monthly_quoted"/>
-                    <field name="monthly_confirmed"/>
-                    <field name="monthly_invoiced"/>
-                    <field name="invoiced_forecast"/>
-                    <field name="invoiced_target"/>
-                </xpath>
-                <xpath expr="//div[@class='oe_clear']" position="before">
-                    <div class="oe_items_list">
-                        <div class="oe_salesteams_quotations">
-                            <a name="%(action_quotations_salesteams)d" type="action" class="oe_sparkline_bar_link">Quotations</a>
-                            <a name="%(action_order_report_quotation_salesteam)d" type="action" class="oe_sparkline_bar_link">
-                                <field name="monthly_quoted" widget="sparkline_bar" options="{'delayIn': '3000'}">
-                                    Revenue of created quotations per month.<br/>Click to see a detailed analysis.
-                                </field>
-                            </a>
-                        </div>
-                        <div class="oe_salesteams_orders">
-                            <a name="%(action_orders_salesteams)d" type="action">Sales Orders</a>
-                            <a name="%(action_order_report_so_salesteam)d" type="action" class="oe_sparkline_bar_link">
-                                <field name="monthly_confirmed" widget="sparkline_bar" options="{'delayIn': '3000'}">
-                                    Revenue of confirmed sales orders per month.<br/>Click to acces the Sales Analysis.
-                                </field>
-                            </a>
-                        </div>
-                        <div class="oe_salesteams_invoices" groups="account.group_account_invoice">
-                            <a name="%(action_invoice_salesteams)d" type="action">Invoices</a>
-                            <a name="%(action_account_invoice_report_salesteam)d" type="action" class="oe_sparkline_bar_link">
-                                <field name="monthly_invoiced" widget="sparkline_bar" options="{'delayIn': '3000'}">
-                                    Revenue of sent invoices per month.<br/>Click to see a detailed analysis of invoices.
-                                </field>
-                            </a>
-                        </div>
-                      </div>
-                </xpath>
-                <xpath expr="//div[@class='oe_clear']" position="after">
-                    <div class="oe_center" t-if="record.invoiced_target.raw_value">
-                        <field name="monthly_invoiced" widget="gauge" style="width:160px; height: 120px; cursor: pointer;"
-                            options="{'max_field': 'invoiced_target'}">Invoiced</field>
-                        <field name="invoiced_forecast" widget="gauge" style="width:160px; height: 120px; cursor: pointer;"
-                            options="{'max_field': 'invoiced_target', 'on_change': 'action_forecast'}">Forecast</field>
-                    </div>
-                    <div class="oe_center oe_salesteams_help" style="color:#bbbbbb;" t-if="!record.invoiced_target.raw_value">
-                        <br/>Define an invoicing target in the sales team settings to see the period's achievement and forecast at a glance.
-                    </div>
-                </xpath>
-            </data>
-           </field>
-        </record>
     </data>
 </openerp>
diff --git a/addons/sale_team/res_config_view.xml b/addons/sale_team/res_config_view.xml
index e8f2265f1e3..88a51e78cda 100644
--- a/addons/sale_team/res_config_view.xml
+++ b/addons/sale_team/res_config_view.xml
@@ -7,23 +7,22 @@
             <field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
             <field name="arch" type="xml">
                 <data>
-				    <div name="config_sale" position="before">
-				        <separator string="Sales Teams"/>
-				        <group>
-				            <label for="id" string="Manage Sales Teams"/>
-				            <div>
-				                <div>
-				                    <field name="group_multi_salesteams" class="oe_inline"/>
-				                    <label for="group_multi_salesteams"/>
-				                </div>
-				            </div>
-				        </group>
-				    </div>
+	            <div name="config_sale" position="before">
+                    <separator string="Sales Teams"/>
+                    <group>
+                        <label for="id" string="Manage Sales Teams"/>
+                        <div>
+                            <div>
+                                <field name="group_multi_salesteams" class="oe_inline"/>
+                                <label for="group_multi_salesteams"/>
+                            </div>
+                        </div>
+                    </group>
+	            </div>
                 </data>
             </field>
         </record>
-
-		<menuitem id="base.menu_sale_config" name="Sales" parent="base.menu_config"
+        <menuitem id="base.menu_sale_config" name="Sales" parent="base.menu_config"
             sequence="1" action="base_setup.action_sale_config"/>
     </data>
 </openerp>
diff --git a/addons/sale_team/sale_team.xml b/addons/sale_team/sale_team.xml
index a00bbe6665b..2512c20efb6 100644
--- a/addons/sale_team/sale_team.xml
+++ b/addons/sale_team/sale_team.xml
@@ -34,7 +34,7 @@
 
         <!-- Case Sections Salesteams kanban view -->
 
-       <record model="ir.ui.view" id="crm_case_section_salesteams_view_kanban">
+       <record id="crm_case_section_salesteams_view_kanban" model="ir.ui.view" >
             <field name="name">crm.case.section.kanban</field>
             <field name="model">crm.case.section</field>
             <field name="arch" type="xml">
@@ -197,4 +197,4 @@
         </record>
     <menuitem id="sale_team.menu_sale_team_act" action="crm_case_section_salesteams_act" sequence="1" parent="base.menu_sales"/>
     </data>
-</openerp>
\ No newline at end of file
+</openerp>

From da4333360ea31f1a18e762b3639ffcb6454750e8 Mon Sep 17 00:00:00 2001
From: "Ravi Gohil (OpenERP)" <rgo@tinyerp.com>
Date: Wed, 7 May 2014 19:02:22 +0530
Subject: [PATCH 056/225] [FIX] document_page: Menu for document page can only
 be created by superuser. (Maintenance Case: 607160)

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

bzr revid: rgo@tinyerp.com-20140507133222-qql3j1ttqk33une5
---
 addons/document_page/wizard/document_page_create_menu.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/document_page/wizard/document_page_create_menu.py b/addons/document_page/wizard/document_page_create_menu.py
index 9f20fab0d99..2be3c688bd7 100644
--- a/addons/document_page/wizard/document_page_create_menu.py
+++ b/addons/document_page/wizard/document_page_create_menu.py
@@ -19,6 +19,7 @@
 #
 ##############################################################################
 
+from openerp import SUPERUSER_ID
 from openerp.osv import fields, osv
 
 class document_page_create_menu(osv.osv_memory):
@@ -70,7 +71,7 @@ class document_page_create_menu(osv.osv_memory):
         value['res_id'] = page.id
 
         action_id = obj_action.create(cr, uid, value)
-        menu_id = obj_menu.create(cr, uid, {
+        menu_id = obj_menu.create(cr, SUPERUSER_ID, {
                         'name': data.menu_name,
                         'parent_id':data.menu_parent_id.id,
                         'icon': 'STOCK_DIALOG_QUESTION',

From 13d18d2bdba3d64f5041346f23d85838b4576936 Mon Sep 17 00:00:00 2001
From: Kersten Jeremy <jke@openerp.com>
Date: Wed, 7 May 2014 17:47:58 +0200
Subject: [PATCH 057/225] [FIX] Graph - Add context in fields_get to have the
 right translation in col_header and other places where terms was not
 translate.

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

bzr revid: jke@openerp.com-20140507154758-0vkq9rywjyl55f5w
---
 addons/web_graph/static/src/js/graph_widget.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/web_graph/static/src/js/graph_widget.js b/addons/web_graph/static/src/js/graph_widget.js
index 78fa7ceff22..bf6df084fbc 100644
--- a/addons/web_graph/static/src/js/graph_widget.js
+++ b/addons/web_graph/static/src/js/graph_widget.js
@@ -42,7 +42,9 @@ openerp.web_graph.Graph = openerp.web.Widget.extend({
             this.$('.graph_main_content').addClass('graph_pivot_mode');
         }
 
-        return this.model.call('fields_get', []).then(function (f) {
+        return this.model.call('fields_get', {
+                context: self.graph_view.dataset.context
+            }).then(function (f) {
             self.fields = f;
             self.fields.__count = {field:'__count', type: 'integer', string:_t('Quantity')};
             self.important_fields = self.get_search_fields();

From 5f1bd401f8ac7fe187390b7654cdec2677e9e229 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Thu, 8 May 2014 06:32:51 +0000
Subject: [PATCH 058/225] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20140508063251-ztdomqygi2izm2o3
---
 addons/account_voucher/i18n/bs.po        | 427 +++++++++++++----------
 addons/analytic_user_function/i18n/ja.po |  30 +-
 addons/auth_signup/i18n/ja.po            |  10 +-
 addons/hr_expense/i18n/ja.po             |   8 +-
 addons/mail/i18n/lt.po                   |  10 +-
 addons/project/i18n/ja.po                |  22 +-
 addons/purchase/i18n/bs.po               |  11 +-
 addons/sale/i18n/bs.po                   |  15 +-
 addons/sale/i18n/ja.po                   |   8 +-
 9 files changed, 308 insertions(+), 233 deletions(-)

diff --git a/addons/account_voucher/i18n/bs.po b/addons/account_voucher/i18n/bs.po
index 6f9ebcb4da5..5604edd12cd 100644
--- a/addons/account_voucher/i18n/bs.po
+++ b/addons/account_voucher/i18n/bs.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-10-29 21:46+0000\n"
-"Last-Translator: Bosko Stojakovic <bluesoft83@gmail.com>\n"
+"PO-Revision-Date: 2014-05-07 19:49+0000\n"
+"Last-Translator: Boško Stojaković <bluesoft83@gmail.com>\n"
 "Language-Team: Bosnian <bs@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: 2013-11-21 05:59+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-05-08 06:32+0000\n"
+"X-Generator: Launchpad (build 16996)\n"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0
@@ -60,6 +60,8 @@ msgid ""
 "Computed as the difference between the amount stated in the voucher and the "
 "sum of allocation on the voucher lines."
 msgstr ""
+"Izračunato kao razlika između iznosa iskazanog na računu i sume stavki "
+"računa."
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -81,7 +83,7 @@ msgstr "Uvoz stavki"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Voucher Entry"
-msgstr ""
+msgstr "Zapis računa"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
@@ -136,7 +138,7 @@ msgstr "Prodavač(ica)"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Voucher Statistics"
-msgstr ""
+msgstr "Statistika računa"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:1641
@@ -173,11 +175,18 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Kliknite za kreiranje novog računa nabavke. \n"
+"              </p><p>\n"
+"                Nakon potvrđivanja računa nabavke, moguće je evidentirati\n"
+"                uplate dobavljaču povezane sa tim računom nabavke.\n"
+"              </p>\n"
+"            "
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Search Vouchers"
-msgstr ""
+msgstr "Pretraži račune"
 
 #. module: account_voucher
 #: field:account.voucher,writeoff_acc_id:0
@@ -189,22 +198,22 @@ msgstr "Protukonto"
 #: field:account.voucher.line,account_id:0
 #: field:sale.receipt.report,account_id:0
 msgid "Account"
-msgstr ""
+msgstr "Konto"
 
 #. module: account_voucher
 #: field:account.voucher,line_dr_ids:0
 msgid "Debits"
-msgstr ""
+msgstr "Dugovanja"
 
 #. module: account_voucher
 #: view:account.statement.from.invoice.lines:0
 msgid "Ok"
-msgstr ""
+msgstr "U redu"
 
 #. module: account_voucher
 #: field:account.voucher.line,reconcile:0
 msgid "Full Reconcile"
-msgstr ""
+msgstr "Kompletno zatvaranje"
 
 #. module: account_voucher
 #: field:account.voucher,date_due:0
@@ -212,68 +221,68 @@ msgstr ""
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,date_due:0
 msgid "Due Date"
-msgstr ""
+msgstr "Datum dospijeća"
 
 #. module: account_voucher
 #: field:account.voucher,narration:0
 msgid "Notes"
-msgstr ""
+msgstr "Zabilješke"
 
 #. module: account_voucher
 #: field:account.voucher,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Poruke"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
 #: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
 msgid "Purchase Receipts"
-msgstr ""
+msgstr "Nabavni računi"
 
 #. module: account_voucher
 #: field:account.voucher.line,move_line_id:0
 msgid "Journal Item"
-msgstr ""
+msgstr "Stavka dnevnika"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:558
 #: code:addons/account_voucher/account_voucher.py:1073
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Greška!"
 
 #. module: account_voucher
 #: field:account.voucher.line,amount:0
 msgid "Amount"
-msgstr ""
+msgstr "Iznos"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Options"
-msgstr ""
+msgstr "Opcije plaćanja"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "e.g. 003/10"
-msgstr ""
+msgstr "npr. 003/10"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Other Information"
-msgstr ""
+msgstr "Ostali podaci"
 
 #. module: account_voucher
 #: selection:account.voucher,state:0
 #: selection:sale.receipt.report,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Otkazano"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:1249
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
-msgstr ""
+msgstr "Morate podesiti konto  osnovice i konto poreza na '%s' porezu!"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_sale_receipt
@@ -287,44 +296,52 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Kliknite za kreiranje novog računa prodaje.\n"
+"              </p><p>\n"
+"               Nakon kreiranje računa prodaje, moguće je evidentirati uplate "
+"kupaca\n"
+"               povezane sa ovim računom.\n"
+"              </p>\n"
+"            "
 
 #. module: account_voucher
 #: help:account.voucher,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Ako je označeno, nove poruke će zahtjevati vašu pažnju."
 
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_bank_statement_line
 msgid "Bank Statement Line"
-msgstr ""
+msgstr "Stavka izvoda banke"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "Dan"
 
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher,tax_id:0
 msgid "Tax"
-msgstr ""
+msgstr "Porez"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:971
 #, python-format
 msgid "Invalid Action!"
-msgstr ""
+msgstr "Ne pravilna akcija"
 
 #. module: account_voucher
 #: field:account.voucher,comment:0
 msgid "Counterpart Comment"
-msgstr ""
+msgstr "Komentar protustavke"
 
 #. module: account_voucher
 #: field:account.voucher.line,account_analytic_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "Analitičko konto"
 
 #. module: account_voucher
 #: help:account.voucher,message_summary:0
@@ -332,21 +349,23 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Sadrži sažetak konverzacije (broj poruka..). Ovaj sažetak je u html formatu "
+"da bi mogao biti ubačen u kanban pogled."
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Total Allocation"
-msgstr ""
+msgstr "Puna alokacija"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Information"
-msgstr ""
+msgstr "Informacije o plaćanju"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "(update)"
-msgstr ""
+msgstr "(osvježi)"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -354,36 +373,36 @@ msgstr ""
 #: view:sale.receipt.report:0
 #: selection:sale.receipt.report,state:0
 msgid "Draft"
-msgstr ""
+msgstr "U pripremi"
 
 #. module: account_voucher
 #: view:account.bank.statement:0
 msgid "Import Invoices"
-msgstr ""
+msgstr "Uvoz računa"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "e.g. Invoice SAJ/0042"
-msgstr ""
+msgstr "npr. Račun SAJ/0042"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:1208
 #, python-format
 msgid "Wrong voucher line"
-msgstr ""
+msgstr "Kriva stavka računa"
 
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
 msgid "Pay Later or Group Funds"
-msgstr ""
+msgstr "Plati kasnije ili grupna sredstva"
 
 #. module: account_voucher
 #: view:account.voucher:0
 #: selection:account.voucher,type:0
 #: selection:sale.receipt.report,type:0
 msgid "Receipt"
-msgstr ""
+msgstr "Račun"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:1110
@@ -393,67 +412,69 @@ msgid ""
 "settings, to manage automatically the booking of accounting entries related "
 "to differences between exchange rates."
 msgstr ""
+"Trebali bi ste podesiti 'Konto pozitivne kursne razlike' u postavkama "
+"računovodstva, za automatsko knjiženje kursnih razlika."
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Sales Lines"
-msgstr ""
+msgstr "Stavke prodaje"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Cancel Voucher"
-msgstr ""
+msgstr "Otkaži račun"
 
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher,period_id:0
 msgid "Period"
-msgstr ""
+msgstr "Period"
 
 #. module: account_voucher
 #: view:account.voucher:0
 #: code:addons/account_voucher/account_voucher.py:231
 #, python-format
 msgid "Supplier"
-msgstr ""
+msgstr "Dobavljač"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Supplier Voucher"
-msgstr ""
+msgstr "Račun dobavljača"
 
 #. module: account_voucher
 #: field:account.voucher,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Pratioci"
 
 #. module: account_voucher
 #: selection:account.voucher.line,type:0
 msgid "Debit"
-msgstr ""
+msgstr "Duguje"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:1641
 #, python-format
 msgid "Unable to change journal !"
-msgstr ""
+msgstr "Nije moguće promijenti dnevnik !"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,nbr:0
 msgid "# of Voucher Lines"
-msgstr ""
+msgstr "# linija računa"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,type:0
 msgid "Type"
-msgstr ""
+msgstr "Tip"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "Pro-forma Vouchers"
-msgstr ""
+msgstr "Proforma računi"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:318
@@ -462,6 +483,8 @@ msgid ""
 "At the operation date, the exchange rate was\n"
 "%s = %s"
 msgstr ""
+"Na dan operacije, kurs je bio\n"
+"%s = %s"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
@@ -474,52 +497,59 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Kliknite za kreiranje nove uplate dobavljaču.\n"
+"              </p><p>\n"
+"                OpenERP Vam pomaže da jednostavno pratite plaćanja kao i\n"
+"                preostala salda i dugovanja prema dobavljačima.\n"
+"              </p>\n"
+"            "
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Supplier Journal Entries"
-msgstr ""
+msgstr "Otvori stavke dnevnika dobavljača"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_review_voucher_list
 msgid "Vouchers Entries"
-msgstr ""
+msgstr "Zapisi računa"
 
 #. module: account_voucher
 #: field:account.voucher,name:0
 msgid "Memo"
-msgstr ""
+msgstr "Bilješka"
 
 #. module: account_voucher
 #: code:addons/account_voucher/invoice.py:34
 #, python-format
 msgid "Pay Invoice"
-msgstr ""
+msgstr "Plaćanje"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Are you sure to unreconcile and cancel this record ?"
-msgstr ""
+msgstr "Jeste li sigurni da želite razvezati i otkazati ovaj zapis?"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Sales Receipt"
-msgstr ""
+msgstr "Račun prodaje"
 
 #. module: account_voucher
 #: field:account.voucher,is_multi_currency:0
 msgid "Multi Currency Voucher"
-msgstr ""
+msgstr "Viševalutni računi"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Bill Information"
-msgstr ""
+msgstr "Informacije računa"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "July"
-msgstr ""
+msgstr "Jul"
 
 #. module: account_voucher
 #: help:account.voucher,state:0
@@ -533,38 +563,45 @@ msgid ""
 "\n"
 "* The 'Cancelled' status is used when user cancel voucher."
 msgstr ""
+" * 'U pripremi' je status koji se koristi kada korisnik unosi novi "
+"nepotvrđeni račun.                         \n"
+"* 'Pro-forma' je status koji se koristi kada je račun u Pro-forma "
+"statusu,dakle računu nije dodijeljen broj.                         \n"
+"* 'Potvrđen' je status koji se koristi kada je račun kreiran, dodijeljen mu "
+"je broj te je proveden u računovodstvu.                 \n"
+"* 'Otkazan' je status koji se koristi kada je račun otkazan."
 
 #. module: account_voucher
 #: field:account.voucher,writeoff_amount:0
 msgid "Difference Amount"
-msgstr ""
+msgstr "Iznos razlike"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,due_delay:0
 msgid "Avg. Due Delay"
-msgstr ""
+msgstr "Pros. prekoračenje valute"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Are you sure you want to unreconcile this record?"
-msgstr ""
+msgstr "Jeste li sigurni da želite razvezati ovaj zapis?"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:1249
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
-msgstr ""
+msgstr "Nema konta osnovice i poreza!"
 
 #. module: account_voucher
 #: field:account.voucher,tax_amount:0
 msgid "Tax Amount"
-msgstr ""
+msgstr "Iznos poreza"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "Validated Vouchers"
-msgstr ""
+msgstr "Potvrđeni računi"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_vendor_receipt
@@ -581,28 +618,36 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Pritisnite za evidentiranje nove uplate. \n"
+"              </p><p>\n"
+"                Unesite kupca i način plaćanja a zatim unesite ručno ili će\n"
+"                OpenERP predložiti automatski zatvaranje stavaka sa\n"
+"                otvorenom fakturom ili računom.\n"
+"              </p>\n"
+"            "
 
 #. module: account_voucher
 #: field:account.config.settings,expense_currency_exchange_account_id:0
 #: field:res.company,expense_currency_exchange_account_id:0
 msgid "Loss Exchange Rate Account"
-msgstr ""
+msgstr "Konto negativnih kursnih razlika"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Paid Amount"
-msgstr ""
+msgstr "Plaćeni iznos"
 
 #. module: account_voucher
 #: field:account.voucher,payment_option:0
 msgid "Payment Difference"
-msgstr ""
+msgstr "Razlika plaćanja"
 
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher,audit:0
 msgid "To Review"
-msgstr ""
+msgstr "Za provjeru"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:1120
@@ -610,7 +655,7 @@ msgstr ""
 #: code:addons/account_voucher/account_voucher.py:1286
 #, python-format
 msgid "change"
-msgstr ""
+msgstr "promjena"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:1106
@@ -620,11 +665,13 @@ msgid ""
 "settings, to manage automatically the booking of accounting entries related "
 "to differences between exchange rates."
 msgstr ""
+"Kako bi automatski knjižili stavke dnevnika vezane za ralike kursa, trebate "
+"konfigurisati 'konto negativnih kursnih razlika' u postavkama računovodstva."
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Expense Lines"
-msgstr ""
+msgstr "Stavke troškova"
 
 #. module: account_voucher
 #: help:account.voucher,is_multi_currency:0
@@ -632,32 +679,34 @@ msgid ""
 "Fields with internal purpose only that depicts if the voucher is a multi "
 "currency one or not"
 msgstr ""
+"Polja sa internom svrhom koja samo razgraničava dali je račun više-valutni "
+"ili ne."
 
 #. module: account_voucher
 #: view:account.invoice:0
 msgid "Register Payment"
-msgstr ""
+msgstr "Registruj plaćanje"
 
 #. module: account_voucher
 #: field:account.statement.from.invoice.lines,line_ids:0
 msgid "Invoices"
-msgstr ""
+msgstr "Fakture"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "December"
-msgstr ""
+msgstr "Decembar"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "Group by month of Invoice Date"
-msgstr ""
+msgstr "Grupiši po mjesecima datuma fakturisanja"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mjesec"
 
 #. module: account_voucher
 #: field:account.voucher,currency_id:0
@@ -665,22 +714,22 @@ msgstr ""
 #: model:ir.model,name:account_voucher.model_res_currency
 #: field:sale.receipt.report,currency_id:0
 msgid "Currency"
-msgstr ""
+msgstr "Valuta"
 
 #. module: account_voucher
 #: view:account.statement.from.invoice.lines:0
 msgid "Payable and Receivables"
-msgstr ""
+msgstr "Obveze i potraživanja"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Voucher Payment"
-msgstr ""
+msgstr "Plaćanja računa"
 
 #. module: account_voucher
 #: field:sale.receipt.report,state:0
 msgid "Voucher Status"
-msgstr ""
+msgstr "Status računa"
 
 #. module: account_voucher
 #: field:account.voucher,company_id:0
@@ -688,73 +737,73 @@ msgstr ""
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Kompanija"
 
 #. module: account_voucher
 #: help:account.voucher,paid:0
 msgid "The Voucher has been totally paid."
-msgstr ""
+msgstr "Račun je plaćen u potpunosti."
 
 #. module: account_voucher
 #: selection:account.voucher,payment_option:0
 msgid "Reconcile Payment Balance"
-msgstr ""
+msgstr "Zatvori saldo plaćanja"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Cancel Receipt"
-msgstr ""
+msgstr "Otkaži račun"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:1067
 #, python-format
 msgid "Configuration Error !"
-msgstr ""
+msgstr "Greška konfiguracije !"
 
 #. module: account_voucher
 #: view:account.voucher:0
 #: view:sale.receipt.report:0
 msgid "Draft Vouchers"
-msgstr ""
+msgstr "Računi u pripremi"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,price_total_tax:0
 msgid "Total With Tax"
-msgstr ""
+msgstr "Ukupno s porezom"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Purchase Voucher"
-msgstr ""
+msgstr "Račun nabavke"
 
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher,state:0
 #: view:sale.receipt.report:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "Group by year of Invoice Date"
-msgstr ""
+msgstr "Grupiraj po godini izdavanja računa"
 
 #. module: account_voucher
 #: view:account.statement.from.invoice.lines:0
 #: view:account.voucher:0
 msgid "or"
-msgstr ""
+msgstr "ili"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "August"
-msgstr ""
+msgstr "Avgust"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Validate Payment"
-msgstr ""
+msgstr "Ovjeri plaćanje"
 
 #. module: account_voucher
 #: help:account.voucher,audit:0
@@ -762,81 +811,83 @@ msgid ""
 "Check this box if you are unsure of that journal entry and if you want to "
 "note it as 'to be reviewed' by an accounting expert."
 msgstr ""
+"Označite \"za provjeru\" kada niste sigurni da li je knjiženje ispravno i "
+"kada je potrebno ekspertno mišljenje."
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "October"
-msgstr ""
+msgstr "Oktobar"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:1068
 #, python-format
 msgid "Please activate the sequence of selected journal !"
-msgstr ""
+msgstr "Molimo aktivirajte sekvencu odabrnog dnevnika!"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "June"
-msgstr ""
+msgstr "Jun"
 
 #. module: account_voucher
 #: field:account.voucher,payment_rate_currency_id:0
 msgid "Payment Rate Currency"
-msgstr ""
+msgstr "Iznos kursa plaćanja"
 
 #. module: account_voucher
 #: field:account.voucher,paid:0
 msgid "Paid"
-msgstr ""
+msgstr "Plaćeno"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
 #: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
 msgid "Sales Receipts"
-msgstr ""
+msgstr "Prodajni računi"
 
 #. module: account_voucher
 #: field:account.voucher,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "Je pratilac"
 
 #. module: account_voucher
 #: field:account.voucher,analytic_id:0
 msgid "Write-Off Analytic Account"
-msgstr ""
+msgstr "Analitički konto otpisa iznosa"
 
 #. module: account_voucher
 #: field:account.voucher,date:0
 #: field:account.voucher.line,date_original:0
 #: field:sale.receipt.report,date:0
 msgid "Date"
-msgstr ""
+msgstr "Datum"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "November"
-msgstr ""
+msgstr "Novembar"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Napredni filteri..."
 
 #. module: account_voucher
 #: field:account.voucher,paid_amount_in_company_currency:0
 msgid "Paid Amount in Company Currency"
-msgstr ""
+msgstr "Plaćeni iznosu u valuti kompanije"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,amount_reconciled:0
 msgid "Amount reconciled"
-msgstr ""
+msgstr "Zatvoreni iznos"
 
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
 msgid "Pay Directly"
-msgstr ""
+msgstr "Plati direktno"
 
 #. module: account_voucher
 #: field:account.voucher.line,type:0
@@ -846,116 +897,116 @@ msgstr ""
 #. module: account_voucher
 #: field:account.voucher,pre_line:0
 msgid "Previous Payments ?"
-msgstr ""
+msgstr "Predhodna plaćanja ?"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:1208
 #, python-format
 msgid "The invoice you are willing to pay is not valid anymore."
-msgstr ""
+msgstr "Račun koji želite platiti više nije važeći."
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "January"
-msgstr ""
+msgstr "Januar"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_voucher_list
 #: model:ir.ui.menu,name:account_voucher.menu_encode_entries_by_voucher
 msgid "Journal Vouchers"
-msgstr ""
+msgstr "Dnevnik računa"
 
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Kompanije"
 
 #. module: account_voucher
 #: field:account.voucher,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Rezime"
 
 #. module: account_voucher
 #: field:account.voucher,active:0
 msgid "Active"
-msgstr ""
+msgstr "Aktivan"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:1074
 #, python-format
 msgid "Please define a sequence on the journal."
-msgstr ""
+msgstr "Molimo definišite sekvencu na dnevniku."
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
 #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
 msgid "Customer Payments"
-msgstr ""
+msgstr "Plaćanja kupaca"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
 #: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
 #: view:sale.receipt.report:0
 msgid "Sales Receipts Analysis"
-msgstr ""
+msgstr "Analiza računa prodaje"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "Group by Invoice Date"
-msgstr ""
+msgstr "Grupiši po datumu računa"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Post"
-msgstr ""
+msgstr "Knjiži"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Invoices and outstanding transactions"
-msgstr ""
+msgstr "Računi i otvorene stavke"
 
 #. module: account_voucher
 #: field:account.voucher,currency_help_label:0
 msgid "Helping Sentence"
-msgstr ""
+msgstr "Rečenica pomoći"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,price_total:0
 msgid "Total Without Tax"
-msgstr ""
+msgstr "Ukup. bez poreza"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Bill Date"
-msgstr ""
+msgstr "Datum računa"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Unreconcile"
-msgstr ""
+msgstr "Poništi zatvaranje"
 
 #. module: account_voucher
 #: view:account.voucher:0
 #: model:ir.model,name:account_voucher.model_account_voucher
 msgid "Accounting Voucher"
-msgstr ""
+msgstr "Račun knjigovodstva"
 
 #. module: account_voucher
 #: field:account.voucher,number:0
 msgid "Number"
-msgstr ""
+msgstr "Broj"
 
 #. module: account_voucher
 #: selection:account.voucher.line,type:0
 msgid "Credit"
-msgstr ""
+msgstr "Potražuje"
 
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_bank_statement
 msgid "Bank Statement"
-msgstr ""
+msgstr "Izvod banke"
 
 #. module: account_voucher
 #: view:account.bank.statement:0
@@ -965,76 +1016,76 @@ msgstr ""
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "September"
-msgstr ""
+msgstr "Septembar"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Sales Information"
-msgstr ""
+msgstr "Informacije o prodaji"
 
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher.line,voucher_id:0
 #: model:res.request.link,name:account_voucher.req_link_voucher
 msgid "Voucher"
-msgstr ""
+msgstr "Račun"
 
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_invoice
 msgid "Invoice"
-msgstr ""
+msgstr "Faktura"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Voucher Items"
-msgstr ""
+msgstr "Stavke računa"
 
 #. module: account_voucher
 #: view:account.statement.from.invoice.lines:0
 #: view:account.voucher:0
 msgid "Cancel"
-msgstr ""
+msgstr "Otkaži"
 
 #. module: account_voucher
 #: model:ir.actions.client,name:account_voucher.action_client_invoice_menu
 msgid "Open Invoicing Menu"
-msgstr ""
+msgstr "Otvori meni fakturisanja"
 
 #. module: account_voucher
 #: selection:account.voucher,state:0
 #: view:sale.receipt.report:0
 #: selection:sale.receipt.report,state:0
 msgid "Pro-forma"
-msgstr ""
+msgstr "Pro-forma"
 
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher,move_ids:0
 msgid "Journal Items"
-msgstr ""
+msgstr "Stavke dnevnika"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:558
 #, python-format
 msgid "Please define default credit/debit accounts on the journal \"%s\"."
-msgstr ""
+msgstr "Milimo definišite zadana potražna/dugovna konta na dnevniku \"%s\"."
 
 #. module: account_voucher
 #: selection:account.voucher,type:0
 #: selection:sale.receipt.report,type:0
 msgid "Purchase"
-msgstr ""
+msgstr "Nabavka"
 
 #. module: account_voucher
 #: view:account.invoice:0
 #: view:account.voucher:0
 msgid "Pay"
-msgstr ""
+msgstr "Plati"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Currency Options"
-msgstr ""
+msgstr "Opcije valute"
 
 #. module: account_voucher
 #: help:account.voucher,payment_option:0
@@ -1044,6 +1095,9 @@ msgid ""
 "either choose to keep open this difference on the partner's account, or "
 "reconcile it with the payment(s)"
 msgstr ""
+"Ovo polje Vam pomaže da odaberete šta želite uraditi sa razlikom između "
+"plaćenog iznosa i sume alociranih iznosa. Možete izabrati da sačuvate ovu "
+"razliku na kontu partnera, ili zatvoriti ga sa uplatom."
 
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_sale_receipt_report_all
@@ -1057,31 +1111,41 @@ msgid ""
 "          </p>\n"
 "        "
 msgstr ""
+"<p>\n"
+"            Iz ovog izvještaja možete imati pregled fakturisanog iznosa "
+"vašim\n"
+"            kupcima kao i kašnjenja u plaćanju. Alat pretrage se također "
+"može\n"
+"            koristiti za personalizaciju izvještaja fakturisanja, kako bi "
+"odgovarali\n"
+"            vašim potrebama analize.\n"
+"          </p>\n"
+"        "
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Posted Vouchers"
-msgstr ""
+msgstr "Knjiženi računi"
 
 #. module: account_voucher
 #: field:account.voucher,payment_rate:0
 msgid "Exchange Rate"
-msgstr ""
+msgstr "Kursa"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Method"
-msgstr ""
+msgstr "Način plaćanja"
 
 #. module: account_voucher
 #: field:account.voucher.line,name:0
 msgid "Description"
-msgstr ""
+msgstr "Opis"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "May"
-msgstr ""
+msgstr "Maj"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -1089,28 +1153,28 @@ msgstr ""
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,journal_id:0
 msgid "Journal"
-msgstr ""
+msgstr "Dnevnik"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Internal Notes"
-msgstr ""
+msgstr "Interne zabilješke"
 
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher,line_cr_ids:0
 msgid "Credits"
-msgstr ""
+msgstr "Potraživanja"
 
 #. module: account_voucher
 #: field:account.voucher.line,amount_original:0
 msgid "Original Amount"
-msgstr ""
+msgstr "Originalni iznos"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Purchase Receipt"
-msgstr ""
+msgstr "Računi nabavke"
 
 #. module: account_voucher
 #: help:account.voucher,payment_rate:0
@@ -1126,7 +1190,7 @@ msgstr ""
 #: field:sale.receipt.report,pay_now:0
 #: selection:sale.receipt.report,type:0
 msgid "Payment"
-msgstr ""
+msgstr "Plaćanje"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -1134,138 +1198,138 @@ msgstr ""
 #: view:sale.receipt.report:0
 #: selection:sale.receipt.report,state:0
 msgid "Posted"
-msgstr ""
+msgstr "Knjiženo"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Customer"
-msgstr ""
+msgstr "Kupac"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "February"
-msgstr ""
+msgstr "Februar"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Supplier Invoices and Outstanding transactions"
-msgstr ""
+msgstr "Ulazni računi i otvorene stavke"
 
 #. module: account_voucher
 #: field:account.voucher,reference:0
 msgid "Ref #"
-msgstr ""
+msgstr "Ref #"
 
 #. module: account_voucher
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.act_journal_voucher_open
 msgid "Voucher Entries"
-msgstr ""
+msgstr "Stavke računa"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,year:0
 msgid "Year"
-msgstr ""
+msgstr "Godina"
 
 #. module: account_voucher
 #: field:account.config.settings,income_currency_exchange_account_id:0
 #: field:res.company,income_currency_exchange_account_id:0
 msgid "Gain Exchange Rate Account"
-msgstr ""
+msgstr "Konto pozitivne kursne razlike"
 
 #. module: account_voucher
 #: selection:account.voucher,type:0
 #: selection:sale.receipt.report,type:0
 msgid "Sale"
-msgstr ""
+msgstr "Prodaja"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "April"
-msgstr ""
+msgstr "April"
 
 #. module: account_voucher
 #: help:account.voucher,tax_id:0
 msgid "Only for tax excluded from price"
-msgstr ""
+msgstr "Samo za porez koji nije u cijeni"
 
 #. module: account_voucher
 #: field:account.voucher,type:0
 msgid "Default Type"
-msgstr ""
+msgstr "Uobičajeni tip"
 
 #. module: account_voucher
 #: help:account.voucher,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Poruke i istorija komunikacije"
 
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_statement_from_invoice_lines
 msgid "Entries by Statement from Invoices"
-msgstr ""
+msgstr "Stavke po izvodu iz računa"
 
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher,amount:0
 msgid "Total"
-msgstr ""
+msgstr "Ukupno"
 
 #. module: account_voucher
 #: field:account.voucher,move_id:0
 msgid "Account Entry"
-msgstr ""
+msgstr "Stavka knjiženja"
 
 #. module: account_voucher
 #: constraint:account.bank.statement.line:0
 msgid ""
 "The amount of the voucher must be the same amount as the one on the "
 "statement line."
-msgstr ""
+msgstr "Iznos računa mora biti isti kao na stavci izvoda."
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:971
 #, python-format
 msgid "Cannot delete voucher(s) which are already opened or paid."
-msgstr ""
+msgstr "Otvorene ili plaćene račune nije moguće izbrisati."
 
 #. module: account_voucher
 #: help:account.voucher,date:0
 msgid "Effective date for accounting entries"
-msgstr ""
+msgstr "Efektivni datum za računovodstvene zapise"
 
 #. module: account_voucher
 #: model:mail.message.subtype,name:account_voucher.mt_voucher_state_change
 msgid "Status Change"
-msgstr ""
+msgstr "Promjena statusa"
 
 #. module: account_voucher
 #: selection:account.voucher,payment_option:0
 msgid "Keep Open"
-msgstr ""
+msgstr "Drži otvoreno"
 
 #. module: account_voucher
 #: field:account.voucher,line_ids:0
 #: view:account.voucher.line:0
 #: model:ir.model,name:account_voucher.model_account_voucher_line
 msgid "Voucher Lines"
-msgstr ""
+msgstr "Stavke računa"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,delay_to_pay:0
 msgid "Avg. Delay To Pay"
-msgstr ""
+msgstr "Pros. kašnjenje plaćanja"
 
 #. module: account_voucher
 #: field:account.voucher.line,untax_amount:0
 msgid "Untax Amount"
-msgstr ""
+msgstr "Osnovica"
 
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_sale_receipt_report
 msgid "Sales Receipt Statistics"
-msgstr ""
+msgstr "Statistika prodajnih računa"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -1274,19 +1338,19 @@ msgstr ""
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: account_voucher
 #: field:account.voucher.line,amount_unreconciled:0
 msgid "Open Balance"
-msgstr ""
+msgstr "Otvoreno saldo"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:1106
 #: code:addons/account_voucher/account_voucher.py:1110
 #, python-format
 msgid "Insufficient Configuration!"
-msgstr ""
+msgstr "Nedostatna konfiguracija!"
 
 #. module: account_voucher
 #: help:account.voucher,active:0
@@ -1295,3 +1359,6 @@ msgid ""
 "inactive, which allow to hide the customer/supplier payment while the bank "
 "statement isn't confirmed."
 msgstr ""
+"Po zadanom, zatvaranje računa na izvodima banke u pripremii su postavljeni "
+"kao neaktivni, što omogućava skrivanje uplata kupca/dobavljaču dok izvod iz "
+"banke ne bude potvrđen."
diff --git a/addons/analytic_user_function/i18n/ja.po b/addons/analytic_user_function/i18n/ja.po
index 02e722d8204..beaf6e4a228 100644
--- a/addons/analytic_user_function/i18n/ja.po
+++ b/addons/analytic_user_function/i18n/ja.po
@@ -8,67 +8,67 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2014-05-08 03:12+0000\n"
+"Last-Translator: Yoshi Tashiro <tashiro@roomsfor.hk>\n"
 "Language-Team: Japanese <ja@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: 2013-11-21 06:00+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-05-08 06:32+0000\n"
+"X-Generator: Launchpad (build 16996)\n"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_account_analytic_line
 msgid "Analytic Line"
-msgstr ""
+msgstr "分析行"
 
 #. module: analytic_user_function
 #: view:account.analytic.account:0
 msgid "Invoice Price Rate per User"
-msgstr ""
+msgstr "ユーザ毎の請求単価"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
 msgid "Service"
-msgstr ""
+msgstr "サービス"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
 msgid "Price per User"
-msgstr ""
+msgstr "ユーザ単価"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,price:0
 msgid "Price"
-msgstr ""
+msgstr "単価"
 
 #. module: analytic_user_function
 #: help:analytic.user.funct.grid,price:0
 msgid "Price per hour for this user."
-msgstr ""
+msgstr "当該ユーザの時間単価"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
-msgstr "分析アカウント"
+msgstr "分析勘定"
 
 #. module: analytic_user_function
 #: code:addons/analytic_user_function/analytic_user_function.py:106
 #: code:addons/analytic_user_function/analytic_user_function.py:135
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "エラー！"
 
 #. module: analytic_user_function
 #: view:analytic.user.funct.grid:0
 msgid "Invoicing Data"
-msgstr ""
+msgstr "請求データ"
 
 #. module: analytic_user_function
 #: field:account.analytic.account,user_product_ids:0
 msgid "Users/Products Rel."
-msgstr "ユーザ・商品の関係"
+msgstr "ユーザ/製品関係"
 
 #. module: analytic_user_function
 #: view:account.analytic.account:0
@@ -83,7 +83,7 @@ msgstr ""
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,uom_id:0
 msgid "Unit of Measure"
-msgstr ""
+msgstr "単位"
 
 #. module: analytic_user_function
 #: code:addons/analytic_user_function/analytic_user_function.py:107
diff --git a/addons/auth_signup/i18n/ja.po b/addons/auth_signup/i18n/ja.po
index fdf7fa20969..a926a153a83 100644
--- a/addons/auth_signup/i18n/ja.po
+++ b/addons/auth_signup/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2014-04-21 11:33+0000\n"
+"PO-Revision-Date: 2014-05-08 04:02+0000\n"
 "Last-Translator: Yoshi Tashiro <tashiro@roomsfor.hk>\n"
 "Language-Team: Japanese <ja@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: 2014-04-22 08:24+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-05-08 06:32+0000\n"
+"X-Generator: Launchpad (build 16996)\n"
 
 #. module: auth_signup
 #: view:res.users:0
@@ -32,7 +32,7 @@ msgstr ""
 #. module: auth_signup
 #: field:base.config.settings,auth_signup_uninvited:0
 msgid "Allow external users to sign up"
-msgstr ""
+msgstr "外部ユーザの登録を許可"
 
 #. module: auth_signup
 #. openerp-web
@@ -287,7 +287,7 @@ msgstr ""
 #. module: auth_signup
 #: field:base.config.settings,auth_signup_reset_password:0
 msgid "Enable password reset from Login page"
-msgstr ""
+msgstr "ログインページでのパスワードリセットを有効化"
 
 #. module: auth_signup
 #: model:email.template,subject:auth_signup.set_password_email
diff --git a/addons/hr_expense/i18n/ja.po b/addons/hr_expense/i18n/ja.po
index bc4c901bf7c..7aa7e9114b0 100644
--- a/addons/hr_expense/i18n/ja.po
+++ b/addons/hr_expense/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2014-03-08 05:28+0000\n"
+"PO-Revision-Date: 2014-05-08 04:11+0000\n"
 "Last-Translator: Yoshi Tashiro <tashiro@roomsfor.hk>\n"
 "Language-Team: Japanese <ja@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: 2014-03-09 06:02+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-05-08 06:32+0000\n"
+"X-Generator: Launchpad (build 16996)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -858,7 +858,7 @@ msgstr "拒否"
 #. module: hr_expense
 #: field:product.product,hr_expense_ok:0
 msgid "Can be Expensed"
-msgstr ""
+msgstr "経費入力可能"
 
 #. module: hr_expense
 #: model:mail.message.subtype,description:hr_expense.mt_expense_confirmed
diff --git a/addons/mail/i18n/lt.po b/addons/mail/i18n/lt.po
index 129e5b017e0..4c191844bc7 100644
--- a/addons/mail/i18n/lt.po
+++ b/addons/mail/i18n/lt.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2014-04-30 16:38+0000\n"
+"PO-Revision-Date: 2014-05-07 11:52+0000\n"
 "Last-Translator: Andrius Preimantas @ hbee <andrius.preimantas@gmail.com>\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: 2014-05-01 06:39+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-05-08 06:32+0000\n"
+"X-Generator: Launchpad (build 16996)\n"
 
 #. module: mail
 #: view:mail.followers:0
@@ -717,7 +717,7 @@ msgstr ""
 #: code:addons/mail/static/src/js/mail.js:978
 #, python-format
 msgid "read more"
-msgstr ""
+msgstr "rodyti daugiau"
 
 #. module: mail
 #: code:addons/mail/wizard/invite.py:40
@@ -816,7 +816,7 @@ msgstr ""
 #: code:addons/mail/static/src/js/mail.js:979
 #, python-format
 msgid "read less"
-msgstr ""
+msgstr "rodyti mažiau"
 
 #. module: mail
 #. openerp-web
diff --git a/addons/project/i18n/ja.po b/addons/project/i18n/ja.po
index 67813b1d18b..c3733618f8c 100644
--- a/addons/project/i18n/ja.po
+++ b/addons/project/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-11-24 08:50+0000\n"
-"Last-Translator: Yoshi Tashiro <yostashiro@gmail.com>\n"
+"PO-Revision-Date: 2014-05-08 03:50+0000\n"
+"Last-Translator: Yoshi Tashiro <tashiro@roomsfor.hk>\n"
 "Language-Team: Japanese <ja@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: 2013-11-25 06:00+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-05-08 06:32+0000\n"
+"X-Generator: Launchpad (build 16996)\n"
 
 #. module: project
 #: view:project.project:0
@@ -122,7 +122,7 @@ msgstr "分析勘定"
 #. module: project
 #: field:project.config.settings,group_time_work_estimation_tasks:0
 msgid "Manage time estimation on tasks"
-msgstr ""
+msgstr "タスクの所要時間見積を管理"
 
 #. module: project
 #: help:project.project,message_summary:0
@@ -287,7 +287,7 @@ msgstr ""
 #. module: project
 #: view:project.config.settings:0
 msgid "Support"
-msgstr ""
+msgstr "サポート"
 
 #. module: project
 #: view:project.project:0
@@ -614,7 +614,7 @@ msgstr "管理"
 #. module: project
 #: field:project.config.settings,group_tasks_work_on_tasks:0
 msgid "Log work activities on tasks"
-msgstr ""
+msgstr "タスクに作業活動を記録"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_analysis
@@ -1339,7 +1339,7 @@ msgstr "検証タスクのためのタイトル"
 #. module: project
 #: field:project.config.settings,time_unit:0
 msgid "Working time unit"
-msgstr ""
+msgstr "作業時間単位"
 
 #. module: project
 #: view:project.project:0
@@ -1422,7 +1422,7 @@ msgstr "プロジェクトマネジャによる計画時間数とタスクの合
 #. module: project
 #: view:project.config.settings:0
 msgid "Helpdesk & Support"
-msgstr ""
+msgstr "ヘルプデスクとサポート"
 
 #. module: project
 #: help:report.project.task.user,opening_days:0
@@ -1670,7 +1670,7 @@ msgstr ""
 #. module: project
 #: field:project.config.settings,module_project_mrp:0
 msgid "Generate tasks from sale orders"
-msgstr ""
+msgstr "受注よりタスク生成"
 
 #. module: project
 #: selection:project.task,priority:0
@@ -1945,7 +1945,7 @@ msgstr "かんばん状態"
 #. module: project
 #: field:project.config.settings,module_project_timesheet:0
 msgid "Record timesheet lines per tasks"
-msgstr ""
+msgstr "タスクに紐付けてタイムシート入力"
 
 #. module: project
 #: model:ir.model,name:project.model_report_project_task_user
diff --git a/addons/purchase/i18n/bs.po b/addons/purchase/i18n/bs.po
index 03bf9d875d2..fbb03850888 100644
--- a/addons/purchase/i18n/bs.po
+++ b/addons/purchase/i18n/bs.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-08-09 09:44+0000\n"
-"Last-Translator: Bosko Stojakovic <bluesoft83@gmail.com>\n"
+"PO-Revision-Date: 2014-05-07 18:44+0000\n"
+"Last-Translator: Boško Stojaković <bluesoft83@gmail.com>\n"
 "Language-Team: Bosnian <bs@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: 2013-11-21 06:30+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-05-08 06:32+0000\n"
+"X-Generator: Launchpad (build 16996)\n"
 
 #. module: purchase
 #: model:res.groups,name:purchase.group_analytic_accounting
@@ -148,6 +148,9 @@ msgid ""
 "Orders for procuring products,they will be scheduled that many days earlier "
 "to cope with unexpected supplier delays."
 msgstr ""
+"Granica grešaka za vreme vođenja dobavljača. Kada sistem generiše nabavne "
+"narudžbe na osnovu naručivanja proizvoda, oni će biti zakazani onoliko dana "
+"ranije da bi se pratile neočekivana kašnjenja dobavljača."
 
 #. module: purchase
 #: view:purchase.report:0
diff --git a/addons/sale/i18n/bs.po b/addons/sale/i18n/bs.po
index e923eb034de..982d01068af 100644
--- a/addons/sale/i18n/bs.po
+++ b/addons/sale/i18n/bs.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-10-26 12:14+0000\n"
-"Last-Translator: Bosko Stojakovic <bluesoft83@gmail.com>\n"
+"PO-Revision-Date: 2014-05-07 18:40+0000\n"
+"Last-Translator: Boško Stojaković <bluesoft83@gmail.com>\n"
 "Language-Team: Bosnian <bs@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: 2013-11-21 06:32+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-05-08 06:32+0000\n"
+"X-Generator: Launchpad (build 16996)\n"
 
 #. module: sale
 #: model:ir.model,name:sale.model_account_config_settings
@@ -418,6 +418,9 @@ msgid ""
 "                    or a fixed price (for advances) directly from the sales "
 "order form if you prefer."
 msgstr ""
+"Sve stavke u ovim narudžbama će biti fakturisane. Možete također da "
+"fakturišete procenat narudžbi ili fiksnu cijenu ( kao avans) direktno iz "
+"prodajnih narudžbi ukoliko tako želite."
 
 #. module: sale
 #: field:sale.order,message_summary:0
@@ -709,6 +712,8 @@ msgid ""
 "                and perform batch operations on journals.\n"
 "                This installs the module sale_journal."
 msgstr ""
+"Dozvoljava Vam kategorizaciju prodaja i isporuka između različitih dnevnika, "
+"i izvrašava grupne operacije nad dnevnicima. Ovo instalira modul sale_jurnal."
 
 #. module: sale
 #: field:sale.order,create_date:0
@@ -2338,4 +2343,4 @@ msgstr "Izuzeto"
 #: view:sale.report:0
 #: field:sale.report,year:0
 msgid "Year"
-msgstr ""
+msgstr "Godina"
diff --git a/addons/sale/i18n/ja.po b/addons/sale/i18n/ja.po
index 40ca7afb821..2dde973c417 100644
--- a/addons/sale/i18n/ja.po
+++ b/addons/sale/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2014-02-26 10:03+0000\n"
+"PO-Revision-Date: 2014-05-08 03:04+0000\n"
 "Last-Translator: Yoshi Tashiro <tashiro@roomsfor.hk>\n"
 "Language-Team: Japanese <ja@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: 2014-02-27 06:29+0000\n"
-"X-Generator: Launchpad (build 16935)\n"
+"X-Launchpad-Export-Date: 2014-05-08 06:32+0000\n"
+"X-Generator: Launchpad (build 16996)\n"
 
 #. module: sale
 #: model:ir.model,name:sale.model_account_config_settings
@@ -637,7 +637,7 @@ msgstr "受注明細"
 #. module: sale
 #: field:sale.config.settings,module_analytic_user_function:0
 msgid "One employee can have different roles per contract"
-msgstr ""
+msgstr "契約毎に従業員のロールを定義"
 
 #. module: sale
 #: view:sale.order:0

From c636fb9dd9be1a70ac9da63b218078c9cff6c704 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 8 May 2014 14:49:46 +0200
Subject: [PATCH 059/225] [FIX] hr_holidays: better display of leave counter
 (opw 605016)

The number of leave requests left is based on the employee_id key in the context, when displaying the status of an hr.holidays we don't have the information in the name_get of the hr.holidays.status.
The fallback on the number of employees is done with the uid but we can not rely on it as well as the name_get on m2o field is done with superuser_id.

bzr revid: mat@openerp.com-20140508124946-ttyr84iajg9q6l0y
---
 addons/hr_holidays/hr_holidays.py       | 5 +++++
 addons/hr_holidays/hr_holidays_view.xml | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index c01e4cee46d..07d4995998a 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -95,6 +95,11 @@ class hr_holidays_status(osv.osv):
     def name_get(self, cr, uid, ids, context=None):
         if not ids:
             return []
+
+        if not context.get('employee_id',False):
+            # leave counts is based on empoyee_id, would be inaccurate if not based on correct employee
+            return super(hr_holidays_status, self).name_get(cr, uid, ids, context=context)
+
         res = []
         for record in self.browse(cr, uid, ids, context=context):
             name = record.name
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 8277436b3e9..c39adcb3182 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -78,7 +78,7 @@
                             <field name="category_id" attrs="{'required':[('holiday_type','=','category')], 'invisible':[('holiday_type','=','employee')], 'readonly':[('state','!=','draft'), ('state','!=','confirm')]}"/>
                         </group>
                         <group>
-                            <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" width="130" string="Mode" groups="base.group_hr_user"/>
+                            <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" width="130" string="Mode" groups="base.group_hr_user" context="{'employee_id':employee_id}" />
                             <field name="employee_id" attrs="{'required':[('holiday_type','=','employee')],'invisible':[('holiday_type','=','category')]}" on_change="onchange_employee(employee_id)" groups="base.group_hr_user"/>
                             <field name="department_id" attrs="{'readonly':[('holiday_type','=','category')]}" groups="base.group_hr_user"/>
                         </group>
@@ -116,7 +116,7 @@
                             </div>
                         </group>
                         <group>
-                            <field name="holiday_type" on_change="onchange_type(holiday_type)"/>
+                            <field name="holiday_type" on_change="onchange_type(holiday_type)" context="{'employee_id':employee_id}" />
                             <field name="employee_id" attrs="{'required':[('holiday_type','=','employee')], 'invisible':[('holiday_type','=','category')]}"/>
                             <field name="category_id" attrs="{'required':[('holiday_type','=','category')], 'invisible':[('holiday_type','=','employee')]}"/>
                             <field name="department_id" attrs="{'invisible':[('holiday_type','=','category')]}"/>

From 2fe8beac2878f083eea1597e0bd97e1b376a0b24 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Thu, 8 May 2014 18:51:17 +0530
Subject: [PATCH 060/225] Missed while merging.

---
 addons/website_sale/controllers/main.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index 082b3c7dfd7..efa0256eb1b 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -260,7 +260,7 @@ class website_sale(http.Controller):
 
         # if transaction pending / done: redirect to confirmation
         tx = context.get('website_sale_transaction')
-        if tx and tx.state != 'shopping_cart':
+        if tx.state != 'shopping_cart':
             return request.redirect('/shop/payment/confirmation/%s' % order.id)
 
     def checkout_values(self, data=None):
@@ -537,7 +537,7 @@ class website_sale(http.Controller):
                 'sale_order_id': order.id,
             }, context=context)
             request.session['sale_transaction_id'] = tx_id
-        elif tx and tx.state == 'shopping_cart':  # button cliked but no more info -> rewrite on tx or create a new one ?
+        elif tx.state == 'shopping_cart':  # button cliked but no more info -> rewrite on tx or create a new one ?
             tx.write({
                 'acquirer_id': acquirer_id,
             })

From ec267fc210e00761a42129fd81eb9ba5985bb440 Mon Sep 17 00:00:00 2001
From: "Prashant Panchal (OpenERP)" <ppa@tinyerp.com>
Date: Thu, 8 May 2014 18:59:16 +0530
Subject: [PATCH 061/225] [IMP]add dicription

---
 addons/sale_team/__openerp__.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/sale_team/__openerp__.py b/addons/sale_team/__openerp__.py
index f141bdc76d0..b380df08313 100644
--- a/addons/sale_team/__openerp__.py
+++ b/addons/sale_team/__openerp__.py
@@ -24,7 +24,9 @@
     'author': 'OpenERP SA',
     'category': 'Sales Management',
     'summary': 'Sales Team',
-    'description': """ """,
+    'description': """
+Using this application you can manage Sales Team  with CRM and/or Sales 
+ """,
     'website': 'http://www.openerp.com',
     'depends': ['base','mail','web_kanban_sparkline',],
     'data': ['security/sale_team_security.xml',

From 8f43b749f40bb4923283407a24487474b567e1c9 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 8 May 2014 15:49:37 +0200
Subject: [PATCH 062/225] [FIX] product: when duplicating a product, keep the
 language in the context

At the time of the context_wo_lang patch (7.0 revision 6577), the orm did not keep the language in copy_data, this patch intended to be more consistent.
Since server revision 5146 7.0, the new behaviour is to use the translated version in copy_data. Removign this change will be more consistent with the orm.

The expected behaviour is now the following:
In user lang: translated product name + translated '(copy)'
In other lang: same as original product

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

bzr revid: mat@openerp.com-20140508134937-7cbja3vsv311z5j4
---
 addons/product/product.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/addons/product/product.py b/addons/product/product.py
index 5d6fb7a15bc..ce17af7f88f 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -728,11 +728,7 @@ class product_product(osv.osv):
         if not default:
             default = {}
 
-        # Craft our own `<name> (copy)` in en_US (self.copy_translation()
-        # will do the other languages).
-        context_wo_lang = context.copy()
-        context_wo_lang.pop('lang', None)
-        product = self.read(cr, uid, id, ['name'], context=context_wo_lang)
+        product = self.read(cr, uid, id, ['name'], context=context)
         default = default.copy()
         default.update(name=_("%s (copy)") % (product['name']))
 

From 1871c502e51ca654ec512913d9a281749059d4ab Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Fri, 9 May 2014 12:14:00 +0530
Subject: [PATCH 063/225] [REM]l10n_fr_hr_payroll: Remove Report declaration of
 rml from view.

---
 addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll_view.xml | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll_view.xml b/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll_view.xml
index 755c7d5451f..5e788c3635b 100644
--- a/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll_view.xml
+++ b/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll_view.xml
@@ -52,16 +52,5 @@
             </field>
         </record>
 
-
-        <report
-            auto="False"
-            header="False"
-            id="fiche_paye"
-            model="hr.payslip"
-            name="fiche.paye"
-            rml="l10n_fr_hr_payroll/report/fiche_paye.rml"
-            string="Fiche de Paie" />
-
-
     </data>
 </openerp>

From 0e08ceddb19b7e5ccde12a4b032c6833b8c57bdd Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Fri, 9 May 2014 13:08:26 +0530
Subject: [PATCH 064/225] [FIX]: review sale_team to add groups on section_id
 field

---
 addons/crm/crm_lead_view.xml   | 1 +
 addons/sale_team/sale_team.xml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index dc297492020..88d0349b939 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -2,6 +2,7 @@
 <openerp>
     <data>
 
+      <!-- TODO: Apply group for the sales team where you find section_id fields in any view
         <!--
             CRM CASE STAGE
         -->
diff --git a/addons/sale_team/sale_team.xml b/addons/sale_team/sale_team.xml
index 2512c20efb6..8155fdd8ce0 100644
--- a/addons/sale_team/sale_team.xml
+++ b/addons/sale_team/sale_team.xml
@@ -77,12 +77,12 @@
             <field name="model">crm.case.section</field>
             <field name="arch" type="xml">
                 <search string="Salesteams Search">
+                    <filter name="personal" string="My Salesteams" domain="['|', ('member_ids', '=', uid), ('user_id', '=', uid)]"/>
                     <field name="name"/>
                     <field name="parent_id"/>
                     <field name="user_id"/>
                     <field name="note"/>
                     <field name="code"/>
-                    <filter name="personal" string="My Salesteams" domain="['|', ('member_ids', '=', uid), ('user_id', '=', uid)]"/>
                     <group expand="0" string="Group By...">
                         <filter string="Team Leader" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Parent Sales Teams" domain="[]" context="{'group_by':'parent_id'}"/>

From 6c0389279a7275e07f4b6d8751b79dfb8086d3ba Mon Sep 17 00:00:00 2001
From: "Prashant Panchal (OpenERP)" <ppa@tinyerp.com>
Date: Fri, 9 May 2014 13:13:13 +0530
Subject: [PATCH 065/225] [IMP]add groups 'base.group_multi_salesteams' on
 sales team dependent module

---
 addons/crm/crm_lead_view.xml                                 | 2 +-
 addons/crm/report/crm_lead_report_view.xml                   | 2 +-
 addons/crm/report/crm_phonecall_report_view.xml              | 2 +-
 addons/crm_partner_assign/report/crm_lead_report_view.xml    | 4 ++--
 addons/crm_partner_assign/report/crm_partner_report_view.xml | 4 ++--
 addons/sale/report/sale_report_view.xml                      | 2 +-
 addons/sale_team/__openerp__.py                              | 1 +
 addons/sale_team/sale_team.xml                               | 2 +-
 8 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 88d0349b939..25af392d998 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -575,7 +575,7 @@
                     <separator/>
                     <group expand="0" string="Group By..." colspan="16">
                         <filter string="Salesperson" domain="[]" context="{'group_by':'user_id'}"/>
-                        <filter string="Team" domain="[]" context="{'group_by':'section_id'}"/>
+                        <filter string="Team" domain="[]" context="{'group_by':'section_id'}" groups="base.group_multi_salesteams"/>
                         <filter string="Stage" domain="[]" context="{'group_by':'stage_id'}"/>
                         <filter string="Customer" help="Partner" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Country" domain="[]" context="{'group_by':'country_id'}"/>
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index 1dda471c2f2..239579a70c2 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -81,7 +81,7 @@
                     </group>
                     <group expand="1" string="Group By...">
                         <filter string="Salesperson" domain="[]" context="{'group_by':'user_id'}" />
-                        <filter string="Sales Team" domain="[]" context="{'group_by':'section_id'}" />
+                        <filter string="Sales Team" domain="[]" context="{'group_by':'section_id'}" groups="base.group_multi_salesteams"/>
                         <filter string="Partner" context="{'group_by':'partner_id'}" />
                         <filter string="Country" context="{'group_by':'country_id'}" />
                         <filter string="Company" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index 32ae9704064..98f4a58d7c4 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -47,7 +47,7 @@
                     </group>
                     <group expand="1" string="Group By...">
                         <filter string="Salesperson" name="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
-                        <filter string="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}" />
+                        <filter string="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}" groups="base.group_multi_salesteams"/>
                         <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" />
                         <filter string="Priority"  icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
                         <filter string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}" />
diff --git a/addons/crm_partner_assign/report/crm_lead_report_view.xml b/addons/crm_partner_assign/report/crm_lead_report_view.xml
index 271c9b2016f..43997ac5609 100644
--- a/addons/crm_partner_assign/report/crm_lead_report_view.xml
+++ b/addons/crm_partner_assign/report/crm_lead_report_view.xml
@@ -27,9 +27,9 @@
                             domain="[]" context="{'group_by':'user_id'}" />
                         <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_assigned_id'}" />
                         <filter string="Country" icon="terp-go-home" context="{'group_by':'country_id'}" />
-                        <filter string="Section" icon="terp-personal+"
+                        <filter string="Sales Team" icon="terp-personal+"
                                 domain="[]"
-                                context="{'group_by':'section_id'}" />
+                                context="{'group_by':'section_id'}" groups="base.group_multi_salesteams"/>
                         <filter string="Grade" name="group_grade" icon="terp-stock_symbol-selection"
                                 domain="[]" context="{'group_by':'grade_id'}" />
                         <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
diff --git a/addons/crm_partner_assign/report/crm_partner_report_view.xml b/addons/crm_partner_assign/report/crm_partner_report_view.xml
index 02320219218..62e54260285 100644
--- a/addons/crm_partner_assign/report/crm_partner_report_view.xml
+++ b/addons/crm_partner_assign/report/crm_partner_report_view.xml
@@ -16,8 +16,8 @@
                         <filter string="Salesperson" name="user" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}" />
                         <filter string="Country" icon="terp-go-home" name="group_country" context="{'group_by':'country_id'}" />
-                        <filter string="Section" icon="terp-personal+"
-                            domain="[]" context="{'group_by':'section_id'}" />
+                        <filter string="Sales Team" icon="terp-personal+"
+                            domain="[]" context="{'group_by':'section_id'}" groups="base.group_multi_salesteams"/>
                         <filter string="Activation" name="group_activation" icon="terp-stock_symbol-selection"
                             domain="[]" context="{'group_by':'activation'}" />
                         <filter string="Grade" name="group_grade" icon="terp-stock_symbol-selection"
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index b8ce36efc2b..f71ff2933c7 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -34,7 +34,7 @@
                 </group>
                 <group expand="1" string="Group By...">
                     <filter string="Salesperson" icon="terp-personal" name="User" context="{'group_by':'user_id'}"/>
-                    <filter string="Sales Team" context="{'group_by':'section_id'}"/>
+                    <filter string="Sales Team" context="{'group_by':'section_id'}" groups="base.group_multi_salesteams"/>
                     <filter string="Partner" icon="terp-partner"  name="Customer" context="{'group_by':'partner_id'}"/>
                     <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id','set_visible':True}"/>
                     <filter string="Reference Unit of Measure" icon="terp-mrp" context="{'group_by':'product_uom'}"/>
diff --git a/addons/sale_team/__openerp__.py b/addons/sale_team/__openerp__.py
index b380df08313..ebca1e7100e 100644
--- a/addons/sale_team/__openerp__.py
+++ b/addons/sale_team/__openerp__.py
@@ -26,6 +26,7 @@
     'summary': 'Sales Team',
     'description': """
 Using this application you can manage Sales Team  with CRM and/or Sales 
+=======================================================================
  """,
     'website': 'http://www.openerp.com',
     'depends': ['base','mail','web_kanban_sparkline',],
diff --git a/addons/sale_team/sale_team.xml b/addons/sale_team/sale_team.xml
index 8155fdd8ce0..56d709efce5 100644
--- a/addons/sale_team/sale_team.xml
+++ b/addons/sale_team/sale_team.xml
@@ -195,6 +195,6 @@
                 </p>
             </field>
         </record>
-    <menuitem id="sale_team.menu_sale_team_act" action="crm_case_section_salesteams_act" sequence="1" parent="base.menu_sales"/>
+    <menuitem id="sale_team.menu_sale_team_act" action="crm_case_section_salesteams_act" sequence="1" parent="base.menu_sales" groups="base.group_multi_salesteams"/>
     </data>
 </openerp>

From 146051db29cee16b5e93f74d4080bdc1831fc7d5 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Fri, 9 May 2014 13:14:38 +0530
Subject: [PATCH 066/225] [FIX]: review, add default to get the current state

---
 addons/sale_team/sale_team_config.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/addons/sale_team/sale_team_config.py b/addons/sale_team/sale_team_config.py
index c6adeb73a55..0c36ac31084 100644
--- a/addons/sale_team/sale_team_config.py
+++ b/addons/sale_team/sale_team_config.py
@@ -58,3 +58,12 @@ class sale_team_configuration(osv.TransientModel):
             implied_group='base.group_multi_salesteams',
             help="""Allows you to use Sales Teams to manage your leads and opportunities."""),
     }
+
+    def _get_group_multi_salesteams(self, cr, uid, ids, context=None):
+        pass
+        # Todo: return the current state for the group_multi_salesteams field
+
+    _defaults = {
+        'group_multi_salesteams': _get_group_multi_salesteams
+    }
+

From 3a0b63942e685cc1908d968064728da3e30be350 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 9 May 2014 11:33:04 +0200
Subject: [PATCH 067/225] [FIX] analytic: should not set mutable objects in
 method declaration (python gotcha)

bzr revid: mat@openerp.com-20140509093304-ao8ttky1trgz22ao
---
 addons/analytic/analytic.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index 7b5cc275377..5a77b86f14f 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -219,7 +219,7 @@ class account_analytic_account(osv.osv):
         res['value']['description'] = template.description
         return res
 
-    def on_change_partner_id(self, cr, uid, ids,partner_id, name, context={}):
+    def on_change_partner_id(self, cr, uid, ids,partner_id, name, context=None):
         res={}
         if partner_id:
             partner = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)

From ca2bee0865c086dbbc4b1a2effa46fce382a98a5 Mon Sep 17 00:00:00 2001
From: "Prashant Panchal (OpenERP)" <ppa@tinyerp.com>
Date: Fri, 9 May 2014 16:16:07 +0530
Subject: [PATCH 068/225] [IMP]add groups 'base.group_multi_salesteams'

---
 addons/crm/crm_lead_view.xml                              | 5 +----
 addons/crm/wizard/crm_lead_to_opportunity_view.xml        | 2 +-
 addons/crm/wizard/crm_merge_opportunities_view.xml        | 2 +-
 addons/crm_claim/report/crm_claim_report_view.xml         | 2 +-
 addons/crm_partner_assign/crm_portal_view.xml             | 4 ++--
 addons/project_issue/report/project_issue_report_view.xml | 2 +-
 addons/sale/sale_view.xml                                 | 2 +-
 7 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 25af392d998..5a7aac6e569 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -1,12 +1,9 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-
       <!-- TODO: Apply group for the sales team where you find section_id fields in any view
-        <!--
             CRM CASE STAGE
         -->
-
         <!-- Stage Search view -->
         <record id="crm_lead_stage_search" model="ir.ui.view">
             <field name="name">Stage - Search</field>
@@ -570,7 +567,7 @@
                             help="Opportunities that are assigned to me"/>
                     <filter string="My Team(s)"
                             domain="[('section_id.member_ids', 'in', [uid])]" context="{'invisible_section': False}"
-                            help="Opportunities that are assigned to any sales teams I am member of"/>
+                            help="Opportunities that are assigned to any sales teams I am member of" groups="base.group_multi_salesteams"/>
                     <filter string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <separator/>
                     <group expand="0" string="Group By..." colspan="16">
diff --git a/addons/crm/wizard/crm_lead_to_opportunity_view.xml b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
index 0f8f676d92d..58bbcf4d934 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
@@ -12,7 +12,7 @@
                     </group>
                     <group string="Assign opportunities to">
                         <field name="user_id" class="oe_inline" on_change="on_change_user(user_id, section_id, context)"/>
-                        <field name="section_id" class="oe_inline"/>
+                        <field name="section_id" class="oe_inline" groups="base.group_multi_salesteams"/>
                     </group>
                     <group string="Opportunities">
                         <field name="opportunity_ids" attrs="{'invisible': [('name', '!=', 'merge')]}" nolabel="1">
diff --git a/addons/crm/wizard/crm_merge_opportunities_view.xml b/addons/crm/wizard/crm_merge_opportunities_view.xml
index f88a6fe6f17..92007d52e42 100644
--- a/addons/crm/wizard/crm_merge_opportunities_view.xml
+++ b/addons/crm/wizard/crm_merge_opportunities_view.xml
@@ -10,7 +10,7 @@
                 <form string="Merge Leads/Opportunities" version="7.0">
                     <group string="Assign opportunities to">
                         <field name="user_id" class="oe_inline" on_change="on_change_user(user_id, section_id, context)"/>
-                        <field name="section_id" class="oe_inline"/>
+                        <field name="section_id" class="oe_inline" groups="base.group_multi_salesteams"/>
                     </group>
                     <group string="Select Leads/Opportunities">
                         <field name="opportunity_ids" nolabel="1">
diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
index 710603af10a..2068ed8ea27 100644
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -46,7 +46,7 @@
                     </group>
                     <group  expand="1" string="Group By...">
                         <filter string="Salesperson" name="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
-                        <filter string="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}"  groups="base.group_multi_salesteams"/>
+                        <filter string="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}" groups="base.group_multi_salesteams"/>
                         <filter string="Partner" name="partner" icon="terp-partner" 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'}" />
diff --git a/addons/crm_partner_assign/crm_portal_view.xml b/addons/crm_partner_assign/crm_portal_view.xml
index dab831dcb4b..1ad0659d217 100644
--- a/addons/crm_partner_assign/crm_portal_view.xml
+++ b/addons/crm_partner_assign/crm_portal_view.xml
@@ -18,7 +18,7 @@
               <field name="type_id" invisible="1"/>
               <field name="referred" invisible="1"/>
               <field name="channel_id" invisible="1"/>
-              <field name="section_id" invisible="context.get('invisible_section', True)" />
+              <field name="section_id" invisible="context.get('invisible_section', True)" groups="base.group_multi_salesteams"/>
 
               <button string="I'm interested" name="case_interested" icon="gtk-index" type="object"/>
               <button string="I'm not interested" name="case_disinterested" icon="gtk-close" type="object"/>
@@ -84,7 +84,7 @@
                    <field name="type_id" invisible="1"/>
                    <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" groups="base.group_multi_salesteams" invisible="context.get('invisible_section', True)" />
                    <field name="priority" invisible="1"/>
                </tree>
             </field>
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index ad6d6688d1e..b0e24d7db54 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -31,7 +31,7 @@
                     <group  expand="1" string="Group By...">
                         <filter string="Assigned to" name="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
                         <filter string="Contact" icon="terp-partner" context="{'group_by':'partner_id'}" />
-                        <filter string="Sale Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}" />
+                        <filter string="Sale Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}" groups="base.group_multi_salesteams"/>
                         <filter string="Project"  name="project" icon="terp-folder-violet" context="{'group_by':'project_id'}" />
                         <filter string="Task"  icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'task_id'}"/>
                         <filter string="Version"  icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'version_id'}"/>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index a1da1b1b630..6d263f4fdab 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -547,7 +547,7 @@
             <field name="inherit_id" ref="account.view_account_invoice_filter"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='user_id']" position="after">
-                    <field name="section_id"/>
+                    <field name="section_id" groups="base.group_multi_salesteams"/>
                 </xpath>
                 <xpath expr="//group/filter[@string='Due Month']" position="after">
                     <filter string="Sales Team" domain="[]" context="{'group_by':'section_id'}" groups="base.group_multi_salesteams"/>

From 3691ee0ca7fef54715aed545bbeacb12adec627e Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 9 May 2014 15:18:39 +0200
Subject: [PATCH 069/225] [FIX] gamification: avoid challenge to be initialised
 at the target limit (e.g. set your company data goal has a target of 0) and
 make sure we will compute the goal at least once

bzr revid: mat@openerp.com-20140509131839-lm5zt696sif1krvx
---
 addons/gamification/data/goal_base.xml  | 2 +-
 addons/gamification/models/challenge.py | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/addons/gamification/data/goal_base.xml b/addons/gamification/data/goal_base.xml
index 1c18a5a70e5..93ca8afa98a 100644
--- a/addons/gamification/data/goal_base.xml
+++ b/addons/gamification/data/goal_base.xml
@@ -110,7 +110,7 @@
             <field name="computation_mode">count</field>
             <field name="display_mode">boolean</field>
             <field name="model_id" eval="ref('base.model_res_company')" />
-            <field name="domain">[('user_ids', 'in', [user.id]), ('name', '=', 'Your Company')]</field>
+            <field name="domain">[('user_ids', 'in', [user.id]), ('name', '=', 'YourCompany')]</field>
             <field name="condition">lower</field>
             <field name="action_id" eval="ref('base.action_res_company_form')" />
             <field name="res_id_field">user.company_id.id</field>
diff --git a/addons/gamification/models/challenge.py b/addons/gamification/models/challenge.py
index b5322321689..8ed3890ce69 100644
--- a/addons/gamification/models/challenge.py
+++ b/addons/gamification/models/challenge.py
@@ -422,6 +422,12 @@ class gamification_challenge(osv.Model):
                     if end_date:
                         values['end_date'] = end_date
 
+                    # the goal is initialised over the limit to make sure we will compute it at least once
+                    if line.condition == 'higher':
+                        values['current'] = line.target_goal - 1
+                    else:
+                        values['current'] = line.target_goal + 1
+
                     if challenge.remind_update_delay:
                         values['remind_update_delay'] = challenge.remind_update_delay
 

From 320abf6be9cc16921e344d2e244f559557772c89 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Fri, 9 May 2014 19:08:36 +0530
Subject: [PATCH 070/225] [FIX]: Remove rml tag removeParentNode. improve
 condition.

---
 .../views/report_l10nfrfichepaye.xml          | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/addons/l10n_fr_hr_payroll/views/report_l10nfrfichepaye.xml b/addons/l10n_fr_hr_payroll/views/report_l10nfrfichepaye.xml
index 8aa0d4e125d..6ee98168614 100644
--- a/addons/l10n_fr_hr_payroll/views/report_l10nfrfichepaye.xml
+++ b/addons/l10n_fr_hr_payroll/views/report_l10nfrfichepaye.xml
@@ -24,8 +24,8 @@
                                 </tr>
                                 <tr>
                                     <td>
-                                        <span t-esc="o.employee_id.name or '_'"/>
-                                        <span t-esc="display_address(o.employee_id.address_home_id) or '_' "/>
+                                        <div t-field="o.employee_id.address_home_id"
+                                          t-field-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": true}'/>
                                     </td>
                                 </tr>
                             </table>
@@ -79,19 +79,20 @@
                                     <span t-esc="p.name or ''"/>
                                 </td>
                                 <td>
-                                    <span t-esc="((p.amount_select== 'percentage') or removeParentNode('span')) and ''"/>
-                                    <span t-esc="p.amount or ''"/>
-                                    <span t-esc="((p.amount_select== 'fix') or removeParentNode('span')) and ''"/>
-                                    <span t-esc="p.quantity or ''"/>
-                                    <span t-esc="((p.amount_select&lt;&gt; 'fix' and p.amount_select&lt;&gt; 'percentage') or removeParentNode('span')) and ''"/>
+                                    <t t-if="p.amount_select== 'percentage'">
+                                        <span t-esc="p.amount or ''"/>
+                                    </t> 
+                                    <t t-if="p.amount_select== 'fix'">
+                                        <span t-esc="p.quantity or ''"/>
+                                    </t>
                                 </td>
                                 <td>
-                                    <span t-esc="((p.amount_select == 'percentage') or removeParentNode('span')) and ''"/>
-                                    <span t-esc="p.rate or ''"/>
-                                    <span t-esc="((p.amount_select &lt;&gt; 'percentage') or removeParentNode('span')) and ''"/>
+                                    <t t-if="p.amount_select == 'percentage'">
+                                        <span t-esc="p.rate or ''"/>
+                                    </t>
                                 </td>
                                 <td>
-                                    <span t-esc="p.total or '"/>
+                                    <span t-esc="p.total or ''"/>
                                 </td>
                                 <td>
                                     <span t-esc="get_employer_line(o, p) and get_employer_line(o, p).rate or ''"/>

From 1397b7aa34972592da3c2186a10f59f1cf6483e7 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Sun, 11 May 2014 07:08:41 +0000
Subject: [PATCH 071/225] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20140510075539-empsrh7k5l6q44ln
bzr revid: launchpad_translations_on_behalf_of_openerp-20140510075505-nu0zmfg57i2352lz
bzr revid: launchpad_translations_on_behalf_of_openerp-20140511070820-8xp1e2jxonp4i750
bzr revid: launchpad_translations_on_behalf_of_openerp-20140503064840-v6n2wyrm1l162bh4
bzr revid: launchpad_translations_on_behalf_of_openerp-20140504062728-9tmsk2r01vvs3avi
bzr revid: launchpad_translations_on_behalf_of_openerp-20140506072722-8xpshoxb4um6ef30
bzr revid: launchpad_translations_on_behalf_of_openerp-20140511070841-lboiasc73m8h3fb2
---
 addons/analytic_user_function/i18n/ja.po |   2 +-
 addons/auth_signup/i18n/ja.po            |   2 +-
 addons/hr_evaluation/i18n/de.po          |  11 +-
 addons/hr_expense/i18n/ja.po             |   2 +-
 addons/mail/i18n/lt.po                   |   5 +-
 addons/project/i18n/ja.po                |   2 +-
 addons/sale/i18n/ja.po                   |   2 +-
 addons/sale_stock/i18n/nl.po             |  10 +-
 addons/stock/i18n/nl.po                  | 242 ++++------
 addons/survey/i18n/de.po                 |  12 +-
 addons/web/i18n/ar.po                    |   2 +-
 addons/web/i18n/bg.po                    |   2 +-
 addons/web/i18n/bn.po                    |   2 +-
 addons/web/i18n/bs.po                    |   2 +-
 addons/web/i18n/ca.po                    |   2 +-
 addons/web/i18n/cs.po                    |   2 +-
 addons/web/i18n/da.po                    |   2 +-
 addons/web/i18n/de.po                    |   2 +-
 addons/web/i18n/en_AU.po                 |   2 +-
 addons/web/i18n/en_GB.po                 |   2 +-
 addons/web/i18n/es.po                    |   2 +-
 addons/web/i18n/es_CL.po                 |   2 +-
 addons/web/i18n/es_CR.po                 |   2 +-
 addons/web/i18n/es_DO.po                 |   2 +-
 addons/web/i18n/es_EC.po                 |   2 +-
 addons/web/i18n/es_MX.po                 |   2 +-
 addons/web/i18n/es_PE.po                 |   2 +-
 addons/web/i18n/et.po                    |   2 +-
 addons/web/i18n/eu.po                    |   2 +-
 addons/web/i18n/fa.po                    |   2 +-
 addons/web/i18n/fi.po                    |   2 +-
 addons/web/i18n/fr.po                    |   2 +-
 addons/web/i18n/fr_CA.po                 |   2 +-
 addons/web/i18n/gl.po                    |   2 +-
 addons/web/i18n/gu.po                    |   2 +-
 addons/web/i18n/he.po                    |   2 +-
 addons/web/i18n/hi.po                    |   2 +-
 addons/web/i18n/hr.po                    |   2 +-
 addons/web/i18n/hu.po                    |   2 +-
 addons/web/i18n/id.po                    |   2 +-
 addons/web/i18n/it.po                    |   2 +-
 addons/web/i18n/ja.po                    |   2 +-
 addons/web/i18n/ka.po                    |   2 +-
 addons/web/i18n/ko.po                    | 121 ++---
 addons/web/i18n/lo.po                    |   2 +-
 addons/web/i18n/lt.po                    |   2 +-
 addons/web/i18n/lv.po                    |   2 +-
 addons/web/i18n/mk.po                    |   2 +-
 addons/web/i18n/mn.po                    |   2 +-
 addons/web/i18n/nb.po                    | 292 ++++++------
 addons/web/i18n/nl.po                    |   2 +-
 addons/web/i18n/nl_BE.po                 |   2 +-
 addons/web/i18n/pl.po                    |   2 +-
 addons/web/i18n/pt.po                    |   2 +-
 addons/web/i18n/pt_BR.po                 |   2 +-
 addons/web/i18n/ro.po                    |   2 +-
 addons/web/i18n/ru.po                    |   2 +-
 addons/web/i18n/sk.po                    |   2 +-
 addons/web/i18n/sl.po                    |   2 +-
 addons/web/i18n/sq.po                    |   2 +-
 addons/web/i18n/sr@latin.po              |   2 +-
 addons/web/i18n/sv.po                    |   2 +-
 addons/web/i18n/th.po                    |   8 +-
 addons/web/i18n/tr.po                    |   2 +-
 addons/web/i18n/uk.po                    |   2 +-
 addons/web/i18n/vi.po                    |   2 +-
 addons/web/i18n/zh_CN.po                 |   2 +-
 addons/web/i18n/zh_TW.po                 |   2 +-
 addons/web_api/i18n/cs.po                |   2 +-
 addons/web_api/i18n/es_CR.po             |   2 +-
 addons/web_calendar/i18n/ar.po           |   2 +-
 addons/web_calendar/i18n/bg.po           |   2 +-
 addons/web_calendar/i18n/bn.po           |   2 +-
 addons/web_calendar/i18n/bs.po           |   2 +-
 addons/web_calendar/i18n/ca.po           |   2 +-
 addons/web_calendar/i18n/cs.po           |   2 +-
 addons/web_calendar/i18n/da.po           |   2 +-
 addons/web_calendar/i18n/de.po           |   2 +-
 addons/web_calendar/i18n/en_AU.po        |   2 +-
 addons/web_calendar/i18n/en_GB.po        |   2 +-
 addons/web_calendar/i18n/es.po           |   2 +-
 addons/web_calendar/i18n/es_CL.po        |   2 +-
 addons/web_calendar/i18n/es_CR.po        |   2 +-
 addons/web_calendar/i18n/es_DO.po        |   2 +-
 addons/web_calendar/i18n/es_EC.po        |   2 +-
 addons/web_calendar/i18n/es_MX.po        |   2 +-
 addons/web_calendar/i18n/es_PE.po        |   2 +-
 addons/web_calendar/i18n/et.po           |   2 +-
 addons/web_calendar/i18n/eu.po           |   2 +-
 addons/web_calendar/i18n/fa.po           |   2 +-
 addons/web_calendar/i18n/fi.po           |   2 +-
 addons/web_calendar/i18n/fr.po           |   2 +-
 addons/web_calendar/i18n/fr_CA.po        |   2 +-
 addons/web_calendar/i18n/gl.po           |   2 +-
 addons/web_calendar/i18n/gu.po           |   2 +-
 addons/web_calendar/i18n/hr.po           |   2 +-
 addons/web_calendar/i18n/hu.po           |   2 +-
 addons/web_calendar/i18n/id.po           |   2 +-
 addons/web_calendar/i18n/it.po           |   2 +-
 addons/web_calendar/i18n/ja.po           |   2 +-
 addons/web_calendar/i18n/ka.po           |   2 +-
 addons/web_calendar/i18n/ko.po           |   2 +-
 addons/web_calendar/i18n/lt.po           |   2 +-
 addons/web_calendar/i18n/mk.po           |   2 +-
 addons/web_calendar/i18n/mn.po           |   2 +-
 addons/web_calendar/i18n/nb.po           |  18 +-
 addons/web_calendar/i18n/nl.po           |   2 +-
 addons/web_calendar/i18n/nl_BE.po        |   2 +-
 addons/web_calendar/i18n/pl.po           |   2 +-
 addons/web_calendar/i18n/pt.po           |   2 +-
 addons/web_calendar/i18n/pt_BR.po        |   2 +-
 addons/web_calendar/i18n/ro.po           |   2 +-
 addons/web_calendar/i18n/ru.po           |   2 +-
 addons/web_calendar/i18n/sk.po           |   2 +-
 addons/web_calendar/i18n/sl.po           |   2 +-
 addons/web_calendar/i18n/sq.po           |   2 +-
 addons/web_calendar/i18n/sr@latin.po     |   2 +-
 addons/web_calendar/i18n/sv.po           |   2 +-
 addons/web_calendar/i18n/th.po           |   2 +-
 addons/web_calendar/i18n/tr.po           |   2 +-
 addons/web_calendar/i18n/uk.po           |   2 +-
 addons/web_calendar/i18n/zh_CN.po        |   2 +-
 addons/web_calendar/i18n/zh_TW.po        |   2 +-
 addons/web_diagram/i18n/ar.po            |   2 +-
 addons/web_diagram/i18n/bg.po            |   2 +-
 addons/web_diagram/i18n/bn.po            |   2 +-
 addons/web_diagram/i18n/bs.po            |   2 +-
 addons/web_diagram/i18n/ca.po            |   2 +-
 addons/web_diagram/i18n/cs.po            |   2 +-
 addons/web_diagram/i18n/da.po            |   2 +-
 addons/web_diagram/i18n/de.po            |   2 +-
 addons/web_diagram/i18n/en_AU.po         |   2 +-
 addons/web_diagram/i18n/en_GB.po         |   2 +-
 addons/web_diagram/i18n/es.po            |   2 +-
 addons/web_diagram/i18n/es_CL.po         |   2 +-
 addons/web_diagram/i18n/es_CR.po         |   2 +-
 addons/web_diagram/i18n/es_DO.po         |   2 +-
 addons/web_diagram/i18n/es_EC.po         |   2 +-
 addons/web_diagram/i18n/es_MX.po         |   2 +-
 addons/web_diagram/i18n/es_PE.po         |   2 +-
 addons/web_diagram/i18n/et.po            |   2 +-
 addons/web_diagram/i18n/fa.po            |   2 +-
 addons/web_diagram/i18n/fi.po            |   2 +-
 addons/web_diagram/i18n/fr.po            |   2 +-
 addons/web_diagram/i18n/gl.po            |   2 +-
 addons/web_diagram/i18n/gu.po            |   2 +-
 addons/web_diagram/i18n/hr.po            |   2 +-
 addons/web_diagram/i18n/hu.po            |   2 +-
 addons/web_diagram/i18n/id.po            |   2 +-
 addons/web_diagram/i18n/it.po            |   2 +-
 addons/web_diagram/i18n/ja.po            |   2 +-
 addons/web_diagram/i18n/ka.po            |   2 +-
 addons/web_diagram/i18n/ko.po            |   2 +-
 addons/web_diagram/i18n/lt.po            |   2 +-
 addons/web_diagram/i18n/mk.po            |   2 +-
 addons/web_diagram/i18n/mn.po            |   2 +-
 addons/web_diagram/i18n/nb.po            |  15 +-
 addons/web_diagram/i18n/nl.po            |   2 +-
 addons/web_diagram/i18n/nl_BE.po         |   2 +-
 addons/web_diagram/i18n/pl.po            |   2 +-
 addons/web_diagram/i18n/pt.po            |   2 +-
 addons/web_diagram/i18n/pt_BR.po         |   2 +-
 addons/web_diagram/i18n/ro.po            |   2 +-
 addons/web_diagram/i18n/ru.po            |   2 +-
 addons/web_diagram/i18n/sl.po            |   2 +-
 addons/web_diagram/i18n/sq.po            |   2 +-
 addons/web_diagram/i18n/sr@latin.po      |   2 +-
 addons/web_diagram/i18n/sv.po            |   2 +-
 addons/web_diagram/i18n/th.po            |   2 +-
 addons/web_diagram/i18n/tr.po            |   2 +-
 addons/web_diagram/i18n/zh_CN.po         |   2 +-
 addons/web_diagram/i18n/zh_TW.po         |   2 +-
 addons/web_gantt/i18n/ar.po              |   2 +-
 addons/web_gantt/i18n/bg.po              |   2 +-
 addons/web_gantt/i18n/bn.po              |   2 +-
 addons/web_gantt/i18n/bs.po              |   2 +-
 addons/web_gantt/i18n/ca.po              |   2 +-
 addons/web_gantt/i18n/cs.po              |   2 +-
 addons/web_gantt/i18n/da.po              |   2 +-
 addons/web_gantt/i18n/de.po              |   2 +-
 addons/web_gantt/i18n/en_AU.po           |   2 +-
 addons/web_gantt/i18n/en_GB.po           |   2 +-
 addons/web_gantt/i18n/es.po              |   2 +-
 addons/web_gantt/i18n/es_CL.po           |   2 +-
 addons/web_gantt/i18n/es_CR.po           |   2 +-
 addons/web_gantt/i18n/es_DO.po           |   2 +-
 addons/web_gantt/i18n/es_EC.po           |   2 +-
 addons/web_gantt/i18n/es_MX.po           |   2 +-
 addons/web_gantt/i18n/et.po              |   2 +-
 addons/web_gantt/i18n/fa.po              |   2 +-
 addons/web_gantt/i18n/fi.po              |   2 +-
 addons/web_gantt/i18n/fr.po              |   2 +-
 addons/web_gantt/i18n/gl.po              |   2 +-
 addons/web_gantt/i18n/gu.po              |   2 +-
 addons/web_gantt/i18n/he.po              |   2 +-
 addons/web_gantt/i18n/hr.po              |   2 +-
 addons/web_gantt/i18n/hu.po              |   2 +-
 addons/web_gantt/i18n/it.po              |   2 +-
 addons/web_gantt/i18n/ja.po              |   2 +-
 addons/web_gantt/i18n/ka.po              |   2 +-
 addons/web_gantt/i18n/ko.po              |   2 +-
 addons/web_gantt/i18n/lo.po              |   2 +-
 addons/web_gantt/i18n/lt.po              |   2 +-
 addons/web_gantt/i18n/mk.po              |   2 +-
 addons/web_gantt/i18n/mn.po              |   2 +-
 addons/web_gantt/i18n/nb.po              |   2 +-
 addons/web_gantt/i18n/nl.po              |   2 +-
 addons/web_gantt/i18n/nl_BE.po           |   2 +-
 addons/web_gantt/i18n/pl.po              |   2 +-
 addons/web_gantt/i18n/pt.po              |   2 +-
 addons/web_gantt/i18n/pt_BR.po           |   2 +-
 addons/web_gantt/i18n/ro.po              |   2 +-
 addons/web_gantt/i18n/ru.po              |   2 +-
 addons/web_gantt/i18n/sl.po              |   2 +-
 addons/web_gantt/i18n/sq.po              |   2 +-
 addons/web_gantt/i18n/sr@latin.po        |   2 +-
 addons/web_gantt/i18n/sv.po              |   2 +-
 addons/web_gantt/i18n/th.po              |   2 +-
 addons/web_gantt/i18n/tr.po              |   2 +-
 addons/web_gantt/i18n/zh_CN.po           |   2 +-
 addons/web_graph/i18n/ar.po              |   2 +-
 addons/web_graph/i18n/bg.po              |   2 +-
 addons/web_graph/i18n/bn.po              |   2 +-
 addons/web_graph/i18n/bs.po              |   2 +-
 addons/web_graph/i18n/ca.po              |   2 +-
 addons/web_graph/i18n/cs.po              |   2 +-
 addons/web_graph/i18n/da.po              |   2 +-
 addons/web_graph/i18n/de.po              |   2 +-
 addons/web_graph/i18n/en_AU.po           |   2 +-
 addons/web_graph/i18n/en_GB.po           |   2 +-
 addons/web_graph/i18n/es.po              |   2 +-
 addons/web_graph/i18n/es_CL.po           |   2 +-
 addons/web_graph/i18n/es_CR.po           |   2 +-
 addons/web_graph/i18n/es_DO.po           |   2 +-
 addons/web_graph/i18n/es_EC.po           |   2 +-
 addons/web_graph/i18n/es_MX.po           |   2 +-
 addons/web_graph/i18n/et.po              |   2 +-
 addons/web_graph/i18n/fa.po              |   2 +-
 addons/web_graph/i18n/fi.po              |   2 +-
 addons/web_graph/i18n/fr.po              |   2 +-
 addons/web_graph/i18n/fr_CA.po           |   2 +-
 addons/web_graph/i18n/gl.po              |   2 +-
 addons/web_graph/i18n/gu.po              |   2 +-
 addons/web_graph/i18n/he.po              |   2 +-
 addons/web_graph/i18n/hr.po              |   2 +-
 addons/web_graph/i18n/hu.po              |   2 +-
 addons/web_graph/i18n/it.po              |   2 +-
 addons/web_graph/i18n/ja.po              |   2 +-
 addons/web_graph/i18n/ka.po              |   2 +-
 addons/web_graph/i18n/ko.po              |   2 +-
 addons/web_graph/i18n/lt.po              |   2 +-
 addons/web_graph/i18n/mk.po              |   2 +-
 addons/web_graph/i18n/mn.po              |   2 +-
 addons/web_graph/i18n/nb.po              |  20 +-
 addons/web_graph/i18n/nl.po              |   2 +-
 addons/web_graph/i18n/nl_BE.po           |   2 +-
 addons/web_graph/i18n/pl.po              |   2 +-
 addons/web_graph/i18n/pt.po              |   2 +-
 addons/web_graph/i18n/pt_BR.po           |   2 +-
 addons/web_graph/i18n/ro.po              |   2 +-
 addons/web_graph/i18n/ru.po              |   2 +-
 addons/web_graph/i18n/sl.po              |   2 +-
 addons/web_graph/i18n/sq.po              |   2 +-
 addons/web_graph/i18n/sr@latin.po        |   2 +-
 addons/web_graph/i18n/sv.po              |   2 +-
 addons/web_graph/i18n/th.po              |   2 +-
 addons/web_graph/i18n/tr.po              |   2 +-
 addons/web_graph/i18n/zh_CN.po           |   2 +-
 addons/web_hello/i18n/ar.po              |   2 +-
 addons/web_hello/i18n/cs.po              |   2 +-
 addons/web_hello/i18n/es_CR.po           |   2 +-
 addons/web_hello/i18n/fr.po              |   2 +-
 addons/web_hello/i18n/pt_BR.po           |   2 +-
 addons/web_kanban/i18n/ar.po             |   2 +-
 addons/web_kanban/i18n/bg.po             |   2 +-
 addons/web_kanban/i18n/bn.po             |   2 +-
 addons/web_kanban/i18n/bs.po             |   2 +-
 addons/web_kanban/i18n/ca.po             |   2 +-
 addons/web_kanban/i18n/cs.po             |   2 +-
 addons/web_kanban/i18n/da.po             |   2 +-
 addons/web_kanban/i18n/de.po             |   2 +-
 addons/web_kanban/i18n/en_AU.po          |   2 +-
 addons/web_kanban/i18n/en_GB.po          |   2 +-
 addons/web_kanban/i18n/es.po             |   2 +-
 addons/web_kanban/i18n/es_CL.po          |   2 +-
 addons/web_kanban/i18n/es_CR.po          |   2 +-
 addons/web_kanban/i18n/es_DO.po          |   2 +-
 addons/web_kanban/i18n/es_EC.po          |   2 +-
 addons/web_kanban/i18n/es_MX.po          |   2 +-
 addons/web_kanban/i18n/et.po             |   2 +-
 addons/web_kanban/i18n/fa.po             |   2 +-
 addons/web_kanban/i18n/fi.po             |   2 +-
 addons/web_kanban/i18n/fr.po             |   2 +-
 addons/web_kanban/i18n/fr_CA.po          |   2 +-
 addons/web_kanban/i18n/gl.po             |   2 +-
 addons/web_kanban/i18n/gu.po             |   2 +-
 addons/web_kanban/i18n/he.po             |   2 +-
 addons/web_kanban/i18n/hr.po             |   2 +-
 addons/web_kanban/i18n/hu.po             |   2 +-
 addons/web_kanban/i18n/it.po             |   2 +-
 addons/web_kanban/i18n/ja.po             |   2 +-
 addons/web_kanban/i18n/ka.po             |   2 +-
 addons/web_kanban/i18n/ko.po             |   2 +-
 addons/web_kanban/i18n/lt.po             |   2 +-
 addons/web_kanban/i18n/mk.po             |   2 +-
 addons/web_kanban/i18n/mn.po             |   2 +-
 addons/web_kanban/i18n/nb.po             |  17 +-
 addons/web_kanban/i18n/nl.po             |   2 +-
 addons/web_kanban/i18n/nl_BE.po          |   2 +-
 addons/web_kanban/i18n/pl.po             |   2 +-
 addons/web_kanban/i18n/pt.po             |   2 +-
 addons/web_kanban/i18n/pt_BR.po          |   2 +-
 addons/web_kanban/i18n/ro.po             |   2 +-
 addons/web_kanban/i18n/ru.po             |   2 +-
 addons/web_kanban/i18n/sl.po             |   2 +-
 addons/web_kanban/i18n/sr@latin.po       |   2 +-
 addons/web_kanban/i18n/sv.po             |   2 +-
 addons/web_kanban/i18n/th.po             |   2 +-
 addons/web_kanban/i18n/tr.po             |   2 +-
 addons/web_kanban/i18n/zh_CN.po          |   2 +-
 addons/web_kanban/i18n/zh_TW.po          |   2 +-
 addons/web_tests/i18n/cs.po              |   2 +-
 addons/web_tests/i18n/es.po              |   2 +-
 addons/web_tests/i18n/es_CR.po           |   2 +-
 addons/web_tests/i18n/fr_CA.po           |   2 +-
 addons/web_view_editor/i18n/ar.po        |   2 +-
 addons/web_view_editor/i18n/bs.po        |   2 +-
 addons/web_view_editor/i18n/cs.po        |   2 +-
 addons/web_view_editor/i18n/da.po        |   2 +-
 addons/web_view_editor/i18n/de.po        |   2 +-
 addons/web_view_editor/i18n/en_AU.po     |   2 +-
 addons/web_view_editor/i18n/en_GB.po     |   2 +-
 addons/web_view_editor/i18n/es.po        |   2 +-
 addons/web_view_editor/i18n/es_DO.po     |   2 +-
 addons/web_view_editor/i18n/es_EC.po     |   2 +-
 addons/web_view_editor/i18n/es_MX.po     |   2 +-
 addons/web_view_editor/i18n/et.po        |   2 +-
 addons/web_view_editor/i18n/fa.po        |   2 +-
 addons/web_view_editor/i18n/fi.po        |   2 +-
 addons/web_view_editor/i18n/fr.po        |   2 +-
 addons/web_view_editor/i18n/he.po        |   2 +-
 addons/web_view_editor/i18n/hr.po        |   2 +-
 addons/web_view_editor/i18n/hu.po        |   2 +-
 addons/web_view_editor/i18n/it.po        |   2 +-
 addons/web_view_editor/i18n/ko.po        |   2 +-
 addons/web_view_editor/i18n/lt.po        |   2 +-
 addons/web_view_editor/i18n/lv.po        |   2 +-
 addons/web_view_editor/i18n/mk.po        |   2 +-
 addons/web_view_editor/i18n/mn.po        |   2 +-
 addons/web_view_editor/i18n/nb.po        |  22 +-
 addons/web_view_editor/i18n/nl.po        |   2 +-
 addons/web_view_editor/i18n/nl_BE.po     |   2 +-
 addons/web_view_editor/i18n/pl.po        |   2 +-
 addons/web_view_editor/i18n/pt.po        |   2 +-
 addons/web_view_editor/i18n/pt_BR.po     |   2 +-
 addons/web_view_editor/i18n/ro.po        |   2 +-
 addons/web_view_editor/i18n/ru.po        |   2 +-
 addons/web_view_editor/i18n/sl.po        |   2 +-
 addons/web_view_editor/i18n/sv.po        |   2 +-
 addons/web_view_editor/i18n/th.po        |   2 +-
 addons/web_view_editor/i18n/tr.po        |   2 +-
 addons/web_view_editor/i18n/zh_CN.po     |   2 +-
 openerp/addons/base/i18n/bg.po           |   8 +-
 openerp/addons/base/i18n/nb.po           | 548 ++++++++++++++++++-----
 364 files changed, 1170 insertions(+), 877 deletions(-)

diff --git a/addons/analytic_user_function/i18n/ja.po b/addons/analytic_user_function/i18n/ja.po
index beaf6e4a228..9a8d44b21f4 100644
--- a/addons/analytic_user_function/i18n/ja.po
+++ b/addons/analytic_user_function/i18n/ja.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-08 06:32+0000\n"
+"X-Launchpad-Export-Date: 2014-05-10 07:55+0000\n"
 "X-Generator: Launchpad (build 16996)\n"
 
 #. module: analytic_user_function
diff --git a/addons/auth_signup/i18n/ja.po b/addons/auth_signup/i18n/ja.po
index a926a153a83..14572b05a53 100644
--- a/addons/auth_signup/i18n/ja.po
+++ b/addons/auth_signup/i18n/ja.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-08 06:32+0000\n"
+"X-Launchpad-Export-Date: 2014-05-10 07:55+0000\n"
 "X-Generator: Launchpad (build 16996)\n"
 
 #. module: auth_signup
diff --git a/addons/hr_evaluation/i18n/de.po b/addons/hr_evaluation/i18n/de.po
index 320e89ea2eb..7ca75d1acb3 100644
--- a/addons/hr_evaluation/i18n/de.po
+++ b/addons/hr_evaluation/i18n/de.po
@@ -8,15 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-01-06 20:55+0000\n"
-"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
-"consulting.net>\n"
+"PO-Revision-Date: 2014-05-09 09:14+0000\n"
+"Last-Translator: Rudolf Schnapka <rs@techno-flex.de>\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: 2013-11-21 06:11+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-05-10 07:55+0000\n"
+"X-Generator: Launchpad (build 16996)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
@@ -259,7 +258,7 @@ msgstr "survey.request"
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 msgid "Cancel Survey"
-msgstr ""
+msgstr "Umfrage verwerfen"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
diff --git a/addons/hr_expense/i18n/ja.po b/addons/hr_expense/i18n/ja.po
index 7aa7e9114b0..582401506f5 100644
--- a/addons/hr_expense/i18n/ja.po
+++ b/addons/hr_expense/i18n/ja.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-08 06:32+0000\n"
+"X-Launchpad-Export-Date: 2014-05-10 07:55+0000\n"
 "X-Generator: Launchpad (build 16996)\n"
 
 #. module: hr_expense
diff --git a/addons/mail/i18n/lt.po b/addons/mail/i18n/lt.po
index 4c191844bc7..60839dcb191 100644
--- a/addons/mail/i18n/lt.po
+++ b/addons/mail/i18n/lt.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2014-05-07 11:52+0000\n"
+"PO-Revision-Date: 2014-05-09 10:30+0000\n"
 "Last-Translator: Andrius Preimantas @ hbee <andrius.preimantas@gmail.com>\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: 2014-05-08 06:32+0000\n"
+"X-Launchpad-Export-Date: 2014-05-10 07:55+0000\n"
 "X-Generator: Launchpad (build 16996)\n"
 
 #. module: mail
@@ -1073,6 +1073,7 @@ msgstr "Prašome užpildyti partnerio duomenis"
 #, python-format
 msgid "<p>Access this document <a href=\"%s\">directly in OpenERP</a></p>"
 msgstr ""
+"<p>Pasiekite šį dokumentą <a href=\"%s\">tiesiogiai per OpenERP</a></p>"
 
 #. module: mail
 #: view:mail.compose.message:0
diff --git a/addons/project/i18n/ja.po b/addons/project/i18n/ja.po
index c3733618f8c..9bbdc1de770 100644
--- a/addons/project/i18n/ja.po
+++ b/addons/project/i18n/ja.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-08 06:32+0000\n"
+"X-Launchpad-Export-Date: 2014-05-10 07:55+0000\n"
 "X-Generator: Launchpad (build 16996)\n"
 
 #. module: project
diff --git a/addons/sale/i18n/ja.po b/addons/sale/i18n/ja.po
index 2dde973c417..b96ef5d4d09 100644
--- a/addons/sale/i18n/ja.po
+++ b/addons/sale/i18n/ja.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-08 06:32+0000\n"
+"X-Launchpad-Export-Date: 2014-05-10 07:55+0000\n"
 "X-Generator: Launchpad (build 16996)\n"
 
 #. module: sale
diff --git a/addons/sale_stock/i18n/nl.po b/addons/sale_stock/i18n/nl.po
index a49e11bdf74..93661df895e 100644
--- a/addons/sale_stock/i18n/nl.po
+++ b/addons/sale_stock/i18n/nl.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2013-12-03 12:10+0000\n"
-"Last-Translator: Stefan Rijnhart (Therp) <Unknown>\n"
+"PO-Revision-Date: 2014-05-08 11:17+0000\n"
+"Last-Translator: Erwin van der Ploeg (BAS Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@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: 2013-12-04 05:56+0000\n"
-"X-Generator: Launchpad (build 16861)\n"
+"X-Launchpad-Export-Date: 2014-05-10 07:55+0000\n"
+"X-Generator: Launchpad (build 16996)\n"
 
 #. module: sale_stock
 #: help:sale.config.settings,group_invoice_deli_orders:0
@@ -569,7 +569,7 @@ msgstr "(n.b.)"
 #. module: sale_stock
 #: field:sale.order,incoterm:0
 msgid "Incoterm"
-msgstr "Leveringsvoorwaarden"
+msgstr "Leveringscondities"
 
 #. module: sale_stock
 #: code:addons/sale_stock/sale_stock.py:522
diff --git a/addons/stock/i18n/nl.po b/addons/stock/i18n/nl.po
index 2fc05f0f3f0..032e6ca53d5 100644
--- a/addons/stock/i18n/nl.po
+++ b/addons/stock/i18n/nl.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2014-02-06 15:56+0000\n"
-"PO-Revision-Date: 2014-03-11 17:54+0000\n"
+"PO-Revision-Date: 2014-05-08 15:02+0000\n"
 "Last-Translator: Erwin van der Ploeg (BAS Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@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: 2014-03-12 05:25+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-05-10 07:55+0000\n"
+"X-Generator: Launchpad (build 16996)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -130,8 +130,8 @@ msgid "Product Moves"
 msgstr "Productmutaties"
 
 #. module: stock
-#: code:addons/stock/stock.py:2568
-#: code:addons/stock/stock.py:2629
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
 #, python-format
 msgid "Please provide proper quantity."
 msgstr "Geef een juist aantal in"
@@ -151,13 +151,13 @@ msgstr ""
 "fabrikant."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_fill_inventory.py:63
+#: code:addons/stock/wizard/stock_fill_inventory.py:59
 #, python-format
 msgid "You cannot perform this operation on more than one Stock Inventories."
 msgstr "U kunt deze bewerking niet op meer dan een voorraad uitvoeren."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:95
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #, python-format
 msgid "Quantity cannot be negative."
 msgstr "Hoeveelheid mag niet negatief zijn."
@@ -190,8 +190,6 @@ msgstr "Bijv. Jaarlijkse voorraadtelling"
 #: field:stock.partial.move.line,quantity:0
 #: field:stock.partial.picking.line,quantity:0
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 #: field:stock.report.prodlots,qty:0
 #: field:stock.report.tracklots,name:0
 #: field:stock.return.picking.memory,quantity:0
@@ -324,7 +322,7 @@ msgid "Reference"
 msgstr "Referentie"
 
 #. module: stock
-#: code:addons/stock/stock.py:1565
+#: code:addons/stock/stock.py:1548
 #, python-format
 msgid "Products to Process"
 msgstr "Te verwerken producten"
@@ -366,12 +364,12 @@ msgstr ""
 "ingevoegd."
 
 #. module: stock
-#: code:addons/stock/stock.py:782
-#: code:addons/stock/stock.py:2517
-#: code:addons/stock/stock.py:2568
-#: code:addons/stock/stock.py:2629
-#: code:addons/stock/wizard/stock_change_product_qty.py:95
-#: code:addons/stock/wizard/stock_fill_inventory.py:128
+#: code:addons/stock/stock.py:768
+#: code:addons/stock/stock.py:2475
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
+#: code:addons/stock/wizard/stock_fill_inventory.py:124
 #: code:addons/stock/wizard/stock_inventory_merge.py:43
 #: code:addons/stock/wizard/stock_inventory_merge.py:63
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
@@ -379,9 +377,9 @@ msgstr ""
 #: code:addons/stock/wizard/stock_partial_picking.py:174
 #: code:addons/stock/wizard/stock_partial_picking.py:181
 #: code:addons/stock/wizard/stock_partial_picking.py:192
-#: code:addons/stock/wizard/stock_return_picking.py:102
-#: code:addons/stock/wizard/stock_return_picking.py:109
-#: code:addons/stock/wizard/stock_return_picking.py:212
+#: code:addons/stock/wizard/stock_return_picking.py:99
+#: code:addons/stock/wizard/stock_return_picking.py:106
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Warning!"
 msgstr "Waarschuwing!"
@@ -504,9 +502,6 @@ msgstr ""
 #: selection:stock.move,state:0
 #: selection:stock.picking,state:0
 #: selection:stock.picking.in,state:0
-#: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 #: selection:stock.picking.out,state:0
 msgid "Waiting Availability"
 msgstr "Wachten op beschikbaarheid"
@@ -515,9 +510,6 @@ msgstr "Wachten op beschikbaarheid"
 #: selection:report.stock.inventory,state:0
 #: selection:report.stock.move,state:0
 #: selection:stock.move,state:0
-#: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 #: view:stock.production.lot:0
 #: field:stock.production.lot,stock_available:0
 msgid "Available"
@@ -590,7 +582,7 @@ msgstr ""
 "levering van de producten. Dit is de levertijd die u aan uw klanten beloofd."
 
 #. module: stock
-#: code:addons/stock/product.py:195
+#: code:addons/stock/product.py:196
 #, python-format
 msgid "Products: "
 msgstr "Producten: "
@@ -607,7 +599,7 @@ msgid "Draft Physical Inventories"
 msgstr "Concept voorraadtellingen"
 
 #. module: stock
-#: code:addons/stock/stock.py:1806
+#: code:addons/stock/stock.py:1777
 #, python-format
 msgid ""
 "Quantities, Units of Measure, Products and Locations cannot be modified on "
@@ -657,7 +649,7 @@ msgid "Item Labels"
 msgstr "Labels"
 
 #. module: stock
-#: code:addons/stock/stock.py:1373
+#: code:addons/stock/stock.py:1356
 #, python-format
 msgid "Back order <em>%s</em> has been <b>created</b>."
 msgstr "Back order <em>%s</em> is  <b>aangemaakt</b>."
@@ -740,8 +732,6 @@ msgstr ""
 
 #. module: stock
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 msgid "Order(Origin)"
 msgstr "Order (bron)"
 
@@ -781,7 +771,6 @@ msgid "Destination Address "
 msgstr "Bestemming adres "
 
 #. module: stock
-#: view:product.product:0
 #: field:product.product,reception_count:0
 msgid "Reception"
 msgstr "Ontvangst"
@@ -832,8 +821,6 @@ msgstr "Jaar gepland"
 #: view:stock.picking.in:0
 #: field:stock.picking.in,state:0
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 #: field:stock.picking.out,state:0
 msgid "Status"
 msgstr "Status"
@@ -932,7 +919,7 @@ msgstr ""
 "verwerkt."
 
 #. module: stock
-#: code:addons/stock/stock.py:2296
+#: code:addons/stock/stock.py:2252
 #, python-format
 msgid ""
 "Please define stock output account for this product or its category: \"%s\" "
@@ -961,7 +948,7 @@ msgid "Reference must be unique per Company!"
 msgstr "Referentie moet uniek zijn per bedrijf!"
 
 #. module: stock
-#: code:addons/stock/product.py:448
+#: code:addons/stock/product.py:447
 #, python-format
 msgid "Future Receptions"
 msgstr "Toekomstige ontvangsten"
@@ -1000,8 +987,6 @@ msgstr "- bijwerken"
 
 #. module: stock
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 msgid "Weight"
 msgstr "Bruto gewicht"
 
@@ -1047,7 +1032,7 @@ msgid "December"
 msgstr "December"
 
 #. module: stock
-#: code:addons/stock/stock.py:1204
+#: code:addons/stock/stock.py:1190
 #, python-format
 msgid ""
 "You cannot cancel the picking as some moves have been done. You should "
@@ -1072,7 +1057,7 @@ msgid "Change Product Quantity"
 msgstr "Hoeveelheid aanpassen"
 
 #. module: stock
-#: code:addons/stock/product.py:464
+#: code:addons/stock/product.py:463
 #, python-format
 msgid "Future P&L"
 msgstr "Toekomstige W&V"
@@ -1109,7 +1094,7 @@ msgid "You must assign a serial number for this product."
 msgstr "U dient een partijnummer toe te wijzen voor dit product."
 
 #. module: stock
-#: code:addons/stock/stock.py:2299
+#: code:addons/stock/stock.py:2255
 #, python-format
 msgid "Please define journal on the product category: \"%s\" (id: %d)"
 msgstr "Definieer een dagboek voor de productcategorie:  \"%s\" (id: %d)"
@@ -1156,8 +1141,6 @@ msgstr "Valuta"
 #: view:stock.picking:0
 #: view:stock.picking.in:0
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 msgid "Journal"
 msgstr "Dagboek"
 
@@ -1237,7 +1220,7 @@ msgstr ""
 "lijst."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:109
+#: code:addons/stock/wizard/stock_return_picking.py:106
 #, python-format
 msgid ""
 "No products to return (only lines in Done state and not fully returned yet "
@@ -1369,7 +1352,7 @@ msgid "Author"
 msgstr "Auteur"
 
 #. module: stock
-#: code:addons/stock/stock.py:1851
+#: code:addons/stock/stock.py:1822
 #, python-format
 msgid ""
 "You are moving %.2f %s but only %.2f %s available for this serial number."
@@ -1379,8 +1362,6 @@ msgstr ""
 
 #. module: stock
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 msgid "Internal Shipment :"
 msgstr "Interne levering:"
 
@@ -1408,7 +1389,7 @@ msgid "Supplier"
 msgstr "Leverancier"
 
 #. module: stock
-#: code:addons/stock/stock.py:2908
+#: code:addons/stock/stock.py:2859
 #, python-format
 msgid ""
 "In order to cancel this inventory, you must first unpost related journal "
@@ -1526,8 +1507,6 @@ msgstr "Verbruik mutatie"
 
 #. module: stock
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 msgid "Delivery Order :"
 msgstr "Uitgaande levering:"
 
@@ -1624,7 +1603,7 @@ msgstr ""
 "(wanneer de gemiddelde kostprijs methode is gebruikt)"
 
 #. module: stock
-#: code:addons/stock/stock.py:1919
+#: code:addons/stock/stock.py:1890
 #, python-format
 msgid "Warning: No Back Order"
 msgstr "Waarschuwing: Geen back-order"
@@ -1646,13 +1625,13 @@ msgid "To be refunded/invoiced"
 msgstr "Terug te betalen (Credit factuur)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2492
+#: code:addons/stock/stock.py:2450
 #, python-format
 msgid "You can only delete draft moves."
 msgstr "Er kunnen alleen concept-wijzigingen worden verwijderd."
 
 #. module: stock
-#: code:addons/stock/stock.py:1682
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "You cannot move product %s to a location of type view %s."
 msgstr ""
@@ -1691,7 +1670,7 @@ msgid "Additional Info"
 msgstr "Aanvullende informatie"
 
 #. module: stock
-#: code:addons/stock/stock.py:2697
+#: code:addons/stock/stock.py:2648
 #, python-format
 msgid "Missing partial picking data for move #%s."
 msgstr "Er ontbreekt gedeeltelijke verzamelopdracht data voor mutatie #%s."
@@ -1707,7 +1686,7 @@ msgid "Incoming Shipments already processed"
 msgstr "Inkomende leveringen welke reeds zijn verwerkt"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:102
+#: code:addons/stock/wizard/stock_return_picking.py:99
 #, python-format
 msgid "You may only return pickings that are Confirmed, Available or Done!"
 msgstr ""
@@ -1791,9 +1770,6 @@ msgstr ""
 #. module: stock
 #: field:stock.inventory,date:0
 #: field:stock.move,create_date:0
-#: field:stock.picking,date:0
-#: field:stock.picking.in,date:0
-#: field:stock.picking.out,date:0
 #: field:stock.production.lot,date:0
 #: field:stock.tracking,date:0
 msgid "Creation Date"
@@ -1885,7 +1861,7 @@ msgid "Order Date"
 msgstr "Orderdatum"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:96
+#: code:addons/stock/wizard/stock_change_product_qty.py:92
 #, python-format
 msgid "INV: %s"
 msgstr "TEL: %s"
@@ -1924,7 +1900,7 @@ msgid "Stock Invoice Onshipping"
 msgstr "Factureren bij levering"
 
 #. module: stock
-#: code:addons/stock/stock.py:2517
+#: code:addons/stock/stock.py:2475
 #, python-format
 msgid "Please provide a positive quantity to scrap."
 msgstr "Geef een positieve hoeveelheid in om af te keuren."
@@ -1989,8 +1965,6 @@ msgstr "Is een backorder"
 
 #. module: stock
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 msgid "Incoming Shipment :"
 msgstr "Inkomende levering:"
 
@@ -2081,7 +2055,7 @@ msgid "Shelf 2"
 msgstr "Plank 2"
 
 #. module: stock
-#: code:addons/stock/stock.py:543
+#: code:addons/stock/stock.py:529
 #, python-format
 msgid "You cannot remove a lot line."
 msgstr "Het is niet mogelijk om een partij regel te verwijderen."
@@ -2105,7 +2079,7 @@ msgid "Localization"
 msgstr "Positie in magazijn"
 
 #. module: stock
-#: code:addons/stock/product.py:460
+#: code:addons/stock/product.py:459
 #, python-format
 msgid "Delivered Qty"
 msgstr "Geleverd aantal"
@@ -2444,7 +2418,7 @@ msgid "Generate accounting entries per stock movement"
 msgstr "Maak boekingen per voorraadmutatie"
 
 #. module: stock
-#: code:addons/stock/product.py:450
+#: code:addons/stock/product.py:449
 #, python-format
 msgid "Received Qty"
 msgstr "Ontvangen aantal"
@@ -2486,8 +2460,6 @@ msgstr "Naam"
 
 #. module: stock
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 msgid "Supplier Address :"
 msgstr "Leveranciers adres:"
 
@@ -2522,8 +2494,8 @@ msgid "Customer Locations"
 msgstr "Klant locaties"
 
 #. module: stock
-#: code:addons/stock/stock.py:2492
-#: code:addons/stock/stock.py:2907
+#: code:addons/stock/stock.py:2449
+#: code:addons/stock/stock.py:2858
 #, python-format
 msgid "User Error!"
 msgstr "Gebruikersfout!"
@@ -2759,7 +2731,7 @@ msgid "Warehouse board"
 msgstr "Magazijn Dashboard"
 
 #. module: stock
-#: code:addons/stock/product.py:470
+#: code:addons/stock/product.py:469
 #, python-format
 msgid "Future Qty"
 msgstr "Toekomstige HvH"
@@ -2827,7 +2799,7 @@ msgid "Products"
 msgstr "Producten"
 
 #. module: stock
-#: code:addons/stock/stock.py:2287
+#: code:addons/stock/stock.py:2243
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Output Account of this product and Valuation "
@@ -2869,7 +2841,7 @@ msgid "Outgoing Products"
 msgstr "Uitgaande leveringen"
 
 #. module: stock
-#: code:addons/stock/stock.py:2293
+#: code:addons/stock/stock.py:2249
 #, python-format
 msgid ""
 "Please define stock input account for this product or its category: \"%s\" "
@@ -2891,7 +2863,7 @@ msgid "Move"
 msgstr "Verplaats"
 
 #. module: stock
-#: code:addons/stock/product.py:466
+#: code:addons/stock/product.py:465
 #, python-format
 msgid "P&L Qty"
 msgstr "Winst&Verlies hoeveelheid"
@@ -2987,8 +2959,6 @@ msgstr "Bron"
 #: field:stock.picking,location_id:0
 #: field:stock.picking.in,location_id:0
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 #: field:stock.picking.out,location_id:0
 #: field:stock.report.prodlots,location_id:0
 #: field:stock.report.tracklots,location_id:0
@@ -3012,7 +2982,7 @@ msgid "Cancel Move"
 msgstr "Mutatie annuleren"
 
 #. module: stock
-#: code:addons/stock/stock.py:2290
+#: code:addons/stock/stock.py:2246
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Input Account of this product and Valuation "
@@ -3038,7 +3008,7 @@ msgid "scrap"
 msgstr "afkeur"
 
 #. module: stock
-#: code:addons/stock/stock.py:1920
+#: code:addons/stock/stock.py:1891
 #, python-format
 msgid ""
 "By changing the quantity here, you accept the new quantity as complete: "
@@ -3140,13 +3110,13 @@ msgid "Stock Journal"
 msgstr "Voorraadboek"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:176
+#: code:addons/stock/wizard/stock_return_picking.py:171
 #, python-format
 msgid "%s-%s-return"
 msgstr "%s-%s-retour"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:86
+#: code:addons/stock/wizard/stock_change_product_qty.py:82
 #, python-format
 msgid "Active ID is not set in Context"
 msgstr "Active ID is niet ingesteld in Context"
@@ -3169,7 +3139,7 @@ msgid "Scrap Move"
 msgstr "Afkeur mutatie"
 
 #. module: stock
-#: help:stock.move,prodlot_id:0
+#: help:stock.move,lot_id:0
 msgid "Serial number is used to put a serial number on the production"
 msgstr ""
 "Partijnummers worden gebruikt om een partijnummer toe te wijzen aan een "
@@ -3216,7 +3186,7 @@ msgid "Date of Completion"
 msgstr "Datum gereed"
 
 #. module: stock
-#: code:addons/stock/stock.py:1680
+#: code:addons/stock/stock.py:1663
 #, python-format
 msgid "You cannot move product %s from a location of type view %s."
 msgstr ""
@@ -3303,10 +3273,8 @@ msgstr "Revisiedatum"
 
 #. module: stock
 #: view:report.stock.inventory:0
-#: field:report.stock.inventory,prodlot_id:0
+#: field:report.stock.inventory,lot_id:0
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 msgid "Lot"
 msgstr "Partij"
 
@@ -3337,8 +3305,6 @@ msgstr "Maak beschikbaar"
 
 #. module: stock
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 msgid "Contact Address :"
 msgstr "Contactpersoon Adres :"
 
@@ -3382,7 +3348,7 @@ msgstr "Bovenliggende wizard"
 #: model:ir.ui.menu,name:stock.menu_action_incoterm_open
 #: view:stock.incoterms:0
 msgid "Incoterms"
-msgstr "Leveringsvoorwaarden"
+msgstr "Leveringscondities"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_picking_line
@@ -3550,7 +3516,7 @@ msgstr ""
 "            "
 
 #. module: stock
-#: code:addons/stock/stock.py:2545
+#: code:addons/stock/stock.py:2496
 #, python-format
 msgid "%s %s %s has been <b>moved to</b> scrap."
 msgstr "%s %s %s is <b>verplaatst naar</b> scrap."
@@ -3569,9 +3535,6 @@ msgstr "Klant verpakkingen"
 #: selection:stock.move,state:0
 #: view:stock.picking:0
 #: view:stock.picking.in:0
-#: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 msgid "Done"
 msgstr "Verwerkt"
 
@@ -3600,7 +3563,7 @@ msgid "Date done"
 msgstr "Datum verwerkt"
 
 #. module: stock
-#: code:addons/stock/stock.py:1135
+#: code:addons/stock/stock.py:1121
 #, python-format
 msgid ""
 "Please put a partner on the picking list if you want to generate invoice."
@@ -3678,7 +3641,7 @@ msgid "Stock"
 msgstr "Voorraad"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:226
+#: code:addons/stock/wizard/stock_return_picking.py:219
 #, python-format
 msgid "Returned Picking"
 msgstr "Retouren"
@@ -3754,7 +3717,7 @@ msgid "Assigned Internal Moves"
 msgstr "Toegewezen interne mutaties"
 
 #. module: stock
-#: code:addons/stock/stock.py:804
+#: code:addons/stock/stock.py:790
 #, python-format
 msgid "You cannot process picking without stock moves."
 msgstr ""
@@ -4013,7 +3976,7 @@ msgid "Inventory Move"
 msgstr "Voorraadverplaatsing"
 
 #. module: stock
-#: code:addons/stock/product.py:476
+#: code:addons/stock/product.py:475
 #, python-format
 msgid "Future Productions"
 msgstr "Toekomstige productie"
@@ -4140,24 +4103,21 @@ msgstr "Partijvoorraad"
 #: model:ir.model,name:stock.model_stock_production_lot
 #: model:ir.ui.menu,name:stock.menu_action_production_lot_form
 #: model:res.request.link,name:stock.req_link_tracking
-#: field:stock.change.product.qty,prodlot_id:0
+#: field:stock.change.product.qty,lot_id:0
 #: field:stock.inventory.line,prod_lot_id:0
 #: field:stock.inventory.line.split.lines,name:0
-#: field:stock.inventory.line.split.lines,prodlot_id:0
-#: field:stock.move,prodlot_id:0
+#: field:stock.inventory.line.split.lines,lot_id:0
+#: field:stock.move,lot_id:0
 #: view:stock.move.split:0
 #: field:stock.move.split.lines,name:0
-#: field:stock.move.split.lines,prodlot_id:0
-#: field:stock.partial.move.line,prodlot_id:0
-#: field:stock.partial.picking.line,prodlot_id:0
+#: field:stock.move.split.lines,lot_id:0
+#: field:stock.partial.move.line,lot_id:0
+#: field:stock.partial.picking.line,lot_id:0
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 #: view:stock.production.lot:0
 #: field:stock.production.lot,name:0
 #: field:stock.production.lot.revision,lot_id:0
-#: field:stock.report.prodlots,prodlot_id:0
-#: field:stock.return.picking.memory,prodlot_id:0
+#: field:stock.report.prodlots,lot_id:0
 msgid "Serial Number"
 msgstr "Partijnummer"
 
@@ -4221,7 +4181,7 @@ msgid "Non European Customers"
 msgstr "Niet-europese afnemers"
 
 #. module: stock
-#: code:addons/stock/product.py:100
+#: code:addons/stock/product.py:96
 #: code:addons/stock/product.py:110
 #: code:addons/stock/product.py:113
 #: code:addons/stock/product.py:120
@@ -4229,19 +4189,18 @@ msgstr "Niet-europese afnemers"
 #: code:addons/stock/product.py:167
 #: code:addons/stock/report/report_stock.py:78
 #: code:addons/stock/report/report_stock.py:134
-#: code:addons/stock/stock.py:543
-#: code:addons/stock/stock.py:804
-#: code:addons/stock/stock.py:1204
-#: code:addons/stock/stock.py:1213
-#: code:addons/stock/stock.py:2287
-#: code:addons/stock/stock.py:2290
-#: code:addons/stock/stock.py:2293
-#: code:addons/stock/stock.py:2296
-#: code:addons/stock/stock.py:2299
-#: code:addons/stock/stock.py:2302
-#: code:addons/stock/stock.py:2525
-#: code:addons/stock/stock.py:2634
-#: code:addons/stock/wizard/stock_fill_inventory.py:63
+#: code:addons/stock/stock.py:529
+#: code:addons/stock/stock.py:790
+#: code:addons/stock/stock.py:1190
+#: code:addons/stock/stock.py:1199
+#: code:addons/stock/stock.py:2243
+#: code:addons/stock/stock.py:2246
+#: code:addons/stock/stock.py:2249
+#: code:addons/stock/stock.py:2252
+#: code:addons/stock/stock.py:2255
+#: code:addons/stock/stock.py:2258
+#: code:addons/stock/stock.py:2585
+#: code:addons/stock/wizard/stock_fill_inventory.py:59
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:112
 #: code:addons/stock/wizard/stock_splitinto.py:53
 #, python-format
@@ -4340,7 +4299,7 @@ msgstr ""
 "Gekoppelde locatie is vast."
 
 #. module: stock
-#: code:addons/stock/stock.py:1882
+#: code:addons/stock/stock.py:1853
 #, python-format
 msgid ""
 "By changing this quantity here, you accept the new quantity as complete: "
@@ -4414,7 +4373,7 @@ msgid "Followers"
 msgstr "Volgers"
 
 #. module: stock
-#: code:addons/stock/stock.py:2634
+#: code:addons/stock/stock.py:2585
 #, python-format
 msgid "Cannot consume a move with negative or zero quantity."
 msgstr ""
@@ -4504,7 +4463,7 @@ msgstr ""
 "gecrediteerd en voorraadtoename rekening zal worden gedebiteerd."
 
 #. module: stock
-#: code:addons/stock/stock.py:2860
+#: code:addons/stock/stock.py:2811
 #, python-format
 msgid "INV:"
 msgstr "TEL:"
@@ -4527,7 +4486,7 @@ msgid "Chaining Journal"
 msgstr "Gekoppeld dagboek"
 
 #. module: stock
-#: code:addons/stock/stock.py:782
+#: code:addons/stock/stock.py:768
 #, python-format
 msgid "Not enough stock, unable to reserve the products."
 msgstr "Niet genoeg voorraad, niet mogelijk om producten te reserveren."
@@ -4571,7 +4530,7 @@ msgstr ""
 "interne locaties."
 
 #. module: stock
-#: code:addons/stock/product.py:458
+#: code:addons/stock/product.py:457
 #, python-format
 msgid "Future Deliveries"
 msgstr "Toekomstige leveringen"
@@ -4594,7 +4553,7 @@ msgid "Auto Validate"
 msgstr "Automatisch akkoord geven"
 
 #. module: stock
-#: code:addons/stock/stock.py:1850
+#: code:addons/stock/stock.py:1821
 #, python-format
 msgid "Insufficient Stock for Serial Number !"
 msgstr "Onvoldoende voorraad van partijnummer!"
@@ -4693,14 +4652,14 @@ msgid "Invoiced"
 msgstr "Gefactureerd"
 
 #. module: stock
-#: code:addons/stock/stock.py:1881
+#: code:addons/stock/stock.py:1852
 #: view:product.template:0
 #, python-format
 msgid "Information"
 msgstr "Informatie"
 
 #. module: stock
-#: code:addons/stock/stock.py:1213
+#: code:addons/stock/stock.py:1199
 #, python-format
 msgid "You cannot remove the picking which is in %s state!"
 msgstr ""
@@ -4737,8 +4696,6 @@ msgstr "Auto-verzamelopdracht"
 
 #. module: stock
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 msgid "Customer Address :"
 msgstr "Klant adres:"
 
@@ -4806,7 +4763,7 @@ msgid "Shelves (Y)"
 msgstr "Schap (Y)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2302
+#: code:addons/stock/stock.py:2258
 #, python-format
 msgid ""
 "Please define inventory valuation account on the product category: \"%s\" "
@@ -4820,7 +4777,7 @@ msgid "Serial Number Revision"
 msgstr "Partijnummer revisie"
 
 #. module: stock
-#: code:addons/stock/product.py:100
+#: code:addons/stock/product.py:96
 #, python-format
 msgid "Specify valuation Account for Product Category: %s."
 msgstr "Specificeer een voorraadwaarde rekening voor productcategorie: %s"
@@ -4836,7 +4793,7 @@ msgstr ""
 "                Dit installeert de module claim_from_delivery."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:212
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Please specify at least one non-zero quantity."
 msgstr "Specificeer ten minste één waarde welke niet nul is."
@@ -4869,7 +4826,7 @@ msgid "November"
 msgstr "November"
 
 #. module: stock
-#: code:addons/stock/product.py:472
+#: code:addons/stock/product.py:471
 #, python-format
 msgid "Unplanned Qty"
 msgstr "Niet geplande aantal"
@@ -4880,7 +4837,7 @@ msgid "Chained Company"
 msgstr "Gekoppeld bedrijf"
 
 #. module: stock
-#: view:stock.picking:0
+#: view:stock.picking.out:0
 msgid "Check Availability"
 msgstr "Controleer beschikbaarheid"
 
@@ -4909,7 +4866,7 @@ msgstr ""
 "voorraadmutatie, kunt u het product terug en vooruit traceren."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_fill_inventory.py:128
+#: code:addons/stock/wizard/stock_fill_inventory.py:124
 #, python-format
 msgid ""
 "No product in this location. Please select a location in the product form."
@@ -4928,14 +4885,14 @@ msgid "Move History (parent moves)"
 msgstr "Mutatiehistorie (bovenliggende mutaties)"
 
 #. module: stock
-#: code:addons/stock/product.py:454
+#: code:addons/stock/product.py:453
 #, python-format
 msgid "Future Stock"
 msgstr "Virtuele voorraad"
 
 #. module: stock
-#: code:addons/stock/stock.py:1680
-#: code:addons/stock/stock.py:1682
+#: code:addons/stock/stock.py:1663
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "Error"
 msgstr "Fout"
@@ -5068,8 +5025,6 @@ msgstr "Vertragingen"
 
 #. module: stock
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 msgid "Schedule Date"
 msgstr "Geplande datum"
 
@@ -5107,8 +5062,6 @@ msgstr "Werkelijk"
 #. module: stock
 #: field:stock.move,name:0
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 #: view:stock.production.lot.revision:0
 #: field:stock.production.lot.revision,description:0
 msgid "Description"
@@ -5132,7 +5085,6 @@ msgid "Deliver"
 msgstr "Te leveren"
 
 #. module: stock
-#: view:product.product:0
 #: field:product.product,delivery_count:0
 msgid "Delivery"
 msgstr "Levering"
@@ -5154,7 +5106,7 @@ msgid "Location Content"
 msgstr "Locatie inhoud"
 
 #. module: stock
-#: code:addons/stock/product.py:478
+#: code:addons/stock/product.py:477
 #, python-format
 msgid "Produced Qty"
 msgstr "Geproduceerd aantal"
@@ -5377,12 +5329,10 @@ msgstr "Fysieke locaties"
 #. module: stock
 #: view:stock.picking.in:0
 msgid "Ready to Process"
-msgstr "Gereed om te verwerken"
+msgstr "Gereed om te ontvangen"
 
 #. module: stock
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 msgid "Warehouse Address :"
 msgstr "Magazijn adres:"
 
diff --git a/addons/survey/i18n/de.po b/addons/survey/i18n/de.po
index bf333564ed7..de5e69180a6 100644
--- a/addons/survey/i18n/de.po
+++ b/addons/survey/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2014-05-09 09:04+0000\n"
+"Last-Translator: Claudia Haida <claudia.haida@initos.com>\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: 2013-11-21 06:37+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-05-10 07:55+0000\n"
+"X-Generator: Launchpad (build 16996)\n"
 
 #. module: survey
 #: view:survey.response.line:0
@@ -507,7 +507,7 @@ msgstr "Von"
 #. module: survey
 #: view:survey:0
 msgid "Cancel Survey"
-msgstr ""
+msgstr "Umfrage verwerfen"
 
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
@@ -1142,7 +1142,7 @@ msgstr "Multiple Textboxen mit unterschiedlichen Typen"
 #. module: survey
 #: view:survey.name.wiz:0
 msgid "Add Description"
-msgstr ""
+msgstr "Beschreibung hinzufügen"
 
 #. module: survey
 #: model:survey.type,name:survey.survey_type2
diff --git a/addons/web/i18n/ar.po b/addons/web/i18n/ar.po
index 46a0dd3dbe7..acd919e02db 100644
--- a/addons/web/i18n/ar.po
+++ b/addons/web/i18n/ar.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 06:58+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:44+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web
diff --git a/addons/web/i18n/bg.po b/addons/web/i18n/bg.po
index 517230742f1..adb1f796147 100644
--- a/addons/web/i18n/bg.po
+++ b/addons/web/i18n/bg.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 06:58+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:44+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web
diff --git a/addons/web/i18n/bn.po b/addons/web/i18n/bn.po
index 95199f3cb64..c0b63e85693 100644
--- a/addons/web/i18n/bn.po
+++ b/addons/web/i18n/bn.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 06:58+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:44+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web
diff --git a/addons/web/i18n/bs.po b/addons/web/i18n/bs.po
index d04ad62796d..cb56a9f0236 100644
--- a/addons/web/i18n/bs.po
+++ b/addons/web/i18n/bs.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 06:58+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:44+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web
diff --git a/addons/web/i18n/ca.po b/addons/web/i18n/ca.po
index 701110fc75a..8a43ac211c0 100644
--- a/addons/web/i18n/ca.po
+++ b/addons/web/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 06:58+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:45+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web
diff --git a/addons/web/i18n/cs.po b/addons/web/i18n/cs.po
index 5ef58f65a82..aebf1e4d77a 100644
--- a/addons/web/i18n/cs.po
+++ b/addons/web/i18n/cs.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 06:58+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:45+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 "X-Poedit-Language: Czech\n"
 
diff --git a/addons/web/i18n/da.po b/addons/web/i18n/da.po
index cc12f2e09e2..ddc481c3980 100644
--- a/addons/web/i18n/da.po
+++ b/addons/web/i18n/da.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 06:58+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:45+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web
diff --git a/addons/web/i18n/de.po b/addons/web/i18n/de.po
index 6367a61e99e..60b8f60028a 100644
--- a/addons/web/i18n/de.po
+++ b/addons/web/i18n/de.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 06:59+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:45+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web
diff --git a/addons/web/i18n/en_AU.po b/addons/web/i18n/en_AU.po
index 2263c32fcab..e668ca0ca1a 100644
--- a/addons/web/i18n/en_AU.po
+++ b/addons/web/i18n/en_AU.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:01+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web
diff --git a/addons/web/i18n/en_GB.po b/addons/web/i18n/en_GB.po
index 168bb32dee5..31cfe621601 100644
--- a/addons/web/i18n/en_GB.po
+++ b/addons/web/i18n/en_GB.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:00+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web
diff --git a/addons/web/i18n/es.po b/addons/web/i18n/es.po
index d486b081638..c8429bdbde8 100644
--- a/addons/web/i18n/es.po
+++ b/addons/web/i18n/es.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:00+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:46+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web
diff --git a/addons/web/i18n/es_CL.po b/addons/web/i18n/es_CL.po
index d1968dd6e31..3b74617f45e 100644
--- a/addons/web/i18n/es_CL.po
+++ b/addons/web/i18n/es_CL.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:01+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web
diff --git a/addons/web/i18n/es_CR.po b/addons/web/i18n/es_CR.po
index f7041b27bc0..ff8d79d3ba0 100644
--- a/addons/web/i18n/es_CR.po
+++ b/addons/web/i18n/es_CR.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:01+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web
diff --git a/addons/web/i18n/es_DO.po b/addons/web/i18n/es_DO.po
index 37c1c5dab4c..0f5549c7966 100644
--- a/addons/web/i18n/es_DO.po
+++ b/addons/web/i18n/es_DO.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:00+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web
diff --git a/addons/web/i18n/es_EC.po b/addons/web/i18n/es_EC.po
index 2209d82e40a..5a36dd3dc7d 100644
--- a/addons/web/i18n/es_EC.po
+++ b/addons/web/i18n/es_EC.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:01+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web
diff --git a/addons/web/i18n/es_MX.po b/addons/web/i18n/es_MX.po
index e7802f4836f..8d2ec9a189f 100644
--- a/addons/web/i18n/es_MX.po
+++ b/addons/web/i18n/es_MX.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:01+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web
diff --git a/addons/web/i18n/es_PE.po b/addons/web/i18n/es_PE.po
index f5fee398d57..ae395937d48 100644
--- a/addons/web/i18n/es_PE.po
+++ b/addons/web/i18n/es_PE.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:01+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web
diff --git a/addons/web/i18n/et.po b/addons/web/i18n/et.po
index fa025bfbdcd..4ef204882ee 100644
--- a/addons/web/i18n/et.po
+++ b/addons/web/i18n/et.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 06:59+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:45+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web
diff --git a/addons/web/i18n/eu.po b/addons/web/i18n/eu.po
index 23551fe2676..929c674e750 100644
--- a/addons/web/i18n/eu.po
+++ b/addons/web/i18n/eu.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 06:58+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:44+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web
diff --git a/addons/web/i18n/fa.po b/addons/web/i18n/fa.po
index 6a2cf7621be..82254baf7a8 100644
--- a/addons/web/i18n/fa.po
+++ b/addons/web/i18n/fa.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 06:59+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:46+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web
diff --git a/addons/web/i18n/fi.po b/addons/web/i18n/fi.po
index 597dfd88dd4..ddc0aea2898 100644
--- a/addons/web/i18n/fi.po
+++ b/addons/web/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 06:59+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:45+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web
diff --git a/addons/web/i18n/fr.po b/addons/web/i18n/fr.po
index cd8993741a3..b4587d4a740 100644
--- a/addons/web/i18n/fr.po
+++ b/addons/web/i18n/fr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 06:59+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:45+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web
diff --git a/addons/web/i18n/fr_CA.po b/addons/web/i18n/fr_CA.po
index e79e3a4a65d..9996dc5b1ed 100644
--- a/addons/web/i18n/fr_CA.po
+++ b/addons/web/i18n/fr_CA.po
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:01+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web
diff --git a/addons/web/i18n/gl.po b/addons/web/i18n/gl.po
index 3533c958de0..ef0403e0991 100644
--- a/addons/web/i18n/gl.po
+++ b/addons/web/i18n/gl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 06:59+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:45+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web
diff --git a/addons/web/i18n/gu.po b/addons/web/i18n/gu.po
index 8f6df35d506..8740b207781 100644
--- a/addons/web/i18n/gu.po
+++ b/addons/web/i18n/gu.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 06:59+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:45+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web
diff --git a/addons/web/i18n/he.po b/addons/web/i18n/he.po
index 4fb42911b13..fa09e0da755 100644
--- a/addons/web/i18n/he.po
+++ b/addons/web/i18n/he.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 06:59+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:45+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 "Language: he\n"
 
diff --git a/addons/web/i18n/hi.po b/addons/web/i18n/hi.po
index 28f9b10db8f..c71c7177a6d 100644
--- a/addons/web/i18n/hi.po
+++ b/addons/web/i18n/hi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 06:59+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:45+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web
diff --git a/addons/web/i18n/hr.po b/addons/web/i18n/hr.po
index 585069f1e49..3b0c2a3d877 100644
--- a/addons/web/i18n/hr.po
+++ b/addons/web/i18n/hr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:00+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:46+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web
diff --git a/addons/web/i18n/hu.po b/addons/web/i18n/hu.po
index 9fcd7140401..3a0b59db6f9 100644
--- a/addons/web/i18n/hu.po
+++ b/addons/web/i18n/hu.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 06:59+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:45+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web
diff --git a/addons/web/i18n/id.po b/addons/web/i18n/id.po
index 1365ec3bcbf..10c71fcde6a 100644
--- a/addons/web/i18n/id.po
+++ b/addons/web/i18n/id.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 06:59+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:45+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web
diff --git a/addons/web/i18n/it.po b/addons/web/i18n/it.po
index da75d6bfa71..29efc115b33 100644
--- a/addons/web/i18n/it.po
+++ b/addons/web/i18n/it.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 06:59+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:45+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web
diff --git a/addons/web/i18n/ja.po b/addons/web/i18n/ja.po
index 4eb3244adc3..3f1d516de00 100644
--- a/addons/web/i18n/ja.po
+++ b/addons/web/i18n/ja.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 06:59+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:45+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web
diff --git a/addons/web/i18n/ka.po b/addons/web/i18n/ka.po
index 4e2bf2bba1c..ddf3ff10c93 100644
--- a/addons/web/i18n/ka.po
+++ b/addons/web/i18n/ka.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 06:59+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:45+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web
diff --git a/addons/web/i18n/ko.po b/addons/web/i18n/ko.po
index a1a3ae13923..47cabb3b310 100644
--- a/addons/web/i18n/ko.po
+++ b/addons/web/i18n/ko.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2013-02-26 07:14+0000\n"
-"Last-Translator: Josh Kim <joshkkim@gmail.com>\n"
+"PO-Revision-Date: 2014-05-05 14:40+0000\n"
+"Last-Translator: Lee SunSin <Unknown>\n"
 "Language-Team: Korean <ko@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: 2014-04-23 06:59+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-05-06 07:27+0000\n"
+"X-Generator: Launchpad (build 16996)\n"
 
 #. module: web
 #. openerp-web
@@ -66,6 +66,9 @@ msgid ""
 "created,\n"
 "                    you will be able to install your first application."
 msgstr ""
+"OpenERP 데이터베이스를 생성하기위해 이 폼을 채워주세요. \n"
+"다른 회사나 다른 목적으로 데이터베이스를 생성할 수있습니다. (테스트용, 운영서버용)\n"
+"데이터베이스가 생성된후에, 애플리케이션을 설치할 수 있습니다."
 
 #. module: web
 #. openerp-web
@@ -74,21 +77,21 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:300
 #, python-format
 msgid "Master password:"
-msgstr "마스터 암호:"
+msgstr "마스터 비밀번호"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:292
 #, python-format
 msgid "Change Master Password"
-msgstr "마스터 암호 변경"
+msgstr "마스터 비밀번호 변경하기"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/view_form.js:2439
 #, python-format
 msgid "Today"
-msgstr ""
+msgstr "오늘"
 
 #. module: web
 #. openerp-web
@@ -116,21 +119,21 @@ msgstr "접근이 거부됨"
 #: code:addons/web/static/src/js/view_form.js:2462
 #, python-format
 msgid "Now"
-msgstr ""
+msgstr "지금"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/coresetup.js:593
 #, python-format
 msgid "about an hour ago"
-msgstr "약 한 시간 전"
+msgstr "약 1시간 전"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/view_form.js:2446
 #, python-format
 msgid "Week of the year"
-msgstr ""
+msgstr "Week of the year"
 
 #. module: web
 #. openerp-web
@@ -161,7 +164,7 @@ msgstr "'%s' 는 유효한 날짜가 아닙니다."
 #: code:addons/web/static/src/js/view_form.js:2437
 #, python-format
 msgid "Next>"
-msgstr ""
+msgstr "다음으로>"
 
 #. module: web
 #. openerp-web
@@ -188,14 +191,14 @@ msgstr "약 1분 전"
 #: code:addons/web/controllers/main.py:869
 #, python-format
 msgid "You cannot leave any password empty."
-msgstr "암호는 비워둘 수 없습니다."
+msgstr "비밀번호는 비워둘 수 없습니다."
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/chrome.js:732
 #, python-format
 msgid "Invalid username or password"
-msgstr "유효하지 않은 사용자명 또는 암호"
+msgstr "유효하지 않은 사용자명 또는 비밀번호"
 
 #. module: web
 #. openerp-web
@@ -204,7 +207,7 @@ msgstr "유효하지 않은 사용자명 또는 암호"
 #: code:addons/web/static/src/xml/base.xml:278
 #, python-format
 msgid "Master Password:"
-msgstr "마스터 암호:"
+msgstr "마스터 비밀번호"
 
 #. module: web
 #. openerp-web
@@ -212,7 +215,7 @@ msgstr "마스터 암호:"
 #: code:addons/web/static/src/xml/base.xml:1402
 #, python-format
 msgid "Select"
-msgstr "선택"
+msgstr "선택하기"
 
 #. module: web
 #. openerp-web
@@ -254,7 +257,7 @@ msgstr "'%s' 위젯 유형은 구현되지 않습니다."
 #: code:addons/web/static/src/xml/base.xml:134
 #, python-format
 msgid "e.g. mycompany"
-msgstr ""
+msgstr "예) mycompany"
 
 #. module: web
 #. openerp-web
@@ -269,7 +272,7 @@ msgstr "양식의 데이터는 폐기될 수 없습니다"
 #: code:addons/web/static/src/js/view_form.js:320
 #, python-format
 msgid "Form"
-msgstr "양식"
+msgstr "폼"
 
 #. module: web
 #. openerp-web
@@ -297,7 +300,7 @@ msgstr "유효한 숫자가 아님"
 #: code:addons/web/static/src/xml/base.xml:343
 #, python-format
 msgid "New Password:"
-msgstr "새로운 비밀번호"
+msgstr "새 비밀번호:"
 
 #. module: web
 #. openerp-web
@@ -382,7 +385,7 @@ msgstr "중복 데이터베이스"
 #: code:addons/web/static/src/xml/base.xml:354
 #, python-format
 msgid "Change Password"
-msgstr "암호 변경"
+msgstr "비밀번호 변경하기"
 
 #. module: web
 #. openerp-web
@@ -425,7 +428,7 @@ msgstr "그룹"
 #: code:addons/web/static/src/js/view_form.js:2445
 #, python-format
 msgid "Wk"
-msgstr ""
+msgstr "Wk"
 
 #. module: web
 #. openerp-web
@@ -459,7 +462,7 @@ msgstr "언어"
 #: code:addons/web/static/src/js/view_form.js:2438
 #, python-format
 msgid "Show the next month"
-msgstr ""
+msgstr "다음달 보기"
 
 #. module: web
 #. openerp-web
@@ -579,7 +582,7 @@ msgstr "1분 전"
 #: code:addons/web/static/src/js/view_form.js:2453
 #, python-format
 msgid "Select a date"
-msgstr ""
+msgstr "날짜를 선택해주세요"
 
 #. module: web
 #. openerp-web
@@ -593,7 +596,7 @@ msgstr "조건:"
 #: code:addons/web/static/src/js/view_form.js:2458
 #, python-format
 msgid "Time"
-msgstr ""
+msgstr "시간"
 
 #. module: web
 #. openerp-web
@@ -709,7 +712,7 @@ msgstr "%s 모델 필드"
 #: code:addons/web/static/src/js/search.js:2145
 #, python-format
 msgid "is set"
-msgstr ""
+msgstr "설정됨"
 
 #. module: web
 #. openerp-web
@@ -816,7 +819,7 @@ msgstr "저장 & 신규 생성"
 #: code:addons/web/static/src/js/view_form.js:2432
 #, python-format
 msgid "Erase the current date"
-msgstr ""
+msgstr "현재날짜 지우기"
 
 #. module: web
 #. openerp-web
@@ -831,7 +834,7 @@ msgstr "다른 이름으로"
 #: code:addons/web/static/src/xml/base.xml:109
 #, python-format
 msgid "Create a New Database"
-msgstr ""
+msgstr "새 데이터베이스 생성하기"
 
 #. module: web
 #. openerp-web
@@ -852,7 +855,7 @@ msgstr "1일 전"
 #: code:addons/web/static/src/xml/base.xml:138
 #, python-format
 msgid "Load demonstration data:"
-msgstr ""
+msgstr "데모 데이터 로드하기"
 
 #. module: web
 #. openerp-web
@@ -890,7 +893,7 @@ msgstr "찾기: "
 #: code:addons/web/static/src/xml/base.xml:141
 #, python-format
 msgid "Check this box to evaluate OpenERP."
-msgstr ""
+msgstr "OpenERP를 테스트해보려면 이 박스를 체크하세요"
 
 #. module: web
 #. openerp-web
@@ -977,7 +980,7 @@ msgstr "환경 설정"
 #: code:addons/web/static/src/xml/base.xml:1704
 #, python-format
 msgid "Only export selection:"
-msgstr ""
+msgstr "Only export selection:"
 
 #. module: web
 #. openerp-web
@@ -1068,14 +1071,14 @@ msgstr "암호가 성공적으로 변경되었습니다"
 #: code:addons/web/static/src/js/view_form.js:2379
 #, python-format
 msgid "Resource Error"
-msgstr ""
+msgstr "리소스 에러"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/view_form.js:2459
 #, python-format
 msgid "Hour"
-msgstr ""
+msgstr "시간"
 
 #. module: web
 #. openerp-web
@@ -1105,7 +1108,7 @@ msgstr "삭제"
 #: code:addons/web/static/src/xml/base.xml:425
 #, python-format
 msgid "My OpenERP.com account"
-msgstr ""
+msgstr "나의 OpenERP.com 계정"
 
 #. module: web
 #. openerp-web
@@ -1191,14 +1194,14 @@ msgstr "찾기"
 #: code:addons/web/static/src/js/view_form.js:2435
 #, python-format
 msgid "<Prev"
-msgstr ""
+msgstr "<이전으로"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/view_form.js:2450
 #, python-format
 msgid "Set DD as first week day"
-msgstr ""
+msgstr "첫번째 주의 일(日)자로 DD를 설정하기"
 
 #. module: web
 #. openerp-web
@@ -1208,6 +1211,8 @@ msgid ""
 "By default, the master password is 'admin'. This password\n"
 "                    is required to created, delete dump or restore databases."
 msgstr ""
+"기본값으로, 마스터 비밀번호는 'admin' 입니다. \n"
+"이 비밀번호는 데이터베이스를 생성및 복구하거나 덤프를 삭제할때 필요합니다."
 
 #. module: web
 #. openerp-web
@@ -1298,7 +1303,7 @@ msgstr "알 수 없는 %s 작업자가 %s 도메인에 존재함"
 #: code:addons/web/static/src/js/view_form.js:2436
 #, python-format
 msgid "Show the previous month"
-msgstr ""
+msgstr "이전 달(月 ) 보이기"
 
 #. module: web
 #. openerp-web
@@ -1416,7 +1421,7 @@ msgstr "분류 기준: %s"
 #: code:addons/web/static/src/js/view_form.js:2443
 #, python-format
 msgid "Show a different month"
-msgstr ""
+msgstr "다른 달(月 ) 보이기"
 
 #. module: web
 #. openerp-web
@@ -1481,6 +1486,8 @@ msgstr "모두 삭제"
 #, python-format
 msgid "Your OpenERP session expired. Please refresh the current web page."
 msgstr ""
+"OpenERP의 세션이 만료되었습니다. \r\n"
+"현재 웹페이지를 새로고침하여주세요."
 
 #. module: web
 #. openerp-web
@@ -1552,7 +1559,7 @@ msgstr "99+"
 #: code:addons/web/static/src/xml/base.xml:427
 #, python-format
 msgid "Help"
-msgstr ""
+msgstr "도움말"
 
 #. module: web
 #. openerp-web
@@ -1664,21 +1671,21 @@ msgstr "%s 추가"
 #: code:addons/web/static/src/js/view_form.js:2434
 #, python-format
 msgid "Close without change"
-msgstr ""
+msgstr "변경하지말고 닫기"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:159
 #, python-format
 msgid "Choose a password:"
-msgstr ""
+msgstr "비빌번호를 선택하세요"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/view_form.js:2451
 #, python-format
 msgid "Select D, M d"
-msgstr ""
+msgstr "D, M d 를 선택해주세요"
 
 #. module: web
 #. openerp-web
@@ -1700,7 +1707,7 @@ msgstr "CSV 파일:"
 #: code:addons/web/static/src/js/view_form.js:2460
 #, python-format
 msgid "Minute"
-msgstr ""
+msgstr "분"
 
 #. module: web
 #. openerp-web
@@ -1763,7 +1770,7 @@ msgstr "데이터 베이스 삭제"
 #: code:addons/web/static/src/xml/base.xml:467
 #, python-format
 msgid "Powered by"
-msgstr ""
+msgstr "Powered by"
 
 #. module: web
 #. openerp-web
@@ -1778,7 +1785,7 @@ msgstr "예"
 #: code:addons/web/static/src/js/chrome.js:1350
 #, python-format
 msgid "Timezone Mismatch"
-msgstr ""
+msgstr "시간대 불일치"
 
 #. module: web
 #. openerp-web
@@ -1813,7 +1820,7 @@ msgstr "--- 가져오지 않기 ---"
 #: code:addons/web/static/src/xml/base.xml:1697
 #, python-format
 msgid "Import-Compatible Export"
-msgstr ""
+msgstr "가져오기-호환 파일 내보내기"
 
 #. module: web
 #. openerp-web
@@ -1870,7 +1877,7 @@ msgstr "화면 관리"
 #: code:addons/web/static/src/js/view_form.js:2349
 #, python-format
 msgid "E-mail Error"
-msgstr ""
+msgstr "이메일 에러"
 
 #. module: web
 #. openerp-web
@@ -1964,7 +1971,7 @@ msgstr "다음 생성: "
 #: code:addons/web/static/src/js/view_form.js:2463
 #, python-format
 msgid "Done"
-msgstr ""
+msgstr "완료되었습니다"
 
 #. module: web
 #. openerp-web
@@ -2089,7 +2096,7 @@ msgstr "-- 필터 --"
 #: code:addons/web/static/src/js/search.js:2165
 #, python-format
 msgid "%(field)s %(operator)s"
-msgstr ""
+msgstr "%(field)s %(operator)s"
 
 #. module: web
 #. openerp-web
@@ -2139,7 +2146,7 @@ msgstr "데이터베이스에서 기록을 찾을 수 없습니다."
 #: code:addons/web/static/src/js/view_form.js:2444
 #, python-format
 msgid "Show a different year"
-msgstr ""
+msgstr "다른 년도 보이기"
 
 #. module: web
 #. openerp-web
@@ -2182,7 +2189,7 @@ msgstr "불러오는 중"
 #: code:addons/web/static/src/js/view_form.js:2440
 #, python-format
 msgid "Show the current month"
-msgstr ""
+msgstr "현재 월 보이기"
 
 #. module: web
 #. openerp-web
@@ -2226,7 +2233,7 @@ msgstr "삭제"
 #: code:addons/web/static/src/xml/base.xml:132
 #, python-format
 msgid "Select a database name:"
-msgstr ""
+msgstr "데이터베이스명을 선택해주세요"
 
 #. module: web
 #. openerp-web
@@ -2433,7 +2440,7 @@ msgstr "내보낼 필드를 선택하세요..."
 #: code:addons/web/static/src/js/search.js:2146
 #, python-format
 msgid "is not set"
-msgstr ""
+msgstr "설정되지 않음"
 
 #. module: web
 #. openerp-web
@@ -2560,7 +2567,7 @@ msgstr "무시"
 #: code:addons/web/static/src/js/view_form.js:5314
 #, python-format
 msgid "Uploading Error"
-msgstr ""
+msgstr "업로드 에러"
 
 #. module: web
 #. openerp-web
@@ -2595,7 +2602,7 @@ msgstr "o2m 기록은 액션을 사용하기 전에 저장되어야 합니다."
 #: code:addons/web/static/src/js/chrome.js:531
 #, python-format
 msgid "Backed"
-msgstr ""
+msgstr "백업됨"
 
 #. module: web
 #. openerp-web
@@ -2656,7 +2663,7 @@ msgstr "액션 편집"
 #, python-format
 msgid ""
 "This filter is global and will be removed for everybody if you continue."
-msgstr ""
+msgstr "이 필터는 글로벌이며, 만약 계속한다면 모두에게 제거됩니다."
 
 #. module: web
 #. openerp-web
@@ -2670,7 +2677,7 @@ msgstr "ID:"
 #: code:addons/web/static/src/xml/base.xml:892
 #, python-format
 msgid "Only you"
-msgstr ""
+msgstr "Only you"
 
 #. module: web
 #. openerp-web
@@ -2798,7 +2805,7 @@ msgstr "암호"
 #: code:addons/web/static/src/js/view_form.js:2457
 #, python-format
 msgid "Choose Time"
-msgstr ""
+msgstr "Choose Time"
 
 #. module: web
 #. openerp-web
@@ -2864,7 +2871,7 @@ msgstr "구분자:"
 #: code:addons/web/static/src/js/view_form.js:2461
 #, python-format
 msgid "Second"
-msgstr ""
+msgstr "Second"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/lo.po b/addons/web/i18n/lo.po
index 24d55e15e70..b0aea857eab 100644
--- a/addons/web/i18n/lo.po
+++ b/addons/web/i18n/lo.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 06:59+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:46+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web
diff --git a/addons/web/i18n/lt.po b/addons/web/i18n/lt.po
index a1c75e0ddb0..b612b0aefb0 100644
--- a/addons/web/i18n/lt.po
+++ b/addons/web/i18n/lt.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 06:59+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:46+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web
diff --git a/addons/web/i18n/lv.po b/addons/web/i18n/lv.po
index 0fe49f4e1d6..bf2f6e9c219 100644
--- a/addons/web/i18n/lv.po
+++ b/addons/web/i18n/lv.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 06:59+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:46+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web
diff --git a/addons/web/i18n/mk.po b/addons/web/i18n/mk.po
index 83cea2ef075..2bb480ec821 100644
--- a/addons/web/i18n/mk.po
+++ b/addons/web/i18n/mk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 06:59+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:46+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web
diff --git a/addons/web/i18n/mn.po b/addons/web/i18n/mn.po
index cfcded816b2..4ab263352b1 100644
--- a/addons/web/i18n/mn.po
+++ b/addons/web/i18n/mn.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 06:59+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:46+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web
diff --git a/addons/web/i18n/nb.po b/addons/web/i18n/nb.po
index 4c3c5cee606..3cd6bfb0b00 100644
--- a/addons/web/i18n/nb.po
+++ b/addons/web/i18n/nb.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2013-10-03 11:34+0000\n"
-"Last-Translator: Rolv Råen <Unknown>\n"
+"PO-Revision-Date: 2014-05-11 00:23+0000\n"
+"Last-Translator: Kenneth Aalberg <kenneaal@gmail.com>\n"
 "Language-Team: Norwegian Bokmal <nb@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: 2014-04-23 06:59+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-05-11 07:08+0000\n"
+"X-Generator: Launchpad (build 16996)\n"
 
 #. module: web
 #. openerp-web
@@ -52,7 +52,7 @@ msgstr "%(field)s %(operator)s \"%(value)s\""
 #: code:addons/web/static/src/js/search.js:2124
 #, python-format
 msgid "less or equal than"
-msgstr "mindre eller lik enn"
+msgstr "Mindre enn eller lik"
 
 #. module: web
 #. openerp-web
@@ -66,6 +66,10 @@ msgid ""
 "created,\n"
 "                    you will be able to install your first application."
 msgstr ""
+"Fyll inn dette skjemaet for å skape en OpenERP database.Du kan\n"
+"          lage databaser for forskjellige firmaer eller forskjellige\n"
+"          mål (Testing eller produksjon). Når databasen er skapt,\n"
+"          kan du installere din første applikasjon."
 
 #. module: web
 #. openerp-web
@@ -95,14 +99,14 @@ msgstr "I dag."
 #: code:addons/web/static/src/js/chrome.js:513
 #, python-format
 msgid "Do you really want to delete the database: %s ?"
-msgstr "Vil du virkelig slette databaen: %s ?"
+msgstr "Vil du virkelig slette databasen: %s ?"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/search.js:1502
 #, python-format
 msgid "Search %(field)s at: %(value)s"
-msgstr ""
+msgstr "Søk %(field)s ved: %(value)s"
 
 #. module: web
 #. openerp-web
@@ -130,7 +134,7 @@ msgstr "omtrent en time siden"
 #: code:addons/web/static/src/js/view_form.js:2446
 #, python-format
 msgid "Week of the year"
-msgstr ""
+msgstr "Ukenummer"
 
 #. module: web
 #. openerp-web
@@ -139,14 +143,14 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:234
 #, python-format
 msgid "Backup Database"
-msgstr ""
+msgstr "Sikkerhetskopier database"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/views.js:518
 #, python-format
 msgid "%(view_type)s view"
-msgstr ""
+msgstr "%(view_type)s visning"
 
 #. module: web
 #. openerp-web
@@ -188,7 +192,7 @@ msgstr "omtrent ett minutt siden"
 #: code:addons/web/controllers/main.py:869
 #, python-format
 msgid "You cannot leave any password empty."
-msgstr "Du kan ha tomme passord"
+msgstr "Du kan ikke ha tomme passord."
 
 #. module: web
 #. openerp-web
@@ -233,7 +237,7 @@ msgstr "Versjon"
 #: code:addons/web/static/src/xml/base.xml:592
 #, python-format
 msgid "Latest Modification Date:"
-msgstr "Sist endret dato:"
+msgstr "Siste endring:"
 
 #. module: web
 #. openerp-web
@@ -247,21 +251,21 @@ msgstr "M2O søkefelt kan for øyeblikket ikke håndtere flere standardverdier"
 #: code:addons/web/static/src/js/view_form.js:1241
 #, python-format
 msgid "Widget type '%s' is not implemented"
-msgstr ""
+msgstr "Widget type '%s' er ikke implementert"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:134
 #, python-format
 msgid "e.g. mycompany"
-msgstr ""
+msgstr "f.eks mittfirma"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/view_list_editable.js:793
 #, python-format
 msgid "The form's data can not be discarded"
-msgstr ""
+msgstr "Skjemaets data kan ikke forkastes"
 
 #. module: web
 #. openerp-web
@@ -276,7 +280,7 @@ msgstr "Skjema"
 #: code:addons/web/static/src/xml/base.xml:1352
 #, python-format
 msgid "(no string)"
-msgstr ""
+msgstr "(ingen streng)"
 
 #. module: web
 #. openerp-web
@@ -325,7 +329,7 @@ msgstr "Ikke definert"
 #: code:addons/web/static/src/js/view_form.js:5002
 #, python-format
 msgid "File Upload"
-msgstr ""
+msgstr "Filopplasting"
 
 #. module: web
 #. openerp-web
@@ -346,7 +350,7 @@ msgstr "Egendefinerte  filtre"
 #: code:addons/web/static/src/xml/base.xml:1364
 #, python-format
 msgid "Button Type:"
-msgstr ""
+msgstr "Knappetype:"
 
 #. module: web
 #. openerp-web
@@ -367,7 +371,7 @@ msgstr "Egendefinert filter"
 #: code:addons/web/static/src/xml/base.xml:177
 #, python-format
 msgid "Duplicate Database"
-msgstr ""
+msgstr "Dupliser database"
 
 #. module: web
 #. openerp-web
@@ -382,7 +386,7 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:354
 #, python-format
 msgid "Change Password"
-msgstr "Bytt passord"
+msgstr "Endre passord"
 
 #. module: web
 #. openerp-web
@@ -396,7 +400,7 @@ msgstr "visningstype '%s' er ikke støttet i en-til-mange."
 #: code:addons/web/static/src/xml/base.xml:189
 #, python-format
 msgid "Original database name:"
-msgstr "Opprinnelige database navn:"
+msgstr "Opprinnelig databasenavn:"
 
 #. module: web
 #. openerp-web
@@ -411,7 +415,7 @@ msgstr "Last ned"
 #: code:addons/web/static/src/js/formats.js:270
 #, python-format
 msgid "'%s' is not a correct datetime"
-msgstr ""
+msgstr "'%s' er ikke korrekt datotidsformat"
 
 #. module: web
 #. openerp-web
@@ -425,14 +429,14 @@ msgstr "Gruppe"
 #: code:addons/web/static/src/js/view_form.js:2445
 #, python-format
 msgid "Wk"
-msgstr ""
+msgstr "Uke"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:949
 #, python-format
 msgid "Unhandled widget"
-msgstr ""
+msgstr "Uhåndtert widget"
 
 #. module: web
 #. openerp-web
@@ -459,7 +463,7 @@ msgstr "Språk"
 #: code:addons/web/static/src/js/view_form.js:2438
 #, python-format
 msgid "Show the next month"
-msgstr ""
+msgstr "Vis neste måned"
 
 #. module: web
 #. openerp-web
@@ -494,7 +498,7 @@ msgstr "Last opp fil"
 #: code:addons/web/static/src/js/view_form.js:3925
 #, python-format
 msgid "Action Button"
-msgstr ""
+msgstr "Handlingsknapp"
 
 #. module: web
 #. openerp-web
@@ -516,7 +520,7 @@ msgstr "inneholder"
 #: code:addons/web/static/src/js/coresetup.js:623
 #, python-format
 msgid "Take a minute to get a coffee,<br />because it's loading..."
-msgstr ""
+msgstr "Ta deg en kaffepause,<br />vi laster inn..."
 
 #. module: web
 #. openerp-web
@@ -537,7 +541,7 @@ msgstr "Laster (%d)"
 #: code:addons/web/static/src/js/search.js:1216
 #, python-format
 msgid "GroupBy"
-msgstr ""
+msgstr "GrupperEtter"
 
 #. module: web
 #. openerp-web
@@ -572,14 +576,14 @@ msgstr "Relasjon:"
 #: code:addons/web/static/src/js/coresetup.js:590
 #, python-format
 msgid "less than a minute ago"
-msgstr "Mindre enn et minutt siden"
+msgstr "mindre enn ett minutt siden"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/view_form.js:2453
 #, python-format
 msgid "Select a date"
-msgstr ""
+msgstr "Velg en dato"
 
 #. module: web
 #. openerp-web
@@ -593,14 +597,14 @@ msgstr "Tilstand:"
 #: code:addons/web/static/src/js/view_form.js:2458
 #, python-format
 msgid "Time"
-msgstr ""
+msgstr "Tid"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/view_form.js:1709
 #, python-format
 msgid "Unsupported operator %s in domain %s"
-msgstr ""
+msgstr "Ustøttet operatør % s i domenet %s"
 
 #. module: web
 #. openerp-web
@@ -635,7 +639,7 @@ msgstr "Lag og rediger..."
 #: code:addons/web/static/src/js/pyeval.js:736
 #, python-format
 msgid "Unknown nonliteral type "
-msgstr ""
+msgstr "Ukjent type "
 
 #. module: web
 #. openerp-web
@@ -670,35 +674,35 @@ msgstr "UTF-8"
 #: code:addons/web/static/src/xml/base.xml:443
 #, python-format
 msgid "For more information visit"
-msgstr "For mer informasjon besøk"
+msgstr "For mer informasjon, besøk"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:1880
 #, python-format
 msgid "Add All Info..."
-msgstr ""
+msgstr "Legg til all informasjon..."
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:1701
 #, python-format
 msgid "Export Formats"
-msgstr ""
+msgstr "Eksporter formater"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:996
 #, python-format
 msgid "On change:"
-msgstr ""
+msgstr "Ved endring:"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/views.js:939
 #, python-format
 msgid "Model %s fields"
-msgstr ""
+msgstr "Modeller %s felt"
 
 #. module: web
 #. openerp-web
@@ -753,28 +757,30 @@ msgstr "Lagre filter"
 #: code:addons/web/static/src/xml/base.xml:1372
 #, python-format
 msgid "Action ID:"
-msgstr ""
+msgstr "HandlingsID:"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:479
 #, python-format
 msgid "Your user's preference timezone does not match your browser timezone:"
-msgstr "Din brukers tidssone er ikke i samsvar med nettleserens tidssone:"
+msgstr ""
+"Tidssone satt i brukerpreferanser er ikke i samsvar med nettleserens "
+"tidssone:"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/view_form.js:1237
 #, python-format
 msgid "Field '%s' specified in view could not be found."
-msgstr ""
+msgstr "Felt '%s' spesifisert i visning ble ikke funnet."
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:1777
 #, python-format
 msgid "Saved exports:"
-msgstr "Lagrede eskporter:"
+msgstr "Lagrede eksporter:"
 
 #. module: web
 #. openerp-web
@@ -809,14 +815,14 @@ msgstr "Bruk"
 #: code:addons/web/static/src/xml/base.xml:1414
 #, python-format
 msgid "Save & New"
-msgstr "Lagre & Opprett ny"
+msgstr "Lagre & Ny"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/view_form.js:2432
 #, python-format
 msgid "Erase the current date"
-msgstr ""
+msgstr "Slett nåværende dato"
 
 #. module: web
 #. openerp-web
@@ -831,7 +837,7 @@ msgstr "Lagre som"
 #: code:addons/web/static/src/xml/base.xml:109
 #, python-format
 msgid "Create a New Database"
-msgstr ""
+msgstr "Lag ny database"
 
 #. module: web
 #. openerp-web
@@ -852,7 +858,7 @@ msgstr "en dag siden"
 #: code:addons/web/static/src/xml/base.xml:138
 #, python-format
 msgid "Load demonstration data:"
-msgstr ""
+msgstr "Last eksempeldata:"
 
 #. module: web
 #. openerp-web
@@ -877,7 +883,7 @@ msgid ""
 "\n"
 "Are you sure you want to leave this page ?"
 msgstr ""
-"Advarsel, endringene vil bli forkastet.\n"
+"Advarsel, du har gjort endringer som vil bli forkastet.\n"
 "\n"
 "Er du sikker på at du vil forlate denne siden?"
 
@@ -893,7 +899,7 @@ msgstr "Søk: "
 #: code:addons/web/static/src/xml/base.xml:141
 #, python-format
 msgid "Check this box to evaluate OpenERP."
-msgstr ""
+msgstr "Merk denne boksen for å evaluere OpenERP."
 
 #. module: web
 #. openerp-web
@@ -928,7 +934,7 @@ msgstr "Filternavn"
 #: code:addons/web/static/src/xml/base.xml:1490
 #, python-format
 msgid "-- Actions --"
-msgstr "-- Aksjon --"
+msgstr "-- Handlinger --"
 
 #. module: web
 #. openerp-web
@@ -973,21 +979,21 @@ msgstr "Legg til …"
 #: code:addons/web/static/src/xml/base.xml:424
 #, python-format
 msgid "Preferences"
-msgstr "Innstillinger"
+msgstr "Brukervalg"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:1704
 #, python-format
 msgid "Only export selection:"
-msgstr ""
+msgstr "Eksporter kun utvalg:"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/view_form.js:435
 #, python-format
 msgid "Wrong on change format: %s"
-msgstr ""
+msgstr "Feil endringsformat: %s"
 
 #. module: web
 #. openerp-web
@@ -1011,7 +1017,7 @@ msgstr "Lukk"
 #: code:addons/web/static/src/xml/base.xml:488
 #, python-format
 msgid "Click here to change your user's timezone."
-msgstr "Klikk hr for å endre brukerens tidssone."
+msgstr "Klikk her for å endre din brukers tidssone."
 
 #. module: web
 #. openerp-web
@@ -1025,7 +1031,7 @@ msgstr "Modifikatorer:"
 #: code:addons/web/static/src/xml/base.xml:649
 #, python-format
 msgid "Delete this attachment"
-msgstr "Slett vedlegget"
+msgstr "Slett dette vedlegget"
 
 #. module: web
 #. openerp-web
@@ -1043,7 +1049,7 @@ msgstr "Lagre"
 #: code:addons/web/static/src/xml/base.xml:370
 #, python-format
 msgid "More"
-msgstr "(mer...)"
+msgstr "Mer"
 
 #. module: web
 #. openerp-web
@@ -1071,21 +1077,21 @@ msgstr "Passordet er endret"
 #: code:addons/web/static/src/js/view_form.js:2379
 #, python-format
 msgid "Resource Error"
-msgstr ""
+msgstr "Ressursfeil"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/view_form.js:2459
 #, python-format
 msgid "Hour"
-msgstr ""
+msgstr "Time"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:555
 #, python-format
 msgid "Debug View#"
-msgstr "Feilsøk Visning#"
+msgstr "Feilsøkningsvisning#"
 
 #. module: web
 #. openerp-web
@@ -1108,7 +1114,7 @@ msgstr "Slett"
 #: code:addons/web/static/src/xml/base.xml:425
 #, python-format
 msgid "My OpenERP.com account"
-msgstr ""
+msgstr "Min OpenERP.com konto"
 
 #. module: web
 #. openerp-web
@@ -1120,6 +1126,10 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"Lokal evalueringsfeil\n"
+"%s\n"
+"\n"
+"%s"
 
 #. module: web
 #. openerp-web
@@ -1168,7 +1178,7 @@ msgstr "Feil, passordet er ikke endret !"
 #: code:addons/web/static/src/js/view_form.js:4981
 #, python-format
 msgid "The selected file exceed the maximum file size of %s."
-msgstr "Den valgte filen har overskredet maks fil-størrelse på %s."
+msgstr "Den valgte filen har overskredet maks filstørrelse på %s."
 
 #. module: web
 #. openerp-web
@@ -1176,7 +1186,7 @@ msgstr "Den valgte filen har overskredet maks fil-størrelse på %s."
 #: code:addons/web/static/src/xml/base.xml:568
 #, python-format
 msgid "View"
-msgstr "Visning"
+msgstr "Vis"
 
 #. module: web
 #. openerp-web
@@ -1190,14 +1200,14 @@ msgstr "Søk"
 #: code:addons/web/static/src/js/view_form.js:2435
 #, python-format
 msgid "<Prev"
-msgstr ""
+msgstr "<Forrige"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/view_form.js:2450
 #, python-format
 msgid "Set DD as first week day"
-msgstr ""
+msgstr "Set DD som første ukedag"
 
 #. module: web
 #. openerp-web
@@ -1207,6 +1217,9 @@ msgid ""
 "By default, the master password is 'admin'. This password\n"
 "                    is required to created, delete dump or restore databases."
 msgstr ""
+"Hovedpassordet er etter installasjon 'admin'. Dette passordet\n"
+"                 kreves for å lage, slette, eksportere eller gjenopprette "
+"databaser."
 
 #. module: web
 #. openerp-web
@@ -1236,7 +1249,7 @@ msgstr "'%s' er ikke en gyldig dato"
 #: code:addons/web/static/src/xml/base.xml:955
 #, python-format
 msgid "(nolabel)"
-msgstr ""
+msgstr "(ingen merking)"
 
 #. module: web
 #. openerp-web
@@ -1250,7 +1263,7 @@ msgstr "%d dager siden"
 #: code:addons/web/static/src/xml/base.xml:1500
 #, python-format
 msgid "(Any existing filter with the same name will be replaced)"
-msgstr "(Eksisterende filter med samme navn vil bli erstattet)"
+msgstr "(Eventuelt eksisterende filter med samme navn vil bli erstattet)"
 
 #. module: web
 #. openerp-web
@@ -1269,7 +1282,7 @@ msgstr "Avbryt"
 #: code:addons/web/static/src/xml/base.xml:9
 #, python-format
 msgid "Loading..."
-msgstr "Laster…"
+msgstr "Laster inn …"
 
 #. module: web
 #. openerp-web
@@ -1283,21 +1296,21 @@ msgstr "Sist endret av:"
 #: code:addons/web/static/src/xml/base.xml:492
 #, python-format
 msgid "Timezone mismatch"
-msgstr ""
+msgstr "Uoverenstemmelse mellom tidssoner"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/view_form.js:1663
 #, python-format
 msgid "Unknown operator %s in domain %s"
-msgstr ""
+msgstr "Ukjent operator %s i domene %s"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/view_form.js:2436
 #, python-format
 msgid "Show the previous month"
-msgstr ""
+msgstr "Vis forrige måned"
 
 #. module: web
 #. openerp-web
@@ -1311,7 +1324,7 @@ msgstr "%d / %d"
 #: code:addons/web/static/src/xml/base.xml:1803
 #, python-format
 msgid "2. Check your file format"
-msgstr "Sjekk filformatet ditt"
+msgstr "2. Sjekk filformatet ditt"
 
 #. module: web
 #. openerp-web
@@ -1328,6 +1341,10 @@ msgid ""
 "Select a .CSV file to import. If you need a sample of file to import,\n"
 "       you should use the export tool with the \"Import Compatible\" option."
 msgstr ""
+"Velg en .CSV fil som skal importeres. Om du trenger en fil-prøve til å "
+"importere,\n"
+"       bør du bruke eksportverktøyet med \"Import Kompatibel\" alternativet "
+"valgt."
 
 #. module: web
 #. openerp-web
@@ -1377,7 +1394,7 @@ msgstr "Logg inn"
 #: code:addons/web/static/src/xml/base.xml:442
 #, python-format
 msgid "Licenced under the terms of"
-msgstr ""
+msgstr "Lisensiert under vilkårene i"
 
 #. module: web
 #. openerp-web
@@ -1399,7 +1416,7 @@ msgstr "Eksporttype:"
 #: code:addons/web/static/src/xml/base.xml:428
 #, python-format
 msgid "Log out"
-msgstr "Logg ut"
+msgstr "Logg av"
 
 #. module: web
 #. openerp-web
@@ -1413,7 +1430,7 @@ msgstr "Grupper etter: %s"
 #: code:addons/web/static/src/js/view_form.js:2443
 #, python-format
 msgid "Show a different month"
-msgstr ""
+msgstr "Vis en annen måned"
 
 #. module: web
 #. openerp-web
@@ -1435,14 +1452,14 @@ msgstr "Eksporter"
 #: code:addons/web/static/src/js/data_export.js:31
 #, python-format
 msgid "Export To File"
-msgstr "Eksport til fil"
+msgstr "Eksporter til fil"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/views.js:1172
 #, python-format
 msgid "You must choose at least one record."
-msgstr "Du må minst velge en post"
+msgstr "Du må velge minst en post."
 
 #. module: web
 #. openerp-web
@@ -1470,14 +1487,14 @@ msgstr "Fant ikke id i datasettet"
 #: code:addons/web/static/src/xml/base.xml:1728
 #, python-format
 msgid "Remove All"
-msgstr "Fjern alt"
+msgstr "Fjern alle"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/chrome.js:253
 #, python-format
 msgid "Your OpenERP session expired. Please refresh the current web page."
-msgstr ""
+msgstr "Din OpenERP-sesjon har utløpt. Vennligst last inn nettsiden på nytt."
 
 #. module: web
 #. openerp-web
@@ -1505,7 +1522,7 @@ msgstr "Bekreftelsen samsvarer ikke med passordet"
 #: code:addons/web/static/src/xml/base.xml:463
 #, python-format
 msgid "Edit Company data"
-msgstr "Rediger selskapets data"
+msgstr "Rediger selskapsdata"
 
 #. module: web
 #. openerp-web
@@ -1519,14 +1536,14 @@ msgstr "Lagre som..."
 #: code:addons/web/static/src/js/view_form.js:5138
 #, python-format
 msgid "Could not display the selected image."
-msgstr "Fant ikke det valgte bildet."
+msgstr "Kunne ikke vise det valgte bildet."
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/chrome.js:531
 #, python-format
 msgid "Database backed up successfully"
-msgstr ""
+msgstr "Sikkerhetskopiering av databasen er utført"
 
 #. module: web
 #. openerp-web
@@ -1536,6 +1553,8 @@ msgid ""
 "For use if CSV files have titles on multiple lines, skips more than a single "
 "line during import"
 msgstr ""
+"For bruk med CSV filer som har titler på flere linjer, hopper over mer enn "
+"en enkelt linje ved import"
 
 #. module: web
 #. openerp-web
@@ -1556,7 +1575,7 @@ msgstr "Hjelp"
 #: code:addons/web/static/src/xml/base.xml:558
 #, python-format
 msgid "Toggle Form Layout Outline"
-msgstr ""
+msgstr "Skru av/på skjema layout utlinjer"
 
 #. module: web
 #. openerp-web
@@ -1594,7 +1613,7 @@ msgstr "Avansert"
 #: code:addons/web/static/src/js/search.js:2119
 #, python-format
 msgid "is equal to"
-msgstr "er lik som"
+msgstr "er lik"
 
 #. module: web
 #. openerp-web
@@ -1661,21 +1680,21 @@ msgstr "Legg til %s"
 #: code:addons/web/static/src/js/view_form.js:2434
 #, python-format
 msgid "Close without change"
-msgstr ""
+msgstr "Lukk uten endringer"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:159
 #, python-format
 msgid "Choose a password:"
-msgstr ""
+msgstr "Velg et passord:"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/view_form.js:2451
 #, python-format
 msgid "Select D, M d"
-msgstr ""
+msgstr "Velg D, M d"
 
 #. module: web
 #. openerp-web
@@ -1699,7 +1718,7 @@ msgstr "CSV fil:"
 #: code:addons/web/static/src/js/view_form.js:2460
 #, python-format
 msgid "Minute"
-msgstr ""
+msgstr "Minutt"
 
 #. module: web
 #. openerp-web
@@ -1777,7 +1796,7 @@ msgstr "Ja"
 #: code:addons/web/static/src/js/chrome.js:1350
 #, python-format
 msgid "Timezone Mismatch"
-msgstr ""
+msgstr "Tidssoner samsvarer ikke"
 
 #. module: web
 #. openerp-web
@@ -1833,7 +1852,7 @@ msgstr "Ukjent m2m kommando %s"
 #: code:addons/web/static/src/js/view_form.js:1078
 #, python-format
 msgid "Save default"
-msgstr ""
+msgstr "Lagre som standard"
 
 #. module: web
 #. openerp-web
@@ -1841,7 +1860,7 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:282
 #, python-format
 msgid "New database name:"
-msgstr "Nytt databasenavn:"
+msgstr "Navn på ny database:"
 
 #. module: web
 #. openerp-web
@@ -1862,28 +1881,28 @@ msgstr "Feltet er tomt, det er ingenting å lagre !"
 #: code:addons/web/static/src/xml/base.xml:567
 #, python-format
 msgid "Manage Views"
-msgstr "Administrere visninger"
+msgstr "Administrer visninger"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/view_form.js:2349
 #, python-format
 msgid "E-mail Error"
-msgstr ""
+msgstr "Epost feil"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:1822
 #, python-format
 msgid "Encoding:"
-msgstr "Koding:"
+msgstr "Tegnkoding:"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:1829
 #, python-format
 msgid "Lines to skip"
-msgstr ""
+msgstr "Linjer å hoppe over"
 
 #. module: web
 #. openerp-web
@@ -1897,7 +1916,7 @@ msgstr "Opprett \"<strong>%s</strong>\""
 #: code:addons/web/static/src/js/data_export.js:362
 #, python-format
 msgid "Please select fields to save export list..."
-msgstr ""
+msgstr "Velg felt som skal lagres til eksportliste..."
 
 #. module: web
 #. openerp-web
@@ -1911,7 +1930,7 @@ msgstr "Opphavsrett © 2004-I DAG OpenERP SA. Med enerett."
 #: code:addons/web/static/src/js/view_form.js:2379
 #, python-format
 msgid "This resource is empty"
-msgstr ""
+msgstr "Denne ressursen er tom"
 
 #. module: web
 #. openerp-web
@@ -1963,14 +1982,14 @@ msgstr "Opprett: "
 #: code:addons/web/static/src/js/view_form.js:2463
 #, python-format
 msgid "Done"
-msgstr ""
+msgstr "Ferdig"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:562
 #, python-format
 msgid "View Fields"
-msgstr ""
+msgstr "Vis felt"
 
 #. module: web
 #. openerp-web
@@ -1984,7 +2003,7 @@ msgstr "Bekreft nytt passord:"
 #: code:addons/web/static/src/js/view_list.js:587
 #, python-format
 msgid "Do you really want to remove these records?"
-msgstr "Ønsker du virkelig å slette disse oppføringene?"
+msgstr "Ønsker du virkelig å slette disse postene?"
 
 #. module: web
 #. openerp-web
@@ -2080,7 +2099,7 @@ msgstr "Søk igjen"
 #: code:addons/web/static/src/xml/base.xml:1481
 #, python-format
 msgid "-- Filters --"
-msgstr "-- Filtre --"
+msgstr "-- Filter --"
 
 #. module: web
 #. openerp-web
@@ -2088,14 +2107,14 @@ msgstr "-- Filtre --"
 #: code:addons/web/static/src/js/search.js:2165
 #, python-format
 msgid "%(field)s %(operator)s"
-msgstr ""
+msgstr "%(field)s %(operator)s"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:1698
 #, python-format
 msgid "Export all Data"
-msgstr "Eksporter all data"
+msgstr "Eksporter alle data"
 
 #. module: web
 #. openerp-web
@@ -2105,13 +2124,15 @@ msgid ""
 "Grouping on field '%s' is not possible because that field does not appear in "
 "the list view."
 msgstr ""
+"Det er ikke mulig å gruppere på felt '%s' da feltet ikke vises i "
+"listevisning."
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:559
 #, python-format
 msgid "Set Defaults"
-msgstr ""
+msgstr "Sett til standardverdier"
 
 #. module: web
 #. openerp-web
@@ -2123,9 +2144,9 @@ msgid ""
 "            You can export all data or only the fields that can be "
 "reimported after modification."
 msgstr ""
-"Denne veiviseren vil eksportere all data som samsvarer med gjeldende "
-"søkekriterier til en CSV file.\n"
-"            Du kan eksportere all data eller kun de felter som kan re-"
+"Denne veiviseren vil eksportere alle data som samsvarer med gjeldende "
+"søkekriterier til en CSV fil.\n"
+"            Du kan eksportere alle data, eller kun de felter som kan re-"
 "importeres etter modifisering."
 
 #. module: web
@@ -2133,14 +2154,14 @@ msgstr ""
 #: code:addons/web/static/src/js/view_form.js:320
 #, python-format
 msgid "The record could not be found in the database."
-msgstr "Oppføringen ble ikke funnet i databasen."
+msgstr "Posten ble ikke funnet i databasen."
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/view_form.js:2444
 #, python-format
 msgid "Show a different year"
-msgstr ""
+msgstr "Vis et annet år"
 
 #. module: web
 #. openerp-web
@@ -2183,7 +2204,7 @@ msgstr "Laster..."
 #: code:addons/web/static/src/js/view_form.js:2440
 #, python-format
 msgid "Show the current month"
-msgstr ""
+msgstr "Vis nåværende måned"
 
 #. module: web
 #. openerp-web
@@ -2200,7 +2221,7 @@ msgstr "omtrent et år siden"
 #: code:addons/web/static/src/js/search.js:2120
 #, python-format
 msgid "is not equal to"
-msgstr "er ulilk"
+msgstr "er ulik"
 
 #. module: web
 #. openerp-web
@@ -2210,6 +2231,8 @@ msgid ""
 "The type of the field '%s' must be a many2many field with a relation to "
 "'ir.attachment' model."
 msgstr ""
+"Felttypen '%s' må være et mange-til-mange felt med relasjon til "
+"'ir.attachment' modellen."
 
 #. module: web
 #. openerp-web
@@ -2225,7 +2248,7 @@ msgstr "Tøm"
 #: code:addons/web/static/src/xml/base.xml:132
 #, python-format
 msgid "Select a database name:"
-msgstr ""
+msgstr "Velg et databasenavn:"
 
 #. module: web
 #. openerp-web
@@ -2247,7 +2270,7 @@ msgstr "Legg til: "
 #: code:addons/web/static/src/xml/base.xml:1879
 #, python-format
 msgid "Quick Add"
-msgstr ""
+msgstr "Hurtig legg til"
 
 #. module: web
 #. openerp-web
@@ -2267,7 +2290,7 @@ msgstr "Latin 1"
 #: code:addons/web/static/src/xml/base.xml:1773
 #, python-format
 msgid "Ok"
-msgstr "Ok"
+msgstr "OK"
 
 #. module: web
 #. openerp-web
@@ -2289,7 +2312,7 @@ msgstr "Opprettet av :"
 #: code:addons/web/static/src/js/dates.js:26
 #, python-format
 msgid "'%s' is not a valid datetime"
-msgstr ""
+msgstr "'%s' er en ugyldig dato"
 
 #. module: web
 #. openerp-web
@@ -2355,7 +2378,7 @@ msgstr "Bekreft"
 #: code:addons/web/static/src/js/data_export.js:127
 #, python-format
 msgid "Please enter save field list name"
-msgstr ""
+msgstr "Vennligst angi navn for lagret felt-liste"
 
 #. module: web
 #. openerp-web
@@ -2384,7 +2407,7 @@ msgstr "Kan ikke konvertere verdi %s til kontekst"
 #: code:addons/web/static/src/xml/base.xml:563
 #, python-format
 msgid "Fields View Get"
-msgstr ""
+msgstr "Felt Vis Hent"
 
 #. module: web
 #. openerp-web
@@ -2421,7 +2444,7 @@ msgstr "OpenERP er et varemerke for"
 #: code:addons/web/static/src/js/data_export.js:375
 #, python-format
 msgid "Please select fields to export..."
-msgstr "Velg felter å eksportere"
+msgstr "Velg felt for eksportering..."
 
 #. module: web
 #. openerp-web
@@ -2432,7 +2455,7 @@ msgstr "Velg felter å eksportere"
 #: code:addons/web/static/src/js/search.js:2146
 #, python-format
 msgid "is not set"
-msgstr ""
+msgstr "er ikke satt"
 
 #. module: web
 #. openerp-web
@@ -2467,20 +2490,20 @@ msgstr "Om OpenERP"
 #: code:addons/web/static/src/js/formats.js:301
 #, python-format
 msgid "'%s' is not a correct date, datetime nor time"
-msgstr "'%s' er ugyldig som dato, datotid og tid"
+msgstr "'%s' er ikke en gyldig dato, datotid eller tid"
 
 #. module: web
 #: code:addons/web/controllers/main.py:1307
 #, python-format
 msgid "No content found for field '%s' on '%s:%s'"
-msgstr ""
+msgstr "Ingen data funnet for felt '%s' i '%s:%s'"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:322
 #, python-format
 msgid "Database Management"
-msgstr ""
+msgstr "Databaseadministrasjon"
 
 #. module: web
 #. openerp-web
@@ -2559,7 +2582,7 @@ msgstr "Forkast"
 #: code:addons/web/static/src/js/view_form.js:5314
 #, python-format
 msgid "Uploading Error"
-msgstr ""
+msgstr "Feil under opplasting"
 
 #. module: web
 #. openerp-web
@@ -2573,28 +2596,28 @@ msgstr "Legg til betingelse"
 #: code:addons/web/static/src/js/coresetup.js:619
 #, python-format
 msgid "Still loading..."
-msgstr "Laster fortsat..."
+msgstr "Laster fortsatt..."
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/search.js:884
 #, python-format
 msgid "Incorrect value for field %(fieldname)s: [%(value)s] is %(message)s"
-msgstr ""
+msgstr "Feil verdi for felt %(fieldname)s: [%(value)s] er %(message)s"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/view_form.js:3926
 #, python-format
 msgid "The o2m record must be saved before an action can be used"
-msgstr ""
+msgstr "en-til-mange posten må lagres før en handling kan kjøres"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/chrome.js:531
 #, python-format
 msgid "Backed"
-msgstr ""
+msgstr "Backed"
 
 #. module: web
 #. openerp-web
@@ -2633,7 +2656,7 @@ msgstr "utløst fra søkevisning"
 #: code:addons/web/static/src/js/search.js:1079
 #, python-format
 msgid "Filter"
-msgstr ""
+msgstr "Filter"
 
 #. module: web
 #. openerp-web
@@ -2655,7 +2678,8 @@ msgstr "Rediger handling"
 #, python-format
 msgid ""
 "This filter is global and will be removed for everybody if you continue."
-msgstr "Filteret er globalt og blir slettet for alle om du fortsetter."
+msgstr ""
+"Dette filteret er globalt, og vil bli slettet for alle dersom du fortsetter."
 
 #. module: web
 #. openerp-web
@@ -2740,7 +2764,7 @@ msgstr "Skriv ut"
 #: code:addons/web/static/src/xml/base.xml:1359
 #, python-format
 msgid "Special:"
-msgstr ""
+msgstr "Spesiell:"
 
 #. module: web
 #: code:addons/web/controllers/main.py:877
@@ -2754,14 +2778,14 @@ msgstr "Det gamle passordet du oppga er feil, passordet ble ikke endret."
 #: code:addons/web/static/src/xml/base.xml:583
 #, python-format
 msgid "Creation User:"
-msgstr ""
+msgstr "Opprettet av bruker:"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/view_form.js:769
 #, python-format
 msgid "Do you really want to delete this record?"
-msgstr "Ønsker du virkelig å slette denne oppføringen?"
+msgstr "Vil du virkelig slette denne posten ?"
 
 #. module: web
 #. openerp-web
@@ -2775,7 +2799,7 @@ msgstr "Tilbake til innlogging"
 #: code:addons/web/static/src/xml/base.xml:1413
 #, python-format
 msgid "Save & Close"
-msgstr "Lagre & Lukk"
+msgstr "Lagre og lukk"
 
 #. module: web
 #. openerp-web
@@ -2797,7 +2821,7 @@ msgstr "Passord"
 #: code:addons/web/static/src/js/view_form.js:2457
 #, python-format
 msgid "Choose Time"
-msgstr ""
+msgstr "Velg tid"
 
 #. module: web
 #. openerp-web
@@ -2863,7 +2887,7 @@ msgstr "Separator:"
 #: code:addons/web/static/src/js/view_form.js:2461
 #, python-format
 msgid "Second"
-msgstr ""
+msgstr "Sekund"
 
 #. module: web
 #. openerp-web
@@ -2871,7 +2895,7 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:1480
 #, python-format
 msgid "Filters"
-msgstr "Filtre"
+msgstr "Filter"
 
 #, python-format
 #~ msgid "Load Demonstration data:"
diff --git a/addons/web/i18n/nl.po b/addons/web/i18n/nl.po
index bb1b09693ef..1ede56e53a9 100644
--- a/addons/web/i18n/nl.po
+++ b/addons/web/i18n/nl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 06:59+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:45+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web
diff --git a/addons/web/i18n/nl_BE.po b/addons/web/i18n/nl_BE.po
index a357fa8524a..7116422ccd5 100644
--- a/addons/web/i18n/nl_BE.po
+++ b/addons/web/i18n/nl_BE.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:01+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web
diff --git a/addons/web/i18n/pl.po b/addons/web/i18n/pl.po
index e45adbadc49..e11826e0c2c 100644
--- a/addons/web/i18n/pl.po
+++ b/addons/web/i18n/pl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:00+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:46+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web
diff --git a/addons/web/i18n/pt.po b/addons/web/i18n/pt.po
index 4723a586355..6641b36bd50 100644
--- a/addons/web/i18n/pt.po
+++ b/addons/web/i18n/pt.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:00+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:46+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web
diff --git a/addons/web/i18n/pt_BR.po b/addons/web/i18n/pt_BR.po
index 85770abfe21..36fb4fe35d6 100644
--- a/addons/web/i18n/pt_BR.po
+++ b/addons/web/i18n/pt_BR.po
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:00+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web
diff --git a/addons/web/i18n/ro.po b/addons/web/i18n/ro.po
index fc0e244fd20..8c19d87cd30 100644
--- a/addons/web/i18n/ro.po
+++ b/addons/web/i18n/ro.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:00+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:46+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web
diff --git a/addons/web/i18n/ru.po b/addons/web/i18n/ru.po
index 916e5f4f42e..2d036767275 100644
--- a/addons/web/i18n/ru.po
+++ b/addons/web/i18n/ru.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:00+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:46+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web
diff --git a/addons/web/i18n/sk.po b/addons/web/i18n/sk.po
index 9860a176b45..69288afc602 100644
--- a/addons/web/i18n/sk.po
+++ b/addons/web/i18n/sk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:00+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:46+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web
diff --git a/addons/web/i18n/sl.po b/addons/web/i18n/sl.po
index 6deefe577d7..f92fa5bfe5c 100644
--- a/addons/web/i18n/sl.po
+++ b/addons/web/i18n/sl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:00+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:46+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web
diff --git a/addons/web/i18n/sq.po b/addons/web/i18n/sq.po
index 656f6089be0..23d1a69e674 100644
--- a/addons/web/i18n/sq.po
+++ b/addons/web/i18n/sq.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 06:58+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:44+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web
diff --git a/addons/web/i18n/sr@latin.po b/addons/web/i18n/sr@latin.po
index 74eab6749c7..572b98fc5e1 100644
--- a/addons/web/i18n/sr@latin.po
+++ b/addons/web/i18n/sr@latin.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:01+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web
diff --git a/addons/web/i18n/sv.po b/addons/web/i18n/sv.po
index e5f49ff1b83..930bc7ab5ca 100644
--- a/addons/web/i18n/sv.po
+++ b/addons/web/i18n/sv.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:00+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:46+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web
diff --git a/addons/web/i18n/th.po b/addons/web/i18n/th.po
index e731c320b94..38b01391c9e 100644
--- a/addons/web/i18n/th.po
+++ b/addons/web/i18n/th.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2014-03-17 10:09+0000\n"
-"Last-Translator: Sumonchai ( เหลา ) <sumonchai@gmail.com>\n"
+"PO-Revision-Date: 2014-05-03 16:39+0000\n"
+"Last-Translator: Nirun Tungketmukda <Unknown>\n"
 "Language-Team: Thai <th@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: 2014-04-23 07:00+0000\n"
+"X-Launchpad-Export-Date: 2014-05-04 06:27+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web
@@ -2860,7 +2860,7 @@ msgstr "สร้างฐานข้อมูล"
 #: code:addons/web/static/src/xml/base.xml:442
 #, python-format
 msgid "GNU Affero General Public License"
-msgstr ""
+msgstr "GNU Affero General Public License"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/tr.po b/addons/web/i18n/tr.po
index 43bfc5dbd86..3a933bca7dd 100644
--- a/addons/web/i18n/tr.po
+++ b/addons/web/i18n/tr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:00+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:46+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web
diff --git a/addons/web/i18n/uk.po b/addons/web/i18n/uk.po
index 6a6b45577d1..4323c8ac7eb 100644
--- a/addons/web/i18n/uk.po
+++ b/addons/web/i18n/uk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:00+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:46+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web
diff --git a/addons/web/i18n/vi.po b/addons/web/i18n/vi.po
index d8bc7ec6a5d..aa68ca60e4d 100644
--- a/addons/web/i18n/vi.po
+++ b/addons/web/i18n/vi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:00+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web
diff --git a/addons/web/i18n/zh_CN.po b/addons/web/i18n/zh_CN.po
index cf9fe672739..ad0fab47abe 100644
--- a/addons/web/i18n/zh_CN.po
+++ b/addons/web/i18n/zh_CN.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:01+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web
diff --git a/addons/web/i18n/zh_TW.po b/addons/web/i18n/zh_TW.po
index 6c24cccaa4a..769d8f9ec25 100644
--- a/addons/web/i18n/zh_TW.po
+++ b/addons/web/i18n/zh_TW.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:01+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web
diff --git a/addons/web_api/i18n/cs.po b/addons/web_api/i18n/cs.po
index 51cc8f3159a..782bf8f889f 100644
--- a/addons/web_api/i18n/cs.po
+++ b/addons/web_api/i18n/cs.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:01+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 
diff --git a/addons/web_api/i18n/es_CR.po b/addons/web_api/i18n/es_CR.po
index 10d57e8a2e5..b5f82b8dfbb 100644
--- a/addons/web_api/i18n/es_CR.po
+++ b/addons/web_api/i18n/es_CR.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:01+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 
diff --git a/addons/web_calendar/i18n/ar.po b/addons/web_calendar/i18n/ar.po
index 323f2e57ab6..93f828ef320 100644
--- a/addons/web_calendar/i18n/ar.po
+++ b/addons/web_calendar/i18n/ar.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:01+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/bg.po b/addons/web_calendar/i18n/bg.po
index 140ab09358a..8861e332cc6 100644
--- a/addons/web_calendar/i18n/bg.po
+++ b/addons/web_calendar/i18n/bg.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:01+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/bn.po b/addons/web_calendar/i18n/bn.po
index 9e9e3b01eb7..3c3b6cf26b2 100644
--- a/addons/web_calendar/i18n/bn.po
+++ b/addons/web_calendar/i18n/bn.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:01+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/bs.po b/addons/web_calendar/i18n/bs.po
index db0976c4054..edd723ef9f7 100644
--- a/addons/web_calendar/i18n/bs.po
+++ b/addons/web_calendar/i18n/bs.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:01+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/ca.po b/addons/web_calendar/i18n/ca.po
index bfb2658c7fe..e27b1d91ebc 100644
--- a/addons/web_calendar/i18n/ca.po
+++ b/addons/web_calendar/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:01+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/cs.po b/addons/web_calendar/i18n/cs.po
index a63e1f49ce2..5a8f861b3a8 100644
--- a/addons/web_calendar/i18n/cs.po
+++ b/addons/web_calendar/i18n/cs.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:01+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 "X-Poedit-Language: Czech\n"
 
diff --git a/addons/web_calendar/i18n/da.po b/addons/web_calendar/i18n/da.po
index 287de7a55d3..daf6d38cf6d 100644
--- a/addons/web_calendar/i18n/da.po
+++ b/addons/web_calendar/i18n/da.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:01+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/de.po b/addons/web_calendar/i18n/de.po
index 1099980435a..070d68afc9b 100644
--- a/addons/web_calendar/i18n/de.po
+++ b/addons/web_calendar/i18n/de.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:01+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/en_AU.po b/addons/web_calendar/i18n/en_AU.po
index 3ca618febde..3ee2fde6be1 100644
--- a/addons/web_calendar/i18n/en_AU.po
+++ b/addons/web_calendar/i18n/en_AU.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:01+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/en_GB.po b/addons/web_calendar/i18n/en_GB.po
index 4dcf78d68ca..a5b398cf603 100644
--- a/addons/web_calendar/i18n/en_GB.po
+++ b/addons/web_calendar/i18n/en_GB.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:01+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/es.po b/addons/web_calendar/i18n/es.po
index 778b3f91cbd..d970e1039e6 100644
--- a/addons/web_calendar/i18n/es.po
+++ b/addons/web_calendar/i18n/es.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:01+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/es_CL.po b/addons/web_calendar/i18n/es_CL.po
index 45b34045ed8..b1a2680c3fe 100644
--- a/addons/web_calendar/i18n/es_CL.po
+++ b/addons/web_calendar/i18n/es_CL.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:01+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/es_CR.po b/addons/web_calendar/i18n/es_CR.po
index 197fd65b45a..b6555f8523c 100644
--- a/addons/web_calendar/i18n/es_CR.po
+++ b/addons/web_calendar/i18n/es_CR.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:01+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/es_DO.po b/addons/web_calendar/i18n/es_DO.po
index 93c6cbaa524..805d79506e2 100644
--- a/addons/web_calendar/i18n/es_DO.po
+++ b/addons/web_calendar/i18n/es_DO.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:01+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/es_EC.po b/addons/web_calendar/i18n/es_EC.po
index e12187e7cae..6ae1cb15e69 100644
--- a/addons/web_calendar/i18n/es_EC.po
+++ b/addons/web_calendar/i18n/es_EC.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:01+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/es_MX.po b/addons/web_calendar/i18n/es_MX.po
index 2726c7356da..966d4825dd2 100644
--- a/addons/web_calendar/i18n/es_MX.po
+++ b/addons/web_calendar/i18n/es_MX.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:01+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/es_PE.po b/addons/web_calendar/i18n/es_PE.po
index 74676b12269..617206bd65d 100644
--- a/addons/web_calendar/i18n/es_PE.po
+++ b/addons/web_calendar/i18n/es_PE.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:01+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/et.po b/addons/web_calendar/i18n/et.po
index 62b10a59bc7..12e53653bc8 100644
--- a/addons/web_calendar/i18n/et.po
+++ b/addons/web_calendar/i18n/et.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:01+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/eu.po b/addons/web_calendar/i18n/eu.po
index f89ceebe0e8..2a7c0ec9376 100644
--- a/addons/web_calendar/i18n/eu.po
+++ b/addons/web_calendar/i18n/eu.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:01+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/fa.po b/addons/web_calendar/i18n/fa.po
index 470853e67b4..e6a284491ba 100644
--- a/addons/web_calendar/i18n/fa.po
+++ b/addons/web_calendar/i18n/fa.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:01+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/fi.po b/addons/web_calendar/i18n/fi.po
index fc254d306a0..13cec8d2341 100644
--- a/addons/web_calendar/i18n/fi.po
+++ b/addons/web_calendar/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:01+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/fr.po b/addons/web_calendar/i18n/fr.po
index 933b2d2ebc5..c071e275eb5 100644
--- a/addons/web_calendar/i18n/fr.po
+++ b/addons/web_calendar/i18n/fr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:01+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/fr_CA.po b/addons/web_calendar/i18n/fr_CA.po
index 4bc53f23eec..94bb9c87c1f 100644
--- a/addons/web_calendar/i18n/fr_CA.po
+++ b/addons/web_calendar/i18n/fr_CA.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:01+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/gl.po b/addons/web_calendar/i18n/gl.po
index 535f7050d42..324502456d4 100644
--- a/addons/web_calendar/i18n/gl.po
+++ b/addons/web_calendar/i18n/gl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:01+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/gu.po b/addons/web_calendar/i18n/gu.po
index 4f0dba13cfd..7f0f84ee7d2 100644
--- a/addons/web_calendar/i18n/gu.po
+++ b/addons/web_calendar/i18n/gu.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:01+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/hr.po b/addons/web_calendar/i18n/hr.po
index f5159b57252..c6ae68b4173 100644
--- a/addons/web_calendar/i18n/hr.po
+++ b/addons/web_calendar/i18n/hr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:01+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/hu.po b/addons/web_calendar/i18n/hu.po
index 924d414085f..273041384b3 100644
--- a/addons/web_calendar/i18n/hu.po
+++ b/addons/web_calendar/i18n/hu.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:01+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/id.po b/addons/web_calendar/i18n/id.po
index 35bdab1dfca..61ae43ef0ac 100644
--- a/addons/web_calendar/i18n/id.po
+++ b/addons/web_calendar/i18n/id.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:01+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/it.po b/addons/web_calendar/i18n/it.po
index 033a5b1c4c5..1714a7cfd42 100644
--- a/addons/web_calendar/i18n/it.po
+++ b/addons/web_calendar/i18n/it.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:01+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/ja.po b/addons/web_calendar/i18n/ja.po
index ea5acfcfadd..43ca5a74980 100644
--- a/addons/web_calendar/i18n/ja.po
+++ b/addons/web_calendar/i18n/ja.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:01+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/ka.po b/addons/web_calendar/i18n/ka.po
index 6a40a2bcda5..beb0f66e742 100644
--- a/addons/web_calendar/i18n/ka.po
+++ b/addons/web_calendar/i18n/ka.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:01+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/ko.po b/addons/web_calendar/i18n/ko.po
index 3ea86fe70be..6a6aa6a68e7 100644
--- a/addons/web_calendar/i18n/ko.po
+++ b/addons/web_calendar/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:01+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/lt.po b/addons/web_calendar/i18n/lt.po
index 9ff2bdc5ebe..d0598b96bd3 100644
--- a/addons/web_calendar/i18n/lt.po
+++ b/addons/web_calendar/i18n/lt.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:01+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/mk.po b/addons/web_calendar/i18n/mk.po
index 838b9df5810..1584eb45a01 100644
--- a/addons/web_calendar/i18n/mk.po
+++ b/addons/web_calendar/i18n/mk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:01+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/mn.po b/addons/web_calendar/i18n/mn.po
index b476cdb2b2a..97b21969542 100644
--- a/addons/web_calendar/i18n/mn.po
+++ b/addons/web_calendar/i18n/mn.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:01+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/nb.po b/addons/web_calendar/i18n/nb.po
index 5a06f66cecf..f8f9ab770a8 100644
--- a/addons/web_calendar/i18n/nb.po
+++ b/addons/web_calendar/i18n/nb.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2013-03-30 20:07+0000\n"
+"PO-Revision-Date: 2014-05-11 00:27+0000\n"
 "Last-Translator: Jakob Aresvik <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@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: 2014-04-23 07:01+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-05-11 07:08+0000\n"
+"X-Generator: Launchpad (build 16996)\n"
 
 #. module: web_calendar
 #. openerp-web
@@ -50,14 +50,14 @@ msgstr "Lagre"
 #: code:addons/web_calendar/static/src/js/calendar.js:109
 #, python-format
 msgid "Calendar view has a 'date_delay' type != float"
-msgstr ""
+msgstr "Kalendervisning har en 'date_delay' type som ikke er et flyttall"
 
 #. module: web_calendar
 #. openerp-web
 #: code:addons/web_calendar/static/src/js/calendar.js:157
 #, python-format
 msgid "Today"
-msgstr "I dag."
+msgstr "I dag"
 
 #. module: web_calendar
 #. openerp-web
@@ -129,14 +129,14 @@ msgstr "Aktivert"
 #: code:addons/web_calendar/static/src/js/calendar.js:174
 #, python-format
 msgid "Do you want to edit the whole set of repeated events?"
-msgstr "Vil du redigere hele settet av gjentatte arrangementer?"
+msgstr "Vil du redigere hele settet med gjentatte arrangementer?"
 
 #. module: web_calendar
 #. openerp-web
 #: code:addons/web_calendar/static/src/js/calendar.js:90
 #, python-format
 msgid "Filter"
-msgstr ""
+msgstr "Filter"
 
 #. module: web_calendar
 #. openerp-web
@@ -151,7 +151,7 @@ msgstr "Repeter arrangement"
 #: code:addons/web_calendar/static/src/js/calendar.js:188
 #, python-format
 msgid "Agenda"
-msgstr "dagsorden"
+msgstr "Saksliste"
 
 #. module: web_calendar
 #. openerp-web
@@ -214,4 +214,4 @@ msgstr "Kalender"
 #: code:addons/web_calendar/static/src/js/calendar.js:101
 #, python-format
 msgid "Calendar view has not defined 'date_start' attribute."
-msgstr ""
+msgstr "'date_start' attributt er ikke definert i kalendervisning."
diff --git a/addons/web_calendar/i18n/nl.po b/addons/web_calendar/i18n/nl.po
index 2077b02bfb7..eaa7399018d 100644
--- a/addons/web_calendar/i18n/nl.po
+++ b/addons/web_calendar/i18n/nl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:01+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/nl_BE.po b/addons/web_calendar/i18n/nl_BE.po
index a5cb336de63..247bc31e695 100644
--- a/addons/web_calendar/i18n/nl_BE.po
+++ b/addons/web_calendar/i18n/nl_BE.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:01+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/pl.po b/addons/web_calendar/i18n/pl.po
index 6e77dd40163..045320a8211 100644
--- a/addons/web_calendar/i18n/pl.po
+++ b/addons/web_calendar/i18n/pl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:01+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/pt.po b/addons/web_calendar/i18n/pt.po
index e2c14c1c26e..a04cdc23b2e 100644
--- a/addons/web_calendar/i18n/pt.po
+++ b/addons/web_calendar/i18n/pt.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:01+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/pt_BR.po b/addons/web_calendar/i18n/pt_BR.po
index 7bbdf91a7ac..6ac668babfc 100644
--- a/addons/web_calendar/i18n/pt_BR.po
+++ b/addons/web_calendar/i18n/pt_BR.po
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:01+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/ro.po b/addons/web_calendar/i18n/ro.po
index 7279119ec6a..9c96e207012 100644
--- a/addons/web_calendar/i18n/ro.po
+++ b/addons/web_calendar/i18n/ro.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:01+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/ru.po b/addons/web_calendar/i18n/ru.po
index 9764dfc664c..e54a7ba551a 100644
--- a/addons/web_calendar/i18n/ru.po
+++ b/addons/web_calendar/i18n/ru.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:01+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/sk.po b/addons/web_calendar/i18n/sk.po
index 9c5e33d6023..558b6491868 100644
--- a/addons/web_calendar/i18n/sk.po
+++ b/addons/web_calendar/i18n/sk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:01+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/sl.po b/addons/web_calendar/i18n/sl.po
index 06949c0344b..3e604afa553 100644
--- a/addons/web_calendar/i18n/sl.po
+++ b/addons/web_calendar/i18n/sl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:01+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/sq.po b/addons/web_calendar/i18n/sq.po
index 585ea656d1f..338abae8254 100644
--- a/addons/web_calendar/i18n/sq.po
+++ b/addons/web_calendar/i18n/sq.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:01+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/sr@latin.po b/addons/web_calendar/i18n/sr@latin.po
index 33013dd03cb..810af2359fc 100644
--- a/addons/web_calendar/i18n/sr@latin.po
+++ b/addons/web_calendar/i18n/sr@latin.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/sv.po b/addons/web_calendar/i18n/sv.po
index f018e6b4bbc..43f0930ff6a 100644
--- a/addons/web_calendar/i18n/sv.po
+++ b/addons/web_calendar/i18n/sv.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:01+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/th.po b/addons/web_calendar/i18n/th.po
index bbed4c12ee2..191982b95ba 100644
--- a/addons/web_calendar/i18n/th.po
+++ b/addons/web_calendar/i18n/th.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:01+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/tr.po b/addons/web_calendar/i18n/tr.po
index 71397ef8821..7567830e2ec 100644
--- a/addons/web_calendar/i18n/tr.po
+++ b/addons/web_calendar/i18n/tr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:01+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/uk.po b/addons/web_calendar/i18n/uk.po
index 60325e2f4ee..4970ef254e0 100644
--- a/addons/web_calendar/i18n/uk.po
+++ b/addons/web_calendar/i18n/uk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:01+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/zh_CN.po b/addons/web_calendar/i18n/zh_CN.po
index ac28eae4703..c13ba52f86f 100644
--- a/addons/web_calendar/i18n/zh_CN.po
+++ b/addons/web_calendar/i18n/zh_CN.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:01+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/zh_TW.po b/addons/web_calendar/i18n/zh_TW.po
index 7697f5b3868..ed00f0134b8 100644
--- a/addons/web_calendar/i18n/zh_TW.po
+++ b/addons/web_calendar/i18n/zh_TW.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:01+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_calendar
diff --git a/addons/web_diagram/i18n/ar.po b/addons/web_diagram/i18n/ar.po
index d9db8957aeb..4e21159dd2a 100644
--- a/addons/web_diagram/i18n/ar.po
+++ b/addons/web_diagram/i18n/ar.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/bg.po b/addons/web_diagram/i18n/bg.po
index 05ea9b6496c..3c2093956ee 100644
--- a/addons/web_diagram/i18n/bg.po
+++ b/addons/web_diagram/i18n/bg.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/bn.po b/addons/web_diagram/i18n/bn.po
index 88862931060..4bcd11228c1 100644
--- a/addons/web_diagram/i18n/bn.po
+++ b/addons/web_diagram/i18n/bn.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/bs.po b/addons/web_diagram/i18n/bs.po
index d19c44f099a..e793507c73d 100644
--- a/addons/web_diagram/i18n/bs.po
+++ b/addons/web_diagram/i18n/bs.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/ca.po b/addons/web_diagram/i18n/ca.po
index b767c29a913..2c66b978915 100644
--- a/addons/web_diagram/i18n/ca.po
+++ b/addons/web_diagram/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/cs.po b/addons/web_diagram/i18n/cs.po
index e234b1ba215..8cf0bcac8f7 100644
--- a/addons/web_diagram/i18n/cs.po
+++ b/addons/web_diagram/i18n/cs.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 "X-Poedit-Language: Czech\n"
 
diff --git a/addons/web_diagram/i18n/da.po b/addons/web_diagram/i18n/da.po
index 14423988a4c..2edf85e8579 100644
--- a/addons/web_diagram/i18n/da.po
+++ b/addons/web_diagram/i18n/da.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/de.po b/addons/web_diagram/i18n/de.po
index 058b059b63b..59a651413e4 100644
--- a/addons/web_diagram/i18n/de.po
+++ b/addons/web_diagram/i18n/de.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/en_AU.po b/addons/web_diagram/i18n/en_AU.po
index 12a2320966c..06f5c923e4b 100644
--- a/addons/web_diagram/i18n/en_AU.po
+++ b/addons/web_diagram/i18n/en_AU.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/en_GB.po b/addons/web_diagram/i18n/en_GB.po
index 94408e8399c..9e956838dfb 100644
--- a/addons/web_diagram/i18n/en_GB.po
+++ b/addons/web_diagram/i18n/en_GB.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/es.po b/addons/web_diagram/i18n/es.po
index 40e5d558573..eca42402dfa 100644
--- a/addons/web_diagram/i18n/es.po
+++ b/addons/web_diagram/i18n/es.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/es_CL.po b/addons/web_diagram/i18n/es_CL.po
index 6b9bd67b4d6..9f6cd71d28a 100644
--- a/addons/web_diagram/i18n/es_CL.po
+++ b/addons/web_diagram/i18n/es_CL.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/es_CR.po b/addons/web_diagram/i18n/es_CR.po
index c23a5875fec..7e55237c3ed 100644
--- a/addons/web_diagram/i18n/es_CR.po
+++ b/addons/web_diagram/i18n/es_CR.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/es_DO.po b/addons/web_diagram/i18n/es_DO.po
index e94bd4af304..b749f9368d1 100644
--- a/addons/web_diagram/i18n/es_DO.po
+++ b/addons/web_diagram/i18n/es_DO.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/es_EC.po b/addons/web_diagram/i18n/es_EC.po
index 2fcb61efca1..bf289648635 100644
--- a/addons/web_diagram/i18n/es_EC.po
+++ b/addons/web_diagram/i18n/es_EC.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/es_MX.po b/addons/web_diagram/i18n/es_MX.po
index 6faee8a453c..2ed5b77879a 100644
--- a/addons/web_diagram/i18n/es_MX.po
+++ b/addons/web_diagram/i18n/es_MX.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/es_PE.po b/addons/web_diagram/i18n/es_PE.po
index db0e9c54fbe..ade14b6a93c 100644
--- a/addons/web_diagram/i18n/es_PE.po
+++ b/addons/web_diagram/i18n/es_PE.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/et.po b/addons/web_diagram/i18n/et.po
index 22c4c3e8bc3..e3dd77269ff 100644
--- a/addons/web_diagram/i18n/et.po
+++ b/addons/web_diagram/i18n/et.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/fa.po b/addons/web_diagram/i18n/fa.po
index 3405bdeb902..2bffa7d07f1 100644
--- a/addons/web_diagram/i18n/fa.po
+++ b/addons/web_diagram/i18n/fa.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/fi.po b/addons/web_diagram/i18n/fi.po
index b2ab2d849ea..3f464e13bb2 100644
--- a/addons/web_diagram/i18n/fi.po
+++ b/addons/web_diagram/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/fr.po b/addons/web_diagram/i18n/fr.po
index 2c6cedf03ab..f57a6fe62c3 100644
--- a/addons/web_diagram/i18n/fr.po
+++ b/addons/web_diagram/i18n/fr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/gl.po b/addons/web_diagram/i18n/gl.po
index 60c7c9b3df4..317a7bd2b7e 100644
--- a/addons/web_diagram/i18n/gl.po
+++ b/addons/web_diagram/i18n/gl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/gu.po b/addons/web_diagram/i18n/gu.po
index 7071a358e93..3b1ee67a0f8 100644
--- a/addons/web_diagram/i18n/gu.po
+++ b/addons/web_diagram/i18n/gu.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/hr.po b/addons/web_diagram/i18n/hr.po
index 01449e0bab8..991e73c6cbf 100644
--- a/addons/web_diagram/i18n/hr.po
+++ b/addons/web_diagram/i18n/hr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/hu.po b/addons/web_diagram/i18n/hu.po
index 8a31cd29213..702442b5a8b 100644
--- a/addons/web_diagram/i18n/hu.po
+++ b/addons/web_diagram/i18n/hu.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/id.po b/addons/web_diagram/i18n/id.po
index 6b47c96224e..1cc5b3f7c0d 100644
--- a/addons/web_diagram/i18n/id.po
+++ b/addons/web_diagram/i18n/id.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/it.po b/addons/web_diagram/i18n/it.po
index 3be3002a700..447668eb619 100644
--- a/addons/web_diagram/i18n/it.po
+++ b/addons/web_diagram/i18n/it.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/ja.po b/addons/web_diagram/i18n/ja.po
index a58414b6c54..f571c9c7a6e 100644
--- a/addons/web_diagram/i18n/ja.po
+++ b/addons/web_diagram/i18n/ja.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/ka.po b/addons/web_diagram/i18n/ka.po
index 4f16160e37f..230b737542e 100644
--- a/addons/web_diagram/i18n/ka.po
+++ b/addons/web_diagram/i18n/ka.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/ko.po b/addons/web_diagram/i18n/ko.po
index f0c86798e8f..a74561152fa 100644
--- a/addons/web_diagram/i18n/ko.po
+++ b/addons/web_diagram/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/lt.po b/addons/web_diagram/i18n/lt.po
index 340119e19f3..192cd011d58 100644
--- a/addons/web_diagram/i18n/lt.po
+++ b/addons/web_diagram/i18n/lt.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/mk.po b/addons/web_diagram/i18n/mk.po
index 5b47e111822..eaadc227712 100644
--- a/addons/web_diagram/i18n/mk.po
+++ b/addons/web_diagram/i18n/mk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/mn.po b/addons/web_diagram/i18n/mn.po
index f6f6cb7bc2f..a3a4d7b8681 100644
--- a/addons/web_diagram/i18n/mn.po
+++ b/addons/web_diagram/i18n/mn.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/nb.po b/addons/web_diagram/i18n/nb.po
index dc642f43756..db8079fd4d2 100644
--- a/addons/web_diagram/i18n/nb.po
+++ b/addons/web_diagram/i18n/nb.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2013-03-30 20:12+0000\n"
+"PO-Revision-Date: 2014-05-11 00:29+0000\n"
 "Last-Translator: Jakob Aresvik <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@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: 2014-04-23 07:02+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-05-11 07:08+0000\n"
+"X-Generator: Launchpad (build 16996)\n"
 
 #. module: web_diagram
 #. openerp-web
@@ -35,6 +35,10 @@ msgid ""
 "\n"
 "Are you sure ?"
 msgstr ""
+"Når denne noden er slettet kan den ikke gjenopprettes.\n"
+"Alle tilkoblede overganger vil også bli slettet.\n"
+"\n"
+"Er du sikker?"
 
 #. module: web_diagram
 #. openerp-web
@@ -49,7 +53,7 @@ msgstr "Ny node"
 #: code:addons/web_diagram/static/src/js/diagram.js:329
 #, python-format
 msgid "Transition"
-msgstr ""
+msgstr "Overgang"
 
 #. module: web_diagram
 #. openerp-web
@@ -97,3 +101,6 @@ msgid ""
 "\n"
 "Are you sure ?"
 msgstr ""
+"Når denne overgangen slettes, kan den ikke gjenopprettes.\n"
+"\n"
+"Er du sikker?"
diff --git a/addons/web_diagram/i18n/nl.po b/addons/web_diagram/i18n/nl.po
index 9dc03b677ef..d08ffdd28f0 100644
--- a/addons/web_diagram/i18n/nl.po
+++ b/addons/web_diagram/i18n/nl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/nl_BE.po b/addons/web_diagram/i18n/nl_BE.po
index 16667c81b1f..6b41846ac78 100644
--- a/addons/web_diagram/i18n/nl_BE.po
+++ b/addons/web_diagram/i18n/nl_BE.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/pl.po b/addons/web_diagram/i18n/pl.po
index 9dbced6ec97..5b5b894c695 100644
--- a/addons/web_diagram/i18n/pl.po
+++ b/addons/web_diagram/i18n/pl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/pt.po b/addons/web_diagram/i18n/pt.po
index f79589e79cd..faa168f13b6 100644
--- a/addons/web_diagram/i18n/pt.po
+++ b/addons/web_diagram/i18n/pt.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/pt_BR.po b/addons/web_diagram/i18n/pt_BR.po
index 969032bd574..3e5c5521758 100644
--- a/addons/web_diagram/i18n/pt_BR.po
+++ b/addons/web_diagram/i18n/pt_BR.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/ro.po b/addons/web_diagram/i18n/ro.po
index 3786d53eb5f..b323090bfc6 100644
--- a/addons/web_diagram/i18n/ro.po
+++ b/addons/web_diagram/i18n/ro.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/ru.po b/addons/web_diagram/i18n/ru.po
index 73052ac86a6..25f0cc91e97 100644
--- a/addons/web_diagram/i18n/ru.po
+++ b/addons/web_diagram/i18n/ru.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/sl.po b/addons/web_diagram/i18n/sl.po
index ad6cfddfce3..29d5fb4ef36 100644
--- a/addons/web_diagram/i18n/sl.po
+++ b/addons/web_diagram/i18n/sl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/sq.po b/addons/web_diagram/i18n/sq.po
index 43593d07fe4..63af3ba4dd4 100644
--- a/addons/web_diagram/i18n/sq.po
+++ b/addons/web_diagram/i18n/sq.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/sr@latin.po b/addons/web_diagram/i18n/sr@latin.po
index 269f2c11aa4..94c39d84fa0 100644
--- a/addons/web_diagram/i18n/sr@latin.po
+++ b/addons/web_diagram/i18n/sr@latin.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/sv.po b/addons/web_diagram/i18n/sv.po
index 0be09dd7dd4..210b0fd7ae8 100644
--- a/addons/web_diagram/i18n/sv.po
+++ b/addons/web_diagram/i18n/sv.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/th.po b/addons/web_diagram/i18n/th.po
index f3fd40f785e..5b54d21c97c 100644
--- a/addons/web_diagram/i18n/th.po
+++ b/addons/web_diagram/i18n/th.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/tr.po b/addons/web_diagram/i18n/tr.po
index ced5d3cbb92..be7fa844539 100644
--- a/addons/web_diagram/i18n/tr.po
+++ b/addons/web_diagram/i18n/tr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/zh_CN.po b/addons/web_diagram/i18n/zh_CN.po
index 2f921159a11..755176a617b 100644
--- a/addons/web_diagram/i18n/zh_CN.po
+++ b/addons/web_diagram/i18n/zh_CN.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/zh_TW.po b/addons/web_diagram/i18n/zh_TW.po
index ac9e04edc83..03bb0d48f2b 100644
--- a/addons/web_diagram/i18n/zh_TW.po
+++ b/addons/web_diagram/i18n/zh_TW.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_diagram
diff --git a/addons/web_gantt/i18n/ar.po b/addons/web_gantt/i18n/ar.po
index a556c157625..a77d7f766cb 100644
--- a/addons/web_gantt/i18n/ar.po
+++ b/addons/web_gantt/i18n/ar.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/bg.po b/addons/web_gantt/i18n/bg.po
index a5fc2a5f469..505e8e071c5 100644
--- a/addons/web_gantt/i18n/bg.po
+++ b/addons/web_gantt/i18n/bg.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/bn.po b/addons/web_gantt/i18n/bn.po
index bce33807b98..44adad5acf6 100644
--- a/addons/web_gantt/i18n/bn.po
+++ b/addons/web_gantt/i18n/bn.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/bs.po b/addons/web_gantt/i18n/bs.po
index dc4f1375282..c0f42bc1c61 100644
--- a/addons/web_gantt/i18n/bs.po
+++ b/addons/web_gantt/i18n/bs.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/ca.po b/addons/web_gantt/i18n/ca.po
index 56c8df30023..369940383f1 100644
--- a/addons/web_gantt/i18n/ca.po
+++ b/addons/web_gantt/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/cs.po b/addons/web_gantt/i18n/cs.po
index 1feef3c2b18..75866e3b5b3 100644
--- a/addons/web_gantt/i18n/cs.po
+++ b/addons/web_gantt/i18n/cs.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 "X-Poedit-Language: Czech\n"
 
diff --git a/addons/web_gantt/i18n/da.po b/addons/web_gantt/i18n/da.po
index 4ca06b1ff1a..7d8e62b823a 100644
--- a/addons/web_gantt/i18n/da.po
+++ b/addons/web_gantt/i18n/da.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/de.po b/addons/web_gantt/i18n/de.po
index 49aa16ac637..ca492c8857c 100644
--- a/addons/web_gantt/i18n/de.po
+++ b/addons/web_gantt/i18n/de.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/en_AU.po b/addons/web_gantt/i18n/en_AU.po
index bcb79657474..a1104deb7f7 100644
--- a/addons/web_gantt/i18n/en_AU.po
+++ b/addons/web_gantt/i18n/en_AU.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/en_GB.po b/addons/web_gantt/i18n/en_GB.po
index 941e3afe610..f527ab5d889 100644
--- a/addons/web_gantt/i18n/en_GB.po
+++ b/addons/web_gantt/i18n/en_GB.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/es.po b/addons/web_gantt/i18n/es.po
index a294c9e5eb0..4dd7cd59fa7 100644
--- a/addons/web_gantt/i18n/es.po
+++ b/addons/web_gantt/i18n/es.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/es_CL.po b/addons/web_gantt/i18n/es_CL.po
index 9e8d2e69f46..c35724aee70 100644
--- a/addons/web_gantt/i18n/es_CL.po
+++ b/addons/web_gantt/i18n/es_CL.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/es_CR.po b/addons/web_gantt/i18n/es_CR.po
index 35a67bf16c9..7f83fc7661a 100644
--- a/addons/web_gantt/i18n/es_CR.po
+++ b/addons/web_gantt/i18n/es_CR.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/es_DO.po b/addons/web_gantt/i18n/es_DO.po
index 239c79a1b24..65726293e0a 100644
--- a/addons/web_gantt/i18n/es_DO.po
+++ b/addons/web_gantt/i18n/es_DO.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/es_EC.po b/addons/web_gantt/i18n/es_EC.po
index b1080195aad..5dfa0d295c5 100644
--- a/addons/web_gantt/i18n/es_EC.po
+++ b/addons/web_gantt/i18n/es_EC.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/es_MX.po b/addons/web_gantt/i18n/es_MX.po
index 65eaf2bf9c6..d96e602b5c7 100644
--- a/addons/web_gantt/i18n/es_MX.po
+++ b/addons/web_gantt/i18n/es_MX.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/et.po b/addons/web_gantt/i18n/et.po
index 51156337f53..05f9901021e 100644
--- a/addons/web_gantt/i18n/et.po
+++ b/addons/web_gantt/i18n/et.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/fa.po b/addons/web_gantt/i18n/fa.po
index f04148019a6..b9602aad063 100644
--- a/addons/web_gantt/i18n/fa.po
+++ b/addons/web_gantt/i18n/fa.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/fi.po b/addons/web_gantt/i18n/fi.po
index 3bdcdbed46b..2ec1cd24fb0 100644
--- a/addons/web_gantt/i18n/fi.po
+++ b/addons/web_gantt/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/fr.po b/addons/web_gantt/i18n/fr.po
index 377b9e96951..aa23e014e6c 100644
--- a/addons/web_gantt/i18n/fr.po
+++ b/addons/web_gantt/i18n/fr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/gl.po b/addons/web_gantt/i18n/gl.po
index 02b47716a52..6965517e80d 100644
--- a/addons/web_gantt/i18n/gl.po
+++ b/addons/web_gantt/i18n/gl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/gu.po b/addons/web_gantt/i18n/gu.po
index c719436bf6d..b4ac1bd691b 100644
--- a/addons/web_gantt/i18n/gu.po
+++ b/addons/web_gantt/i18n/gu.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/he.po b/addons/web_gantt/i18n/he.po
index a081d263cbb..1660bfd2aac 100644
--- a/addons/web_gantt/i18n/he.po
+++ b/addons/web_gantt/i18n/he.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/hr.po b/addons/web_gantt/i18n/hr.po
index e5807743e82..bd53d46e2f0 100644
--- a/addons/web_gantt/i18n/hr.po
+++ b/addons/web_gantt/i18n/hr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/hu.po b/addons/web_gantt/i18n/hu.po
index c39258fae62..3807283a700 100644
--- a/addons/web_gantt/i18n/hu.po
+++ b/addons/web_gantt/i18n/hu.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/it.po b/addons/web_gantt/i18n/it.po
index f4c0aa82495..fd4992587ed 100644
--- a/addons/web_gantt/i18n/it.po
+++ b/addons/web_gantt/i18n/it.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/ja.po b/addons/web_gantt/i18n/ja.po
index 6a6544a637a..51fb439ed71 100644
--- a/addons/web_gantt/i18n/ja.po
+++ b/addons/web_gantt/i18n/ja.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/ka.po b/addons/web_gantt/i18n/ka.po
index ee881d7dc10..a21d90aa7ef 100644
--- a/addons/web_gantt/i18n/ka.po
+++ b/addons/web_gantt/i18n/ka.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/ko.po b/addons/web_gantt/i18n/ko.po
index 27a4b366c18..08424b25f9f 100644
--- a/addons/web_gantt/i18n/ko.po
+++ b/addons/web_gantt/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/lo.po b/addons/web_gantt/i18n/lo.po
index 0773c1f4eef..0b906ed72f1 100644
--- a/addons/web_gantt/i18n/lo.po
+++ b/addons/web_gantt/i18n/lo.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/lt.po b/addons/web_gantt/i18n/lt.po
index d9f3c662a7d..a1e95b0d7fd 100644
--- a/addons/web_gantt/i18n/lt.po
+++ b/addons/web_gantt/i18n/lt.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/mk.po b/addons/web_gantt/i18n/mk.po
index 8a770ad777a..89ac8cd3713 100644
--- a/addons/web_gantt/i18n/mk.po
+++ b/addons/web_gantt/i18n/mk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/mn.po b/addons/web_gantt/i18n/mn.po
index 85fcf6e6476..70ada3ece31 100644
--- a/addons/web_gantt/i18n/mn.po
+++ b/addons/web_gantt/i18n/mn.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/nb.po b/addons/web_gantt/i18n/nb.po
index c4eb975b35c..91f1b39bf57 100644
--- a/addons/web_gantt/i18n/nb.po
+++ b/addons/web_gantt/i18n/nb.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/nl.po b/addons/web_gantt/i18n/nl.po
index 6a30c3d0b48..014f5d69957 100644
--- a/addons/web_gantt/i18n/nl.po
+++ b/addons/web_gantt/i18n/nl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/nl_BE.po b/addons/web_gantt/i18n/nl_BE.po
index 5d8032e4918..25edd0c1074 100644
--- a/addons/web_gantt/i18n/nl_BE.po
+++ b/addons/web_gantt/i18n/nl_BE.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/pl.po b/addons/web_gantt/i18n/pl.po
index d73c738af27..8bc85ad2bbb 100644
--- a/addons/web_gantt/i18n/pl.po
+++ b/addons/web_gantt/i18n/pl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/pt.po b/addons/web_gantt/i18n/pt.po
index 7181ba5714d..89dbd6411fc 100644
--- a/addons/web_gantt/i18n/pt.po
+++ b/addons/web_gantt/i18n/pt.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/pt_BR.po b/addons/web_gantt/i18n/pt_BR.po
index 2709058ca14..70735516aa4 100644
--- a/addons/web_gantt/i18n/pt_BR.po
+++ b/addons/web_gantt/i18n/pt_BR.po
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/ro.po b/addons/web_gantt/i18n/ro.po
index 2b3c57ba93a..dc927d40406 100644
--- a/addons/web_gantt/i18n/ro.po
+++ b/addons/web_gantt/i18n/ro.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/ru.po b/addons/web_gantt/i18n/ru.po
index 2fdb85d2c6e..4eed22d50c7 100644
--- a/addons/web_gantt/i18n/ru.po
+++ b/addons/web_gantt/i18n/ru.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/sl.po b/addons/web_gantt/i18n/sl.po
index 9f1576809c4..4663ce2492d 100644
--- a/addons/web_gantt/i18n/sl.po
+++ b/addons/web_gantt/i18n/sl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/sq.po b/addons/web_gantt/i18n/sq.po
index fa9d4cbdfc8..533de6d2943 100644
--- a/addons/web_gantt/i18n/sq.po
+++ b/addons/web_gantt/i18n/sq.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/sr@latin.po b/addons/web_gantt/i18n/sr@latin.po
index 4483d9031e8..8cf44dd54ab 100644
--- a/addons/web_gantt/i18n/sr@latin.po
+++ b/addons/web_gantt/i18n/sr@latin.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/sv.po b/addons/web_gantt/i18n/sv.po
index 3b1733fcb5e..7923b9aa159 100644
--- a/addons/web_gantt/i18n/sv.po
+++ b/addons/web_gantt/i18n/sv.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/th.po b/addons/web_gantt/i18n/th.po
index fcb44c0d3e4..7847005d169 100644
--- a/addons/web_gantt/i18n/th.po
+++ b/addons/web_gantt/i18n/th.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/tr.po b/addons/web_gantt/i18n/tr.po
index c41db5e9633..90fcc3b4e4b 100644
--- a/addons/web_gantt/i18n/tr.po
+++ b/addons/web_gantt/i18n/tr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/zh_CN.po b/addons/web_gantt/i18n/zh_CN.po
index 5ee2fcf0611..6f6c7263d99 100644
--- a/addons/web_gantt/i18n/zh_CN.po
+++ b/addons/web_gantt/i18n/zh_CN.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_gantt
diff --git a/addons/web_graph/i18n/ar.po b/addons/web_graph/i18n/ar.po
index a4c3a915fba..53781fdc9cb 100644
--- a/addons/web_graph/i18n/ar.po
+++ b/addons/web_graph/i18n/ar.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/bg.po b/addons/web_graph/i18n/bg.po
index ca1e4d3a1c7..ed69e5aa5e5 100644
--- a/addons/web_graph/i18n/bg.po
+++ b/addons/web_graph/i18n/bg.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/bn.po b/addons/web_graph/i18n/bn.po
index ce324ecd1a5..122496c3da9 100644
--- a/addons/web_graph/i18n/bn.po
+++ b/addons/web_graph/i18n/bn.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/bs.po b/addons/web_graph/i18n/bs.po
index 84ea5374b1c..7f2ca945c64 100644
--- a/addons/web_graph/i18n/bs.po
+++ b/addons/web_graph/i18n/bs.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/ca.po b/addons/web_graph/i18n/ca.po
index 78cd8ad7391..9aa0d8916ab 100644
--- a/addons/web_graph/i18n/ca.po
+++ b/addons/web_graph/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/cs.po b/addons/web_graph/i18n/cs.po
index 159d4b9c428..27ea6fc4b71 100644
--- a/addons/web_graph/i18n/cs.po
+++ b/addons/web_graph/i18n/cs.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/da.po b/addons/web_graph/i18n/da.po
index 3f52c9c470c..3b6d97fc922 100644
--- a/addons/web_graph/i18n/da.po
+++ b/addons/web_graph/i18n/da.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/de.po b/addons/web_graph/i18n/de.po
index df66c384d02..b72a87e57d0 100644
--- a/addons/web_graph/i18n/de.po
+++ b/addons/web_graph/i18n/de.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/en_AU.po b/addons/web_graph/i18n/en_AU.po
index 0900add5aec..51ad8af0e56 100644
--- a/addons/web_graph/i18n/en_AU.po
+++ b/addons/web_graph/i18n/en_AU.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/en_GB.po b/addons/web_graph/i18n/en_GB.po
index cde9086b7c4..41fd5de424b 100644
--- a/addons/web_graph/i18n/en_GB.po
+++ b/addons/web_graph/i18n/en_GB.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/es.po b/addons/web_graph/i18n/es.po
index e75361b9f6a..1d38285abae 100644
--- a/addons/web_graph/i18n/es.po
+++ b/addons/web_graph/i18n/es.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/es_CL.po b/addons/web_graph/i18n/es_CL.po
index f0d90ce5829..658fb9985fb 100644
--- a/addons/web_graph/i18n/es_CL.po
+++ b/addons/web_graph/i18n/es_CL.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/es_CR.po b/addons/web_graph/i18n/es_CR.po
index cd52826c4d6..b98b1c3503a 100644
--- a/addons/web_graph/i18n/es_CR.po
+++ b/addons/web_graph/i18n/es_CR.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/es_DO.po b/addons/web_graph/i18n/es_DO.po
index 171adf05252..9a855c18f5b 100644
--- a/addons/web_graph/i18n/es_DO.po
+++ b/addons/web_graph/i18n/es_DO.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/es_EC.po b/addons/web_graph/i18n/es_EC.po
index 4f2ff1abe0c..52b50907abe 100644
--- a/addons/web_graph/i18n/es_EC.po
+++ b/addons/web_graph/i18n/es_EC.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/es_MX.po b/addons/web_graph/i18n/es_MX.po
index c3ffc80775c..d23b454d87a 100644
--- a/addons/web_graph/i18n/es_MX.po
+++ b/addons/web_graph/i18n/es_MX.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/et.po b/addons/web_graph/i18n/et.po
index af47e46c4c8..14d09ea0c00 100644
--- a/addons/web_graph/i18n/et.po
+++ b/addons/web_graph/i18n/et.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/fa.po b/addons/web_graph/i18n/fa.po
index 5ae1f59ad94..98aa4962439 100644
--- a/addons/web_graph/i18n/fa.po
+++ b/addons/web_graph/i18n/fa.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/fi.po b/addons/web_graph/i18n/fi.po
index 9916f6c492c..33191185c88 100644
--- a/addons/web_graph/i18n/fi.po
+++ b/addons/web_graph/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/fr.po b/addons/web_graph/i18n/fr.po
index 0b7485bf4d7..9dc7ed01666 100644
--- a/addons/web_graph/i18n/fr.po
+++ b/addons/web_graph/i18n/fr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/fr_CA.po b/addons/web_graph/i18n/fr_CA.po
index d3cd2f1b57c..3908520050b 100644
--- a/addons/web_graph/i18n/fr_CA.po
+++ b/addons/web_graph/i18n/fr_CA.po
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/gl.po b/addons/web_graph/i18n/gl.po
index 4b4ff9689c6..733b6e6ffa5 100644
--- a/addons/web_graph/i18n/gl.po
+++ b/addons/web_graph/i18n/gl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/gu.po b/addons/web_graph/i18n/gu.po
index c5c0bacafd6..a7f8a382edf 100644
--- a/addons/web_graph/i18n/gu.po
+++ b/addons/web_graph/i18n/gu.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/he.po b/addons/web_graph/i18n/he.po
index 81abd4bfc6a..7d5091d12ea 100644
--- a/addons/web_graph/i18n/he.po
+++ b/addons/web_graph/i18n/he.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/hr.po b/addons/web_graph/i18n/hr.po
index 54dff85d7ee..3748178a62c 100644
--- a/addons/web_graph/i18n/hr.po
+++ b/addons/web_graph/i18n/hr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/hu.po b/addons/web_graph/i18n/hu.po
index c494b8b32ae..ca0bc4a2b16 100644
--- a/addons/web_graph/i18n/hu.po
+++ b/addons/web_graph/i18n/hu.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/it.po b/addons/web_graph/i18n/it.po
index 74a4d860f7f..4fa1a645f7c 100644
--- a/addons/web_graph/i18n/it.po
+++ b/addons/web_graph/i18n/it.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/ja.po b/addons/web_graph/i18n/ja.po
index 42751230fd7..6970d4702b3 100644
--- a/addons/web_graph/i18n/ja.po
+++ b/addons/web_graph/i18n/ja.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/ka.po b/addons/web_graph/i18n/ka.po
index e223fdc7485..3a033075690 100644
--- a/addons/web_graph/i18n/ka.po
+++ b/addons/web_graph/i18n/ka.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/ko.po b/addons/web_graph/i18n/ko.po
index 6c252fe86fa..099484985b0 100644
--- a/addons/web_graph/i18n/ko.po
+++ b/addons/web_graph/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/lt.po b/addons/web_graph/i18n/lt.po
index 567bf6948cd..b16ab78cfa2 100644
--- a/addons/web_graph/i18n/lt.po
+++ b/addons/web_graph/i18n/lt.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/mk.po b/addons/web_graph/i18n/mk.po
index 929cfa92c6e..57771a7a1b5 100644
--- a/addons/web_graph/i18n/mk.po
+++ b/addons/web_graph/i18n/mk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/mn.po b/addons/web_graph/i18n/mn.po
index 1f668ed597d..2c3d4f1fe5d 100644
--- a/addons/web_graph/i18n/mn.po
+++ b/addons/web_graph/i18n/mn.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/nb.po b/addons/web_graph/i18n/nb.po
index 999880cc93d..df11f3d8962 100644
--- a/addons/web_graph/i18n/nb.po
+++ b/addons/web_graph/i18n/nb.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2013-03-30 20:18+0000\n"
-"Last-Translator: Jakob Aresvik <Unknown>\n"
+"PO-Revision-Date: 2014-05-11 00:33+0000\n"
+"Last-Translator: Kenneth Aalberg <kenneaal@gmail.com>\n"
 "Language-Team: Norwegian Bokmal <nb@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: 2014-04-23 07:02+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-05-11 07:08+0000\n"
+"X-Generator: Launchpad (build 16996)\n"
 
 #. module: web_graph
 #. openerp-web
@@ -43,7 +43,7 @@ msgstr "Diagram"
 #: code:addons/web_graph/static/src/xml/web_graph.xml:25
 #, python-format
 msgid "Inside"
-msgstr ""
+msgstr "Innenfor"
 
 #. module: web_graph
 #. openerp-web
@@ -57,14 +57,14 @@ msgstr "&iacute;"
 #: code:addons/web_graph/static/src/xml/web_graph.xml:11
 #, python-format
 msgid "Pie"
-msgstr "Kake"
+msgstr "Sektor"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:28
 #, python-format
 msgid "Actions"
-msgstr "Handinger"
+msgstr "Handlinger"
 
 #. module: web_graph
 #. openerp-web
@@ -92,7 +92,7 @@ msgstr "Last ned som PNG"
 #: code:addons/web_graph/static/src/xml/web_graph.xml:26
 #, python-format
 msgid "Top"
-msgstr ""
+msgstr "Topp"
 
 #. module: web_graph
 #. openerp-web
@@ -106,7 +106,7 @@ msgstr "Skjult"
 #: code:addons/web_graph/static/src/xml/web_graph.xml:3
 #, python-format
 msgid "Graph Options"
-msgstr "diagramalternativer"
+msgstr "Diagramalternativer"
 
 #. module: web_graph
 #. openerp-web
@@ -120,7 +120,7 @@ msgstr "Linjer"
 #: code:addons/web_graph/static/src/xml/web_graph.xml:20
 #, python-format
 msgid "Legend"
-msgstr "tegnforklaringer"
+msgstr "Tegnforklaring"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/nl.po b/addons/web_graph/i18n/nl.po
index 541a9356fbf..45e2593a10d 100644
--- a/addons/web_graph/i18n/nl.po
+++ b/addons/web_graph/i18n/nl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/nl_BE.po b/addons/web_graph/i18n/nl_BE.po
index 192640c0ceb..f7f31b5d1ca 100644
--- a/addons/web_graph/i18n/nl_BE.po
+++ b/addons/web_graph/i18n/nl_BE.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/pl.po b/addons/web_graph/i18n/pl.po
index 9b7cad33566..1bf63558f8d 100644
--- a/addons/web_graph/i18n/pl.po
+++ b/addons/web_graph/i18n/pl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/pt.po b/addons/web_graph/i18n/pt.po
index 2f6f3863dd3..d8b0bb8c13c 100644
--- a/addons/web_graph/i18n/pt.po
+++ b/addons/web_graph/i18n/pt.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/pt_BR.po b/addons/web_graph/i18n/pt_BR.po
index b9db5ced01e..ccc8a91ec1f 100644
--- a/addons/web_graph/i18n/pt_BR.po
+++ b/addons/web_graph/i18n/pt_BR.po
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/ro.po b/addons/web_graph/i18n/ro.po
index f765ce0625e..a749fb4660d 100644
--- a/addons/web_graph/i18n/ro.po
+++ b/addons/web_graph/i18n/ro.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/ru.po b/addons/web_graph/i18n/ru.po
index 1eb6997eb2c..012392fd3ae 100644
--- a/addons/web_graph/i18n/ru.po
+++ b/addons/web_graph/i18n/ru.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/sl.po b/addons/web_graph/i18n/sl.po
index 6dc3c67f25e..7cbc58f692b 100644
--- a/addons/web_graph/i18n/sl.po
+++ b/addons/web_graph/i18n/sl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/sq.po b/addons/web_graph/i18n/sq.po
index 1f711c8c406..b2304ffeb7e 100644
--- a/addons/web_graph/i18n/sq.po
+++ b/addons/web_graph/i18n/sq.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/sr@latin.po b/addons/web_graph/i18n/sr@latin.po
index 0083faefa90..153c093bfef 100644
--- a/addons/web_graph/i18n/sr@latin.po
+++ b/addons/web_graph/i18n/sr@latin.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/sv.po b/addons/web_graph/i18n/sv.po
index e6eb8e9fe0a..0326b3e6c11 100644
--- a/addons/web_graph/i18n/sv.po
+++ b/addons/web_graph/i18n/sv.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/th.po b/addons/web_graph/i18n/th.po
index 5ac063c7269..ae9e5b695d2 100644
--- a/addons/web_graph/i18n/th.po
+++ b/addons/web_graph/i18n/th.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/tr.po b/addons/web_graph/i18n/tr.po
index 2edd0e8c82a..87a422c957b 100644
--- a/addons/web_graph/i18n/tr.po
+++ b/addons/web_graph/i18n/tr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/zh_CN.po b/addons/web_graph/i18n/zh_CN.po
index 4a38608a79b..1598fa1d78a 100644
--- a/addons/web_graph/i18n/zh_CN.po
+++ b/addons/web_graph/i18n/zh_CN.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_graph
diff --git a/addons/web_hello/i18n/ar.po b/addons/web_hello/i18n/ar.po
index 32c925e6db5..7854c33f95f 100644
--- a/addons/web_hello/i18n/ar.po
+++ b/addons/web_hello/i18n/ar.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 
diff --git a/addons/web_hello/i18n/cs.po b/addons/web_hello/i18n/cs.po
index 1c311c656da..427151323ba 100644
--- a/addons/web_hello/i18n/cs.po
+++ b/addons/web_hello/i18n/cs.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 
diff --git a/addons/web_hello/i18n/es_CR.po b/addons/web_hello/i18n/es_CR.po
index b90bb91ee74..7a9d4aa5ef0 100644
--- a/addons/web_hello/i18n/es_CR.po
+++ b/addons/web_hello/i18n/es_CR.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 
diff --git a/addons/web_hello/i18n/fr.po b/addons/web_hello/i18n/fr.po
index 558eb7f7da3..df32b96f85a 100644
--- a/addons/web_hello/i18n/fr.po
+++ b/addons/web_hello/i18n/fr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 
diff --git a/addons/web_hello/i18n/pt_BR.po b/addons/web_hello/i18n/pt_BR.po
index c2b11cc6ad0..feef9ca2c78 100644
--- a/addons/web_hello/i18n/pt_BR.po
+++ b/addons/web_hello/i18n/pt_BR.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 
diff --git a/addons/web_kanban/i18n/ar.po b/addons/web_kanban/i18n/ar.po
index dccbe761931..6b4893aef07 100644
--- a/addons/web_kanban/i18n/ar.po
+++ b/addons/web_kanban/i18n/ar.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/bg.po b/addons/web_kanban/i18n/bg.po
index ed542b4101b..bf7c9fdac42 100644
--- a/addons/web_kanban/i18n/bg.po
+++ b/addons/web_kanban/i18n/bg.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/bn.po b/addons/web_kanban/i18n/bn.po
index 59fa254b840..caf11f94aa1 100644
--- a/addons/web_kanban/i18n/bn.po
+++ b/addons/web_kanban/i18n/bn.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/bs.po b/addons/web_kanban/i18n/bs.po
index 3c3cb3ced80..f9d7fbf522a 100644
--- a/addons/web_kanban/i18n/bs.po
+++ b/addons/web_kanban/i18n/bs.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/ca.po b/addons/web_kanban/i18n/ca.po
index 82a6c9b0e43..77cbc522d56 100644
--- a/addons/web_kanban/i18n/ca.po
+++ b/addons/web_kanban/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/cs.po b/addons/web_kanban/i18n/cs.po
index 04202c6f6ee..66679d8db95 100644
--- a/addons/web_kanban/i18n/cs.po
+++ b/addons/web_kanban/i18n/cs.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 "X-Poedit-Language: Czech\n"
 
diff --git a/addons/web_kanban/i18n/da.po b/addons/web_kanban/i18n/da.po
index cd10c501796..f11febd28c0 100644
--- a/addons/web_kanban/i18n/da.po
+++ b/addons/web_kanban/i18n/da.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/de.po b/addons/web_kanban/i18n/de.po
index 85cd6bb0529..a423abac8c2 100644
--- a/addons/web_kanban/i18n/de.po
+++ b/addons/web_kanban/i18n/de.po
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/en_AU.po b/addons/web_kanban/i18n/en_AU.po
index 7d581d2b9dc..5a6b8069ddb 100644
--- a/addons/web_kanban/i18n/en_AU.po
+++ b/addons/web_kanban/i18n/en_AU.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/en_GB.po b/addons/web_kanban/i18n/en_GB.po
index 506db6f548f..0d845527953 100644
--- a/addons/web_kanban/i18n/en_GB.po
+++ b/addons/web_kanban/i18n/en_GB.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/es.po b/addons/web_kanban/i18n/es.po
index b375d3585d8..eb159d4516d 100644
--- a/addons/web_kanban/i18n/es.po
+++ b/addons/web_kanban/i18n/es.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/es_CL.po b/addons/web_kanban/i18n/es_CL.po
index b6563a392cb..0bea23a60e1 100644
--- a/addons/web_kanban/i18n/es_CL.po
+++ b/addons/web_kanban/i18n/es_CL.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/es_CR.po b/addons/web_kanban/i18n/es_CR.po
index ea3e69a140d..26c77623b18 100644
--- a/addons/web_kanban/i18n/es_CR.po
+++ b/addons/web_kanban/i18n/es_CR.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/es_DO.po b/addons/web_kanban/i18n/es_DO.po
index a0d5381af0c..c332c6baa13 100644
--- a/addons/web_kanban/i18n/es_DO.po
+++ b/addons/web_kanban/i18n/es_DO.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/es_EC.po b/addons/web_kanban/i18n/es_EC.po
index 7c4821e9d8c..dca28158e41 100644
--- a/addons/web_kanban/i18n/es_EC.po
+++ b/addons/web_kanban/i18n/es_EC.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/es_MX.po b/addons/web_kanban/i18n/es_MX.po
index 1953d430491..224f519693a 100644
--- a/addons/web_kanban/i18n/es_MX.po
+++ b/addons/web_kanban/i18n/es_MX.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/et.po b/addons/web_kanban/i18n/et.po
index bfb664a8ce2..442ad9746a6 100644
--- a/addons/web_kanban/i18n/et.po
+++ b/addons/web_kanban/i18n/et.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/fa.po b/addons/web_kanban/i18n/fa.po
index 5746da2a184..ca4aa1111c2 100644
--- a/addons/web_kanban/i18n/fa.po
+++ b/addons/web_kanban/i18n/fa.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/fi.po b/addons/web_kanban/i18n/fi.po
index 5143e0c7d32..93d58bd0bf4 100644
--- a/addons/web_kanban/i18n/fi.po
+++ b/addons/web_kanban/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/fr.po b/addons/web_kanban/i18n/fr.po
index 00c7aae652c..1c929970ac5 100644
--- a/addons/web_kanban/i18n/fr.po
+++ b/addons/web_kanban/i18n/fr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/fr_CA.po b/addons/web_kanban/i18n/fr_CA.po
index 29615bce91b..385160a4cfc 100644
--- a/addons/web_kanban/i18n/fr_CA.po
+++ b/addons/web_kanban/i18n/fr_CA.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/gl.po b/addons/web_kanban/i18n/gl.po
index 20848c6e19d..eed0421613e 100644
--- a/addons/web_kanban/i18n/gl.po
+++ b/addons/web_kanban/i18n/gl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/gu.po b/addons/web_kanban/i18n/gu.po
index 6a9e96f18bd..e3b4501a085 100644
--- a/addons/web_kanban/i18n/gu.po
+++ b/addons/web_kanban/i18n/gu.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/he.po b/addons/web_kanban/i18n/he.po
index a36c9838f35..5f847eb67f5 100644
--- a/addons/web_kanban/i18n/he.po
+++ b/addons/web_kanban/i18n/he.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/hr.po b/addons/web_kanban/i18n/hr.po
index 8736ffac399..6d14f45ca52 100644
--- a/addons/web_kanban/i18n/hr.po
+++ b/addons/web_kanban/i18n/hr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/hu.po b/addons/web_kanban/i18n/hu.po
index 9a560559c7f..8c6a187b473 100644
--- a/addons/web_kanban/i18n/hu.po
+++ b/addons/web_kanban/i18n/hu.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/it.po b/addons/web_kanban/i18n/it.po
index f53c0dc33d0..59ec00a932f 100644
--- a/addons/web_kanban/i18n/it.po
+++ b/addons/web_kanban/i18n/it.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/ja.po b/addons/web_kanban/i18n/ja.po
index 16874b26f2b..324b9170c3c 100644
--- a/addons/web_kanban/i18n/ja.po
+++ b/addons/web_kanban/i18n/ja.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/ka.po b/addons/web_kanban/i18n/ka.po
index 53b0458d651..81781682deb 100644
--- a/addons/web_kanban/i18n/ka.po
+++ b/addons/web_kanban/i18n/ka.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/ko.po b/addons/web_kanban/i18n/ko.po
index ac3e4d3e2ae..71acbda3361 100644
--- a/addons/web_kanban/i18n/ko.po
+++ b/addons/web_kanban/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/lt.po b/addons/web_kanban/i18n/lt.po
index 1ff96d6676f..952197f4cfc 100644
--- a/addons/web_kanban/i18n/lt.po
+++ b/addons/web_kanban/i18n/lt.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/mk.po b/addons/web_kanban/i18n/mk.po
index 540772c0e08..b71bdba513f 100644
--- a/addons/web_kanban/i18n/mk.po
+++ b/addons/web_kanban/i18n/mk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/mn.po b/addons/web_kanban/i18n/mn.po
index 84b50a0fd5a..a45ca2c82ed 100644
--- a/addons/web_kanban/i18n/mn.po
+++ b/addons/web_kanban/i18n/mn.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/nb.po b/addons/web_kanban/i18n/nb.po
index 104f68db47a..65cc8c36bc9 100644
--- a/addons/web_kanban/i18n/nb.po
+++ b/addons/web_kanban/i18n/nb.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:38+0000\n"
-"PO-Revision-Date: 2013-03-30 20:24+0000\n"
-"Last-Translator: Jakob Aresvik <Unknown>\n"
+"PO-Revision-Date: 2014-05-11 00:35+0000\n"
+"Last-Translator: Kenneth Aalberg <kenneaal@gmail.com>\n"
 "Language-Team: Norwegian Bokmal <nb@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: 2014-04-23 07:02+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-05-11 07:08+0000\n"
+"X-Generator: Launchpad (build 16996)\n"
 
 #. module: web_kanban
 #. openerp-web
@@ -57,7 +57,7 @@ msgstr "Vil du virkelig fjerne denne kolonnen ?"
 #: code:addons/web_kanban/static/src/xml/web_kanban.xml:47
 #, python-format
 msgid "Edit"
-msgstr "Endre"
+msgstr "Rediger"
 
 #. module: web_kanban
 #. openerp-web
@@ -100,14 +100,14 @@ msgstr "Legg til"
 #: code:addons/web_kanban/static/src/xml/web_kanban.xml:35
 #, python-format
 msgid "Quick create"
-msgstr ""
+msgstr "Opprett hurtig"
 
 #. module: web_kanban
 #. openerp-web
 #: code:addons/web_kanban/static/src/js/kanban.js:921
 #, python-format
 msgid "Are you sure you want to delete this record ?"
-msgstr "Ønsker du virkelig å slette denne oppføringen ?"
+msgstr "Ønsker du virkelig å slette denne posten ?"
 
 #. module: web_kanban
 #. openerp-web
@@ -135,8 +135,7 @@ msgstr "gjenværende)"
 #: code:addons/web_kanban/static/src/js/kanban.js:424
 #, python-format
 msgid "An error has occured while moving the record to this group: "
-msgstr ""
-"En feil har oppstått under flytting av oppføringen til denne gruppen: "
+msgstr "En feil har oppstått under flytting av posten til denne gruppen: "
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/nl.po b/addons/web_kanban/i18n/nl.po
index 6f9bdcbd777..08f28c6e309 100644
--- a/addons/web_kanban/i18n/nl.po
+++ b/addons/web_kanban/i18n/nl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/nl_BE.po b/addons/web_kanban/i18n/nl_BE.po
index 7c9e554a580..18a09d2fdbc 100644
--- a/addons/web_kanban/i18n/nl_BE.po
+++ b/addons/web_kanban/i18n/nl_BE.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/pl.po b/addons/web_kanban/i18n/pl.po
index 757f25cdd47..7ff071528a2 100644
--- a/addons/web_kanban/i18n/pl.po
+++ b/addons/web_kanban/i18n/pl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/pt.po b/addons/web_kanban/i18n/pt.po
index 58f38228538..a294afe2ab4 100644
--- a/addons/web_kanban/i18n/pt.po
+++ b/addons/web_kanban/i18n/pt.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/pt_BR.po b/addons/web_kanban/i18n/pt_BR.po
index 2715bc82d7b..22628f5fb96 100644
--- a/addons/web_kanban/i18n/pt_BR.po
+++ b/addons/web_kanban/i18n/pt_BR.po
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/ro.po b/addons/web_kanban/i18n/ro.po
index 99fca784a23..44040b8bb92 100644
--- a/addons/web_kanban/i18n/ro.po
+++ b/addons/web_kanban/i18n/ro.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/ru.po b/addons/web_kanban/i18n/ru.po
index 8fe1a27e04a..04e7f40959c 100644
--- a/addons/web_kanban/i18n/ru.po
+++ b/addons/web_kanban/i18n/ru.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/sl.po b/addons/web_kanban/i18n/sl.po
index 9d2f20e72b4..361dcbbc76e 100644
--- a/addons/web_kanban/i18n/sl.po
+++ b/addons/web_kanban/i18n/sl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/sr@latin.po b/addons/web_kanban/i18n/sr@latin.po
index de075cbd271..d5e2e642ef4 100644
--- a/addons/web_kanban/i18n/sr@latin.po
+++ b/addons/web_kanban/i18n/sr@latin.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/sv.po b/addons/web_kanban/i18n/sv.po
index fbcf9ad692a..faa48e481c4 100644
--- a/addons/web_kanban/i18n/sv.po
+++ b/addons/web_kanban/i18n/sv.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/th.po b/addons/web_kanban/i18n/th.po
index 36c69a6d760..a05f565ecfe 100644
--- a/addons/web_kanban/i18n/th.po
+++ b/addons/web_kanban/i18n/th.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/tr.po b/addons/web_kanban/i18n/tr.po
index 0bd117db02d..33f2e1fdb7e 100644
--- a/addons/web_kanban/i18n/tr.po
+++ b/addons/web_kanban/i18n/tr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/zh_CN.po b/addons/web_kanban/i18n/zh_CN.po
index fa2d3f178b0..67a06f9f076 100644
--- a/addons/web_kanban/i18n/zh_CN.po
+++ b/addons/web_kanban/i18n/zh_CN.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/zh_TW.po b/addons/web_kanban/i18n/zh_TW.po
index 1d960a34137..dbb19fd01f7 100644
--- a/addons/web_kanban/i18n/zh_TW.po
+++ b/addons/web_kanban/i18n/zh_TW.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_kanban
diff --git a/addons/web_tests/i18n/cs.po b/addons/web_tests/i18n/cs.po
index 1c311c656da..427151323ba 100644
--- a/addons/web_tests/i18n/cs.po
+++ b/addons/web_tests/i18n/cs.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 
diff --git a/addons/web_tests/i18n/es.po b/addons/web_tests/i18n/es.po
index fdebfcfef8b..272b9913498 100644
--- a/addons/web_tests/i18n/es.po
+++ b/addons/web_tests/i18n/es.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 
diff --git a/addons/web_tests/i18n/es_CR.po b/addons/web_tests/i18n/es_CR.po
index b90bb91ee74..7a9d4aa5ef0 100644
--- a/addons/web_tests/i18n/es_CR.po
+++ b/addons/web_tests/i18n/es_CR.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 
diff --git a/addons/web_tests/i18n/fr_CA.po b/addons/web_tests/i18n/fr_CA.po
index 843e9848006..58d3815df0b 100644
--- a/addons/web_tests/i18n/fr_CA.po
+++ b/addons/web_tests/i18n/fr_CA.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 
diff --git a/addons/web_view_editor/i18n/ar.po b/addons/web_view_editor/i18n/ar.po
index 953944894bc..c6ca5bd2720 100644
--- a/addons/web_view_editor/i18n/ar.po
+++ b/addons/web_view_editor/i18n/ar.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_view_editor
diff --git a/addons/web_view_editor/i18n/bs.po b/addons/web_view_editor/i18n/bs.po
index 59e532d307c..a4681e2f1d9 100644
--- a/addons/web_view_editor/i18n/bs.po
+++ b/addons/web_view_editor/i18n/bs.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_view_editor
diff --git a/addons/web_view_editor/i18n/cs.po b/addons/web_view_editor/i18n/cs.po
index 3f02b6cc475..c9c061bc7d4 100644
--- a/addons/web_view_editor/i18n/cs.po
+++ b/addons/web_view_editor/i18n/cs.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_view_editor
diff --git a/addons/web_view_editor/i18n/da.po b/addons/web_view_editor/i18n/da.po
index a595c15b042..2ac11d08fb1 100644
--- a/addons/web_view_editor/i18n/da.po
+++ b/addons/web_view_editor/i18n/da.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_view_editor
diff --git a/addons/web_view_editor/i18n/de.po b/addons/web_view_editor/i18n/de.po
index 050f01b9510..0866d41932f 100644
--- a/addons/web_view_editor/i18n/de.po
+++ b/addons/web_view_editor/i18n/de.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_view_editor
diff --git a/addons/web_view_editor/i18n/en_AU.po b/addons/web_view_editor/i18n/en_AU.po
index f45db221c4b..84efb433d3a 100644
--- a/addons/web_view_editor/i18n/en_AU.po
+++ b/addons/web_view_editor/i18n/en_AU.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_view_editor
diff --git a/addons/web_view_editor/i18n/en_GB.po b/addons/web_view_editor/i18n/en_GB.po
index 16cec72bb08..d731e3ab6e2 100644
--- a/addons/web_view_editor/i18n/en_GB.po
+++ b/addons/web_view_editor/i18n/en_GB.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_view_editor
diff --git a/addons/web_view_editor/i18n/es.po b/addons/web_view_editor/i18n/es.po
index 750ccbfd73f..92263676707 100644
--- a/addons/web_view_editor/i18n/es.po
+++ b/addons/web_view_editor/i18n/es.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_view_editor
diff --git a/addons/web_view_editor/i18n/es_DO.po b/addons/web_view_editor/i18n/es_DO.po
index 10367e46e60..eb5c525bc8c 100644
--- a/addons/web_view_editor/i18n/es_DO.po
+++ b/addons/web_view_editor/i18n/es_DO.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_view_editor
diff --git a/addons/web_view_editor/i18n/es_EC.po b/addons/web_view_editor/i18n/es_EC.po
index 80b97fa65e5..8d7a3e1da7c 100644
--- a/addons/web_view_editor/i18n/es_EC.po
+++ b/addons/web_view_editor/i18n/es_EC.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:03+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_view_editor
diff --git a/addons/web_view_editor/i18n/es_MX.po b/addons/web_view_editor/i18n/es_MX.po
index d61ba35aa83..4fdd23c02a9 100644
--- a/addons/web_view_editor/i18n/es_MX.po
+++ b/addons/web_view_editor/i18n/es_MX.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:03+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_view_editor
diff --git a/addons/web_view_editor/i18n/et.po b/addons/web_view_editor/i18n/et.po
index a5e9d9edddf..b4808d44ae3 100644
--- a/addons/web_view_editor/i18n/et.po
+++ b/addons/web_view_editor/i18n/et.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_view_editor
diff --git a/addons/web_view_editor/i18n/fa.po b/addons/web_view_editor/i18n/fa.po
index 01d6b7fdd8b..b304dc67a72 100644
--- a/addons/web_view_editor/i18n/fa.po
+++ b/addons/web_view_editor/i18n/fa.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_view_editor
diff --git a/addons/web_view_editor/i18n/fi.po b/addons/web_view_editor/i18n/fi.po
index a7b3b066d30..a610e768ea0 100644
--- a/addons/web_view_editor/i18n/fi.po
+++ b/addons/web_view_editor/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_view_editor
diff --git a/addons/web_view_editor/i18n/fr.po b/addons/web_view_editor/i18n/fr.po
index fa6559af4ce..d2008178441 100644
--- a/addons/web_view_editor/i18n/fr.po
+++ b/addons/web_view_editor/i18n/fr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_view_editor
diff --git a/addons/web_view_editor/i18n/he.po b/addons/web_view_editor/i18n/he.po
index 0a03b5fe540..2dbf396ec3e 100644
--- a/addons/web_view_editor/i18n/he.po
+++ b/addons/web_view_editor/i18n/he.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_view_editor
diff --git a/addons/web_view_editor/i18n/hr.po b/addons/web_view_editor/i18n/hr.po
index db674e7317f..832bdfd1f6c 100644
--- a/addons/web_view_editor/i18n/hr.po
+++ b/addons/web_view_editor/i18n/hr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_view_editor
diff --git a/addons/web_view_editor/i18n/hu.po b/addons/web_view_editor/i18n/hu.po
index 3ae322d8042..46d32ec08d3 100644
--- a/addons/web_view_editor/i18n/hu.po
+++ b/addons/web_view_editor/i18n/hu.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_view_editor
diff --git a/addons/web_view_editor/i18n/it.po b/addons/web_view_editor/i18n/it.po
index 9d9f2746fd8..b342fea3931 100644
--- a/addons/web_view_editor/i18n/it.po
+++ b/addons/web_view_editor/i18n/it.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_view_editor
diff --git a/addons/web_view_editor/i18n/ko.po b/addons/web_view_editor/i18n/ko.po
index 1c28b376502..deffd84432c 100644
--- a/addons/web_view_editor/i18n/ko.po
+++ b/addons/web_view_editor/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_view_editor
diff --git a/addons/web_view_editor/i18n/lt.po b/addons/web_view_editor/i18n/lt.po
index 43efb46a716..7a2485e1347 100644
--- a/addons/web_view_editor/i18n/lt.po
+++ b/addons/web_view_editor/i18n/lt.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_view_editor
diff --git a/addons/web_view_editor/i18n/lv.po b/addons/web_view_editor/i18n/lv.po
index f1cf5e0ec95..5adfebf5ac8 100644
--- a/addons/web_view_editor/i18n/lv.po
+++ b/addons/web_view_editor/i18n/lv.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_view_editor
diff --git a/addons/web_view_editor/i18n/mk.po b/addons/web_view_editor/i18n/mk.po
index c96938eed06..241ba007a27 100644
--- a/addons/web_view_editor/i18n/mk.po
+++ b/addons/web_view_editor/i18n/mk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_view_editor
diff --git a/addons/web_view_editor/i18n/mn.po b/addons/web_view_editor/i18n/mn.po
index dc3bc84c08d..99d685383c7 100644
--- a/addons/web_view_editor/i18n/mn.po
+++ b/addons/web_view_editor/i18n/mn.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_view_editor
diff --git a/addons/web_view_editor/i18n/nb.po b/addons/web_view_editor/i18n/nb.po
index 33bf7157839..9c697e0d52e 100644
--- a/addons/web_view_editor/i18n/nb.po
+++ b/addons/web_view_editor/i18n/nb.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:38+0000\n"
-"PO-Revision-Date: 2013-03-30 20:32+0000\n"
+"PO-Revision-Date: 2014-05-11 00:38+0000\n"
 "Last-Translator: Jakob Aresvik <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@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: 2014-04-23 07:02+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-05-11 07:08+0000\n"
+"X-Generator: Launchpad (build 16996)\n"
 
 #. module: web_view_editor
 #. openerp-web
@@ -29,7 +29,7 @@ msgstr "Følgende felt er ugyldige :"
 #: code:addons/web_view_editor/static/src/js/view_editor.js:63
 #, python-format
 msgid "Create"
-msgstr "Lag"
+msgstr "Opprett"
 
 #. module: web_view_editor
 #. openerp-web
@@ -50,7 +50,7 @@ msgstr "Vil du virkelig opprette en underordnet visning her?"
 #: code:addons/web_view_editor/static/src/js/view_editor.js:397
 #, python-format
 msgid "Preview"
-msgstr ""
+msgstr "Forhåndsvis"
 
 #. module: web_view_editor
 #. openerp-web
@@ -64,7 +64,7 @@ msgstr "Ønsker du virkelig å slette denne visningen?"
 #: code:addons/web_view_editor/static/src/js/view_editor.js:90
 #, python-format
 msgid "Save"
-msgstr "Save"
+msgstr "Lagre"
 
 #. module: web_view_editor
 #. openerp-web
@@ -79,21 +79,21 @@ msgstr "Velg et element"
 #: code:addons/web_view_editor/static/src/js/view_editor.js:962
 #, python-format
 msgid "Update"
-msgstr "Oppdatér"
+msgstr "Oppdater"
 
 #. module: web_view_editor
 #. openerp-web
 #: code:addons/web_view_editor/static/src/js/view_editor.js:264
 #, python-format
 msgid "Please select view in list :"
-msgstr ""
+msgstr "Velg visning i listen :"
 
 #. module: web_view_editor
 #. openerp-web
 #: code:addons/web_view_editor/static/src/js/view_editor.js:37
 #, python-format
 msgid "Manage Views (%s)"
-msgstr "Administrere visninger (%s)"
+msgstr "Administrer visninger (%s)"
 
 #. module: web_view_editor
 #. openerp-web
@@ -115,7 +115,7 @@ msgstr "Egenskaper"
 #: code:addons/web_view_editor/static/src/js/view_editor.js:64
 #, python-format
 msgid "Edit"
-msgstr "Redigér"
+msgstr "Rediger"
 
 #. module: web_view_editor
 #. openerp-web
@@ -157,7 +157,7 @@ msgstr "Kan ikke oppdatere visning"
 #: code:addons/web_view_editor/static/src/js/view_editor.js:380
 #, python-format
 msgid "View Editor %d - %s"
-msgstr ""
+msgstr "Visningsredigerer %d - %s"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/nl.po b/addons/web_view_editor/i18n/nl.po
index 1700010331f..85d7808759f 100644
--- a/addons/web_view_editor/i18n/nl.po
+++ b/addons/web_view_editor/i18n/nl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_view_editor
diff --git a/addons/web_view_editor/i18n/nl_BE.po b/addons/web_view_editor/i18n/nl_BE.po
index ebc84293f05..f6485200f7a 100644
--- a/addons/web_view_editor/i18n/nl_BE.po
+++ b/addons/web_view_editor/i18n/nl_BE.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_view_editor
diff --git a/addons/web_view_editor/i18n/pl.po b/addons/web_view_editor/i18n/pl.po
index 2e7f842ac7a..b8a83e68f8f 100644
--- a/addons/web_view_editor/i18n/pl.po
+++ b/addons/web_view_editor/i18n/pl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_view_editor
diff --git a/addons/web_view_editor/i18n/pt.po b/addons/web_view_editor/i18n/pt.po
index 2410f6433e6..7e6d6af1a5e 100644
--- a/addons/web_view_editor/i18n/pt.po
+++ b/addons/web_view_editor/i18n/pt.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_view_editor
diff --git a/addons/web_view_editor/i18n/pt_BR.po b/addons/web_view_editor/i18n/pt_BR.po
index de36d40d227..214f7536f8e 100644
--- a/addons/web_view_editor/i18n/pt_BR.po
+++ b/addons/web_view_editor/i18n/pt_BR.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_view_editor
diff --git a/addons/web_view_editor/i18n/ro.po b/addons/web_view_editor/i18n/ro.po
index 8f4777650d4..da07cd6f1a8 100644
--- a/addons/web_view_editor/i18n/ro.po
+++ b/addons/web_view_editor/i18n/ro.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_view_editor
diff --git a/addons/web_view_editor/i18n/ru.po b/addons/web_view_editor/i18n/ru.po
index b5bc2fdebfd..534203a9e96 100644
--- a/addons/web_view_editor/i18n/ru.po
+++ b/addons/web_view_editor/i18n/ru.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_view_editor
diff --git a/addons/web_view_editor/i18n/sl.po b/addons/web_view_editor/i18n/sl.po
index 02a510cff28..083210445bf 100644
--- a/addons/web_view_editor/i18n/sl.po
+++ b/addons/web_view_editor/i18n/sl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_view_editor
diff --git a/addons/web_view_editor/i18n/sv.po b/addons/web_view_editor/i18n/sv.po
index c1fbdd23c1d..65ceab6205e 100644
--- a/addons/web_view_editor/i18n/sv.po
+++ b/addons/web_view_editor/i18n/sv.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_view_editor
diff --git a/addons/web_view_editor/i18n/th.po b/addons/web_view_editor/i18n/th.po
index 0dcf781ef19..454cd8e46fb 100644
--- a/addons/web_view_editor/i18n/th.po
+++ b/addons/web_view_editor/i18n/th.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_view_editor
diff --git a/addons/web_view_editor/i18n/tr.po b/addons/web_view_editor/i18n/tr.po
index 367d62e6a9c..602e1bd9e65 100644
--- a/addons/web_view_editor/i18n/tr.po
+++ b/addons/web_view_editor/i18n/tr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_view_editor
diff --git a/addons/web_view_editor/i18n/zh_CN.po b/addons/web_view_editor/i18n/zh_CN.po
index 9e84c491a83..76229d165ab 100644
--- a/addons/web_view_editor/i18n/zh_CN.po
+++ b/addons/web_view_editor/i18n/zh_CN.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-23 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: web_view_editor
diff --git a/openerp/addons/base/i18n/bg.po b/openerp/addons/base/i18n/bg.po
index a0537f0c0c0..3f78612134b 100644
--- a/openerp/addons/base/i18n/bg.po
+++ b/openerp/addons/base/i18n/bg.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:35+0000\n"
-"PO-Revision-Date: 2014-04-17 18:40+0000\n"
+"PO-Revision-Date: 2014-05-09 13:12+0000\n"
 "Last-Translator: Vihren Kanev <Unknown>\n"
 "Language-Team: Bulgarian <bg@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: 2014-04-30 06:45+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-05-10 07:55+0000\n"
+"X-Generator: Launchpad (build 16996)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -15626,7 +15626,7 @@ msgstr "Перспектива"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_stock_invoice_directly
 msgid "Invoice Picking Directly"
-msgstr ""
+msgstr "Фактуриране и директно натоварване"
 
 #. module: base
 #: selection:base.language.install,lang:0
diff --git a/openerp/addons/base/i18n/nb.po b/openerp/addons/base/i18n/nb.po
index bf0c8fcdca8..7d23733ff7a 100644
--- a/openerp/addons/base/i18n/nb.po
+++ b/openerp/addons/base/i18n/nb.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:35+0000\n"
-"PO-Revision-Date: 2012-12-21 23:09+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2014-05-11 02:06+0000\n"
+"Last-Translator: Kenneth Aalberg <kenneaal@gmail.com>\n"
 "Language-Team: Norwegian Bokmal <nb@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: 2014-04-30 06:52+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-05-11 07:08+0000\n"
+"X-Generator: Launchpad (build 16996)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -25,11 +25,15 @@ msgid ""
 "================================================\n"
 "    "
 msgstr ""
+"\n"
+"Modul for sjekkskriving og sjekkprinting.\n"
+"===================================\n"
+"    "
 
 #. module: base
 #: view:res.partner.bank:0
 msgid "e.g. GEBABEBB"
-msgstr ""
+msgstr "d.v.s GEBABEBB"
 
 #. module: base
 #: model:res.country,name:base.sh
@@ -65,7 +69,7 @@ msgstr "Utsnittsoppbygging"
 #. module: base
 #: model:ir.module.module,summary:base.module_sale_stock
 msgid "Quotation, Sale Orders, Delivery & Invoicing Control"
-msgstr ""
+msgstr "Tilbud, salgsordre, leveranse og faktura-kontroll"
 
 #. module: base
 #: selection:ir.sequence,implementation:0
@@ -80,7 +84,7 @@ msgstr "Ungarsk / Magyar"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (PY) / Español (PY)"
-msgstr "Spanish (PY) / Español (PY)"
+msgstr "Spansk (PY) / Español (PY)"
 
 #. module: base
 #: model:ir.module.category,description:base.module_category_project_management
@@ -94,12 +98,12 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,summary:base.module_point_of_sale
 msgid "Touchscreen Interface for Shops"
-msgstr ""
+msgstr "Touchscreen grensesnitt for butikker"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_in_hr_payroll
 msgid "Indian Payroll"
-msgstr ""
+msgstr "Indisk lønningssystem"
 
 #. module: base
 #: help:ir.cron,model:0
@@ -129,11 +133,22 @@ msgid ""
 "    * Product Attributes\n"
 "    "
 msgstr ""
+"\n"
+"En modul som legger til produsenter og egenskaper på produkt skjemaet.\n"
+"===================================================================\n"
+"\n"
+"Du kan nå definere disse feltene for et produkt:\n"
+"-------------------------------------------------\n"
+"    * Produsent\n"
+"    * Produsentens produktnavn\n"
+"    * Produsentens produktkode\n"
+"    * Produktegenskaper\n"
+"    "
 
 #. module: base
 #: field:ir.actions.client,params:0
 msgid "Supplementary arguments"
-msgstr ""
+msgstr "Tilleggsargumenter"
 
 #. module: base
 #: model:ir.module.module,description:base.module_google_base_account
@@ -142,11 +157,14 @@ msgid ""
 "The module adds google user in res user.\n"
 "========================================\n"
 msgstr ""
+"\n"
+"Denne modulen legger til google-bruker i res.user.\n"
+"=========================================\n"
 
 #. module: base
 #: help:res.partner,employee:0
 msgid "Check this box if this contact is an Employee."
-msgstr ""
+msgstr "Kryss av her hvis kontakten er en ansatt"
 
 #. module: base
 #: help:ir.model.fields,domain:0
@@ -155,6 +173,9 @@ msgid ""
 "specified as a Python expression defining a list of triplets. For example: "
 "[('color','=','red')]"
 msgstr ""
+"Domenet (valgfritt) for å begrense mulige verdier for relasjonsfelt, "
+"spesifisert som en Python-setning som definerer en liste med trillinger. For "
+"eksempel [(color','=','red')]"
 
 #. module: base
 #: field:res.partner,ref:0
@@ -164,7 +185,7 @@ msgstr "Referanse"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_be_invoice_bba
 msgid "Belgium - Structured Communication"
-msgstr ""
+msgstr "Belgia - Strukturert kommunikasjon"
 
 #. module: base
 #: field:ir.actions.act_window,target:0
@@ -174,12 +195,12 @@ msgstr "Målvindu"
 #. module: base
 #: field:ir.actions.report.xml,report_rml:0
 msgid "Main Report File Path"
-msgstr ""
+msgstr "Filbane for hovedplassering av rapporter"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_analytic_plans
 msgid "Sales Analytic Distribution"
-msgstr ""
+msgstr "Salgsdistribusjons analyse"
 
 #. module: base
 #: model:ir.module.module,description:base.module_hr_timesheet_invoice
@@ -211,12 +232,14 @@ msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
 "them through Python code, preferably through a custom addon!"
 msgstr ""
+"Egenskaper til grunnleggende felt kan ikke endres på denne måten! Vennligst "
+"modifiser dem via Python kode, helst gjennom en egen modul!"
 
 #. module: base
 #: code:addons/osv.py:151
 #, python-format
 msgid "Constraint Error"
-msgstr "Betingelsesfeil"
+msgstr "Begrensningsfeil"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_ui_view_custom
@@ -227,7 +250,7 @@ msgstr "ir.ui.view.custom"
 #: code:addons/base/ir/ir_model.py:374
 #, python-format
 msgid "Renaming sparse field \"%s\" is not allowed"
-msgstr ""
+msgstr "Det er ikke tillatt å tildele feltet \"%s\" et nytt navn"
 
 #. module: base
 #: model:res.country,name:base.sz
@@ -243,12 +266,12 @@ msgstr "opprettet."
 #. module: base
 #: field:ir.actions.report.xml,report_xsl:0
 msgid "XSL Path"
-msgstr ""
+msgstr "XSL bane"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_tr
 msgid "Turkey - Accounting"
-msgstr ""
+msgstr "Tyrkia - regnskap"
 
 #. module: base
 #: field:ir.sequence,number_increment:0
@@ -264,7 +287,7 @@ msgstr "Firmastruktur"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Inuktitut / ᐃᓄᒃᑎᑐᑦ"
-msgstr ""
+msgstr "Inuktitut / ᐃᓄᒃᑎᑐᑦ"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_ch
@@ -302,11 +325,43 @@ msgid ""
 "launchpad:\n"
 " https://launchpad.net/openerp-swiss-localization\n"
 msgstr ""
+"\n"
+" Sveitsisk lokalisering:\n"
+" ====================\n"
+" ** Flerspråklig Sveitsisk STERCHI kontograf og skatter**\n"
+"  **Forfatter:** Camptocamp SA\n"
+"\n"
+"  **Finansielle bidragsytere:** Prisme Solutions Informatique SA,, Quod SA\n"
+"\n"
+"  ** Oversettelse bidragsytere:** brain-tec AG, Agile Business Group\n"
+"\n"
+" **Denne versjonen innfører store endringer i l10n_ch.**\n"
+"\n"
+" På grunn av viktige behov for refaktorering og Sveits sin innføring av en "
+"ny internasjonal betalingsstandard i 2013-2014, har vi reorganisert de "
+"sveitsiske lokaliseringsmodulene slik:\n"
+"\n"
+" -**l10n_ch**: Flerspråkelig Sveitsisk STERCHI kontograf og skatter "
+"(offisiell modul)\n"
+" -**l10n_ch_base_bank**: Teknisk modul som introduserer en ny og forenklet "
+"versjon av banktypestyring\n"
+" -**l10n_ch_bank**: Liste over Sveitsiske banker\n"
+" -**l10n_ch_zip**: Liste over Sveitiske postnummer\n"
+" -**l10n_ch_dta**: Støtte for DTA betalingsprotokollen (Vil bli utfaset ved "
+"utgangen av 2014)\n"
+" -**l10n_ch_payment_slip**: Støtte for ESR/BVR betalingskvitteringsrapport "
+"og rekonsiliering. Rapport refaktorert med lettere elementreposisjonering.\n"
+" -**l10n_ch_sepa**: Alpha implementasjon av PostFinance SEPA/PAIN, vil bli "
+"fullført i løpet av 2013/2014\n"
+"\n"
+" Modulene vil bli tilgjengelige via Sveitsisk lokalisasjon av OpenERP via "
+"launchpad:\n"
+" https://launchpad..net/openerp-swiss-localization\n"
 
 #. module: base
 #: model:res.groups,name:base.group_multi_currency
 msgid "Multi Currencies"
-msgstr ""
+msgstr "Flere valutaer"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_cl
@@ -318,6 +373,12 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"Chilensk finansgrafer og skattelokalisasjon.\n"
+"===================================\n"
+"Plan contable chileno e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale
@@ -330,6 +391,7 @@ msgid ""
 "The internal user that is in charge of communicating with this contact if "
 "any."
 msgstr ""
+"Intern bruker med ansvar for kommunikasjon med denne kontakten, hvis noen."
 
 #. module: base
 #: view:res.partner:0
@@ -344,7 +406,7 @@ msgstr "Antall moduler"
 #. module: base
 #: help:multi_company.default,company_dest_id:0
 msgid "Company to store the current record"
-msgstr ""
+msgstr "Firma for å lagre nåværende post"
 
 #. module: base
 #: field:res.partner.bank.type.field,size:0
@@ -357,6 +419,8 @@ msgid ""
 "Database ID of record to open in form view, when ``view_mode`` is set to "
 "'form' only"
 msgstr ""
+"Database ID til raden  som skal åpnes i skjemavisning, når ''view_mode'' er "
+"satt til 'skjema'"
 
 #. module: base
 #: help:ir.values,key2:0
@@ -368,6 +432,12 @@ msgid ""
 "  - tree_but_open\n"
 "For defaults, an optional condition"
 msgstr ""
+"For handlinger, en av de mulige handlingstypene: \n"
+"  - client_action_multi\n"
+"  - client_print_multi\n"
+"  - client_action_relate\n"
+"  - tree_but_open\n"
+"For standardverdier kan du angi en begrensning"
 
 #. module: base
 #: sql_constraint:res.lang:0
@@ -400,7 +470,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.category,name:base.module_category_customer_relationship_management
 msgid "Customer Relationship Management"
-msgstr ""
+msgstr "Kunderelasjonshåndtering"
 
 #. module: base
 #: model:ir.module.module,description:base.module_delivery
@@ -414,6 +484,13 @@ msgid ""
 "invoices from picking, OpenERP is able to add and compute the shipping "
 "line.\n"
 msgstr ""
+"\n"
+"Lar deg legge til leveringsmetoder i salgs- og plukkordre.\n"
+"====================================================\n"
+"\n"
+"Du kan definere din egen speditør og leveringsområder for prising. Når du "
+"lager \n"
+"fakturaer fra plukklister, kan OpenERP legge sammen og beregne fraktlinjen.\n"
 
 #. module: base
 #: code:addons/base/ir/ir_filters.py:80
@@ -422,17 +499,19 @@ msgid ""
 "There is already a shared filter set as default for %(model)s, delete or "
 "change it before setting a new default"
 msgstr ""
+"Det er allerede satt et delt filter som standard for %(model)s, slett eller "
+"endre det før du setter et nytt standardfilter"
 
 #. module: base
 #: code:addons/orm.py:2649
 #, python-format
 msgid "Invalid group_by"
-msgstr "Ugyldig gruppering"
+msgstr "Ugyldig group_by"
 
 #. module: base
 #: field:ir.module.category,child_ids:0
 msgid "Child Applications"
-msgstr ""
+msgstr "Underliggende applikasjoner"
 
 #. module: base
 #: field:res.partner,credit_limit:0
@@ -454,7 +533,7 @@ msgstr "Dato oppdatert"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_base_action_rule
 msgid "Automated Action Rules"
-msgstr ""
+msgstr "Automatiserte handlingsregler"
 
 #. module: base
 #: view:ir.attachment:0
@@ -470,7 +549,7 @@ msgstr "Kildeobjekt"
 #. module: base
 #: model:res.partner.bank.type,format_layout:base.bank_normal
 msgid "%(bank_name)s: %(acc_number)s"
-msgstr ""
+msgstr "%(bank_name)s: %(acc_number)s"
 
 #. module: base
 #: view:ir.actions.todo:0
@@ -495,6 +574,8 @@ msgid ""
 "Invalid date/time format directive specified. Please refer to the list of "
 "allowed directives, displayed when you edit a language."
 msgstr ""
+"Ugyldig dato/tidsformat direktiv spesifisert. Vennligst referer til listen "
+"over tillatte direktiver, som vises når du redigerer et språk."
 
 #. module: base
 #: code:addons/orm.py:4153
@@ -504,7 +585,7 @@ msgid ""
 "(Document type: %s)."
 msgstr ""
 "En av postene som du forsøker å endre på har allerede blitt slettet "
-"(Dokument type: %s)."
+"(Dokumenttype: %s)."
 
 #. module: base
 #: help:ir.actions.act_window,views:0
@@ -514,16 +595,20 @@ msgid ""
 "and reference view. The result is returned as an ordered list of pairs "
 "(view_id,view_mode)."
 msgstr ""
+"Dette funksjonsfeltet beregner den ordnede listen over visninger som skal "
+"være tilgjengelig når resultatet fra en handling vises, i sammenfatnet "
+"visning, eller referansevisning. Resultatet blir returnert som en ordnet "
+"liste av par (view_id,view_mode)."
 
 #. module: base
 #: field:ir.model.relation,name:0
 msgid "Relation Name"
-msgstr ""
+msgstr "Relasjonsnavn"
 
 #. module: base
 #: view:ir.rule:0
 msgid "Create Access Right"
-msgstr ""
+msgstr "Lag tilgangsrettighet"
 
 #. module: base
 #: model:res.country,name:base.tv
@@ -543,7 +628,7 @@ msgstr "Datoformat"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_base_report_designer
 msgid "OpenOffice Report Designer"
-msgstr "OpenOffice Rapport Designer"
+msgstr "OpenOffice rapportdesigner"
 
 #. module: base
 #: model:res.country,name:base.an
@@ -558,12 +643,12 @@ msgid ""
 "created by OpenERP (updates, module installation, ...)"
 msgstr ""
 "Du kan ikke fjerne admin brukeren da den brukes internt for ressurser "
-"opprettet av OpenERP (oppdateringer, modul installasjoner, ...)"
+"opprettet av OpenERP (oppdateringer, modulinstallasjoner, ...)"
 
 #. module: base
 #: view:workflow.transition:0
 msgid "Workflow Transition"
-msgstr ""
+msgstr "Arbeidsflytsovergang"
 
 #. module: base
 #: model:res.country,name:base.gf
@@ -573,7 +658,7 @@ msgstr "Fransk Guyana"
 #. module: base
 #: model:ir.module.module,summary:base.module_hr
 msgid "Jobs, Departments, Employees Details"
-msgstr ""
+msgstr "Jobber, avdelinger og ansatte detaljer"
 
 #. module: base
 #: model:ir.module.module,description:base.module_analytic
@@ -589,6 +674,16 @@ msgid ""
 "that have no counterpart in the general financial accounts.\n"
 "    "
 msgstr ""
+"\n"
+"Modul for definering av objekt for analytisk regnskapsføring.\n"
+"=================================================\n"
+"\n"
+"I OpenERP er analytiske kontoer knyttet til generelle kontoer, men blir "
+"behandlet\n"
+"uavhengig. Du kan dermed gå inn i forskjellige analytiske operasjoner som "
+"ikke har\n"
+"noen tilsvarende enhet i de generelle finanskontoene.\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_idea
@@ -612,6 +707,18 @@ msgid ""
 "* Use emails to automatically confirm and send acknowledgements for any "
 "event registration\n"
 msgstr ""
+"\n"
+"Organisasjon og administrasjon av arrangementer.\n"
+"=========================================\n"
+"\n"
+"Event modulen lar deg effektivt organisere arrangementer og alle relaterte "
+"oppgaver: planlegging, registrering, oppmøte o.s.v.\n"
+"\n"
+"Nøkkelegenskaper:\n"
+"------------------\n"
+"* Administrer arrangementer og registrering\n"
+"* Bruk epost for å automatisk bekrefte og sende tilbakemelding for alle "
+"arrangementsregistreringer.\n"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -624,7 +731,7 @@ msgid ""
 "If you check this, then the second time the user prints with same attachment "
 "name, it returns the previous report."
 msgstr ""
-"Hvis du krysser av denne, så vil den forrige rapporten returneres den andre "
+"Hvis du krysser av denne, vil den forrige rapporten returneres den andre "
 "gangen brukeren skriver ut med samme vedleggsnavnet."
 
 #. module: base
@@ -640,7 +747,7 @@ msgstr "Spansk (AR) / Español (AR)"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_invoice
 msgid "Invoice on Timesheets"
-msgstr ""
+msgstr "Faktura på timelister"
 
 #. module: base
 #: view:base.module.upgrade:0
@@ -666,7 +773,7 @@ msgstr "Colombia"
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_mister
 msgid "Mister"
-msgstr ""
+msgstr "Herr"
 
 #. module: base
 #: help:res.country,code:0
@@ -674,8 +781,8 @@ msgid ""
 "The ISO country code in two chars.\n"
 "You can use this field for quick search."
 msgstr ""
-"ISO landekode (to karakterer).\n"
-"Du kan bruke dette feltet for rask søking."
+"ISO-landskode (to bokstaver).\n"
+"Du kan bruke dette i hurtigsøkfeltet."
 
 #. module: base
 #: model:res.country,name:base.pw
@@ -690,7 +797,7 @@ msgstr "Salg & Innkjøp"
 #. module: base
 #: view:res.partner:0
 msgid "Put an internal note..."
-msgstr ""
+msgstr "Lag et internt notat..."
 
 #. module: base
 #: view:ir.translation:0
@@ -700,7 +807,7 @@ msgstr "Ikke oversatt"
 #. module: base
 #: view:ir.mail_server:0
 msgid "Outgoing Mail Server"
-msgstr ""
+msgstr "Utgående eposttjener"
 
 #. module: base
 #: help:ir.actions.act_window,context:0
@@ -708,11 +815,12 @@ msgstr ""
 msgid ""
 "Context dictionary as Python expression, empty by default (Default: {})"
 msgstr ""
+"Kontekst dictionary som Python-setning, tom som standard (Standard: {})"
 
 #. module: base
 #: field:res.company,logo_web:0
 msgid "Logo Web"
-msgstr ""
+msgstr "Logo nettsted"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:344
@@ -723,22 +831,22 @@ msgstr "Egendefinerte felter må ha et navn som starter med 'x_' !"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_mx
 msgid "Mexico - Accounting"
-msgstr ""
+msgstr "Mexico - Regnskapsføring"
 
 #. module: base
 #: help:ir.actions.server,action_id:0
 msgid "Select the Action Window, Report, Wizard to be executed."
-msgstr "Velg handling, vindu, rapport, veileder som skal eksekveres."
+msgstr "Velg handling, vindu, rapport, veileder som skal kjøres."
 
 #. module: base
 #: sql_constraint:ir.config_parameter:0
 msgid "Key must be unique."
-msgstr "Nøkkel må være unik"
+msgstr "Nøkkel må være unik."
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_plugin_outlook
 msgid "Outlook Plug-In"
-msgstr "Outlook Plug-In"
+msgstr "Outlook tillegg"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account
@@ -771,6 +879,31 @@ msgid ""
 "module named account_voucher.\n"
 "    "
 msgstr ""
+"\n"
+"Regnskap og finansstyring.\n"
+"============================\n"
+"\n"
+"Finans og regnskapsmodul som dekker:\n"
+"----------------------------------------------------------\n"
+"    * Generelt regnskap\n"
+"    * Kostanalyse\n"
+"    * Tredjepartsregnskap\n"
+"    * Moms- og skattebehandling\n"
+"    * Budsjetter\n"
+"    * Kunde- og leverandørfakturering\n"
+"    * Kontoutskrifter\n"
+"    * Forsoningsprosess per partner\n"
+"\n"
+"Lager et instrumentpanel for regnskapsførere som inkluderer:\n"
+"--------------------------------------------------\n"
+"    * Liste over kundefakturaer til godkjenning\n"
+"    * Firmaanalyse\n"
+"    * Grafer over aktiva\n"
+"\n"
+"Prosesser slik som hovedbokføring blir gjort via definerte finansjournaler "
+"(linjedetaljer og gruppering beholdes i journalen) \n"
+"for finansåret, og for kuponger fins modulen account_voucher.\n"
+"    "
 
 #. module: base
 #: view:ir.model:0
@@ -788,6 +921,12 @@ msgid ""
 "Contains the installer for marketing-related modules.\n"
 "    "
 msgstr ""
+"\n"
+"Meny for markedsføring.\n"
+"=====================\n"
+"\n"
+"Inneholder installasjonsprogram for markedsføringsrelaterte moduler.\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,description:base.module_web_linkedin
@@ -798,12 +937,17 @@ msgid ""
 "This module provides the Integration of the LinkedIn with OpenERP.\n"
 "        "
 msgstr ""
+"\n"
+"OpenERP Web LinkedIn modul.\n"
+"==========================\n"
+"Denne modulen gir integrasjon mot LinkedIn i OpenERP.\n"
+"        "
 
 #. module: base
 #: help:ir.actions.act_window,src_model:0
 msgid ""
 "Optional model name of the objects on which this action should be visible"
-msgstr ""
+msgstr "Opsjonelt modellnavn for objekter hvor denne handlingen skal vises"
 
 #. module: base
 #: field:workflow.transition,trigger_expr_id:0
@@ -818,12 +962,12 @@ msgstr "Jordan"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hr
 msgid "Croatia - RRIF 2012 COA"
-msgstr ""
+msgstr "Kroatia - RRIF 2012 COA"
 
 #. module: base
 #: help:ir.cron,nextcall:0
 msgid "Next planned execution date for this job."
-msgstr ""
+msgstr "Neste planlagte utføring av denne jobben."
 
 #. module: base
 #: model:ir.model,name:base.model_ir_ui_view
@@ -848,12 +992,12 @@ msgstr "Automatiserte handinger"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_ro
 msgid "Romania - Accounting"
-msgstr ""
+msgstr "Romania - Regnskapsføring"
 
 #. module: base
 #: model:ir.model,name:base.model_res_config_settings
 msgid "res.config.settings"
-msgstr ""
+msgstr "res.config.settings"
 
 #. module: base
 #: help:res.partner,image_small:0
@@ -862,6 +1006,9 @@ msgid ""
 "image, with aspect ratio preserved. Use this field anywhere a small image is "
 "required."
 msgstr ""
+"Lite bilde av denne kontakten. Bildet blir automatisk skalert til et 64x64px "
+"bilde, med aspektrate preservert. Bruk dette feltet hvorenn et lite bilde "
+"trengs."
 
 #. module: base
 #: help:ir.actions.server,mobile:0
@@ -877,12 +1024,12 @@ msgstr ""
 #. module: base
 #: view:ir.mail_server:0
 msgid "Security and Authentication"
-msgstr ""
+msgstr "Sikkerhet og autentisering"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_calendar
 msgid "Web Calendar"
-msgstr ""
+msgstr "Webkalender"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -893,7 +1040,7 @@ msgstr "Svensk"
 #: field:base.language.export,name:0
 #: field:ir.attachment,datas_fname:0
 msgid "File Name"
-msgstr ""
+msgstr "Filnavn"
 
 #. module: base
 #: model:res.country,name:base.rs
@@ -908,19 +1055,19 @@ msgstr "Veiviser visning"
 #. module: base
 #: model:res.country,name:base.kh
 msgid "Cambodia, Kingdom of"
-msgstr "Kambodsja, Kongeriket Kambodsja"
+msgstr "Kambodsja, Kongeriket"
 
 #. module: base
 #: field:base.language.import,overwrite:0
 #: field:base.language.install,overwrite:0
 msgid "Overwrite Existing Terms"
-msgstr ""
+msgstr "Overskriv eksisterende vilkår"
 
 #. module: base
 #: code:addons/base/res/res_currency.py:52
 #, python-format
 msgid "No currency rate associated for currency %d for the given period"
-msgstr ""
+msgstr "Ingen vekslingsrate for valutaen %d er angitt for den gitte perioden"
 
 #. module: base
 #: model:ir.module.module,description:base.module_hr_holidays
@@ -950,6 +1097,31 @@ msgid ""
 "also possible in order to automatically create a meeting when a holiday "
 "request is accepted by setting up a type of meeting in Leave Type.\n"
 msgstr ""
+"\n"
+"Håndterer ferie og allokasjonsforespørsler\n"
+"==================================\n"
+"\n"
+"Denne applikasjonen kontrollerer ferieavviklingen for ditt firma. Det lar "
+"ansatte sende forespørsler om fri. Deretter kan ledere se over "
+"forespørselene og godta eller avvise dem. På denne måten kan du kontrollere "
+"ferieavvikling for firmaet eller avdelingen.\n"
+"\n"
+"Du kan konfigurere flere typer fravær (Sykdom, helligdag, ferie med lønn, "
+"...) og tildele fritid til ansatte eller avdelinger hurtig ved hjelp av "
+"allokasjonsforespørsler. En ansatt kan også legge inn forespørsel etter "
+"flere fridager ved å lage en ny allokasjon. Dette vil øke antallet dager for "
+"den typen fravær (hvis forespørselen godkjennes).\n"
+"\n"
+"Du kan spore ferieavvikling på forskjellige måter ved hjelp av følgende "
+"rapporter: \n"
+"\n"
+"* Feriesammendrag\n"
+"* Fravær per avdelinge\n"
+"* Fraværsanalyse\n"
+"\n"
+"Synkronisering med intern møteplan (Møter via CRM-modulen) er også mulig for "
+"å automatisk lage et møte når en ferieforespørsel blir akseptert, ved å "
+"sette opp en møtetype i \"fraværstype\".\n"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -980,7 +1152,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_document_webdav
 msgid "Shared Repositories (WebDAV)"
-msgstr ""
+msgstr "Delte mapper (WebDAV)"
 
 #. module: base
 #: view:res.users:0
@@ -991,12 +1163,12 @@ msgstr "E-post innstillinger"
 #: code:addons/base/ir/ir_fields.py:195
 #, python-format
 msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
-msgstr ""
+msgstr "'%s' ser ikke ut til å være en gyldig dato for felt '%%(field)s'"
 
 #. module: base
 #: view:res.partner:0
 msgid "My Partners"
-msgstr ""
+msgstr "Mine partnere"
 
 #. module: base
 #: model:res.country,name:base.zw
@@ -1008,6 +1180,7 @@ msgstr "Zimbabwe"
 msgid ""
 "Type of the constraint: `f` for a foreign key, `u` for other constraints."
 msgstr ""
+"Type begrensning: 'f' for ekstern nøkkel, 'u' for andre begrensninger."
 
 #. module: base
 #: view:ir.actions.report.xml:0
@@ -1023,12 +1196,12 @@ msgstr "Spania"
 #: help:ir.actions.act_window,domain:0
 msgid ""
 "Optional domain filtering of the destination data, as a Python expression"
-msgstr ""
+msgstr "Opsjonell domenefiltrering av måldata, som en Python-setning"
 
 #. module: base
 #: model:ir.model,name:base.model_base_module_upgrade
 msgid "Module Upgrade"
-msgstr "Moduloppgradering"
+msgstr "Moduloppdatering"
 
 #. module: base
 #: view:res.bank:0
@@ -1037,12 +1210,12 @@ msgstr "Moduloppgradering"
 #: view:res.partner.bank:0
 #: view:res.users:0
 msgid "ZIP"
-msgstr ""
+msgstr "ZIP"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (UY) / Español (UY)"
-msgstr "Spanish (UY) / Español (UY)"
+msgstr "Spansk (UY) / Español (UY)"
 
 #. module: base
 #: field:res.partner,mobile:0
@@ -1057,7 +1230,7 @@ msgstr "Oman"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_mrp
 msgid "MRP"
-msgstr ""
+msgstr "MRP"
 
 #. module: base
 #: model:ir.module.module,description:base.module_hr_attendance
@@ -1070,6 +1243,13 @@ msgid ""
 "actions(Sign in/Sign out) performed by them.\n"
 "       "
 msgstr ""
+"\n"
+"Denne modulen behandler ansattes tilstedeværelse.\n"
+"===========================================\n"
+"\n"
+"Holder følge med tilstedeværelse av ansatte på grunnlag av\n"
+"på- og avlogging.\n"
+"       "
 
 #. module: base
 #: model:res.country,name:base.nu
@@ -1079,7 +1259,7 @@ msgstr "Niue"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_membership
 msgid "Membership Management"
-msgstr ""
+msgstr "Medlemskapsadministrasjon"
 
 #. module: base
 #: selection:ir.module.module,license:0
@@ -1089,7 +1269,7 @@ msgstr "Andre OSI godkjente lisenser"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_gantt
 msgid "Web Gantt"
-msgstr ""
+msgstr "Web Ganttgraf"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.act_menu_create
@@ -1106,17 +1286,17 @@ msgstr "India"
 #: model:ir.actions.act_window,name:base.res_request_link-act
 #: model:ir.ui.menu,name:base.menu_res_request_link_act
 msgid "Request Reference Types"
-msgstr ""
+msgstr "Hent referansetyper"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_google_base_account
 msgid "Google Users"
-msgstr ""
+msgstr "Google brukere"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_fleet
 msgid "Fleet Management"
-msgstr ""
+msgstr "Flåtebehandling"
 
 #. module: base
 #: help:ir.server.object.lines,value:0
@@ -1127,6 +1307,10 @@ msgid ""
 "If Value type is selected, the value will be used directly without "
 "evaluation."
 msgstr ""
+"Setning som inneholder en verdispesifikasjon. \n"
+"Når Formula typen er valgt, kan dette feltet inneholde en Python setning som "
+"kan bruke de samme verdiene som begrensningsfeltet til serverhandlingen.\n"
+"Hvis Verdi typen velges, kan verdien benytes direkte uten evaluering."
 
 #. module: base
 #: model:res.country,name:base.ad
@@ -1136,7 +1320,7 @@ msgstr "Andorra"
 #. module: base
 #: field:ir.rule,perm_read:0
 msgid "Apply for Read"
-msgstr ""
+msgstr "Be om les"
 
 #. module: base
 #: model:res.country,name:base.mn
@@ -1187,18 +1371,19 @@ msgstr "TGZ arkiv"
 msgid ""
 "Users added to this group are automatically added in the following groups."
 msgstr ""
+"Brukere lagt til i denne gruppen blir automatisk lagt til i følgende grupper."
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:732
 #: code:addons/base/ir/ir_model.py:735
 #, python-format
 msgid "Document model"
-msgstr ""
+msgstr "Dokumentmodell"
 
 #. module: base
 #: view:res.users:0
 msgid "Change the user password."
-msgstr ""
+msgstr "Endre brukerens passord."
 
 #. module: base
 #: view:res.lang:0
@@ -1295,12 +1480,12 @@ msgstr "Navnet på landet må være unikt !"
 #. module: base
 #: field:ir.module.module,installed_version:0
 msgid "Latest Version"
-msgstr ""
+msgstr "Siste versjon"
 
 #. module: base
 #: view:ir.rule:0
 msgid "Delete Access Right"
-msgstr ""
+msgstr "Fjern tilgangsrettighet"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
@@ -1331,18 +1516,18 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.kr
 msgid "South Korea"
-msgstr "Sør Korea"
+msgstr "Sør-Korea"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_si
 msgid "Kontni načrt za gospodarske družbe"
-msgstr ""
+msgstr "Kontoplan for bedrifter"
 
 #. module: base
 #: code:addons/orm.py:4920
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
-msgstr ""
+msgstr "Rad #%d av %s ikke funnet, kan ikke kopiere!"
 
 #. module: base
 #: field:ir.module.module,contributors:0
@@ -1362,12 +1547,12 @@ msgstr "Tegn"
 #. module: base
 #: field:ir.module.category,visible:0
 msgid "Visible"
-msgstr ""
+msgstr "Synlig"
 
 #. module: base
 #: model:ir.actions.client,name:base.action_client_base_menu
 msgid "Open Settings Menu"
-msgstr ""
+msgstr "Åpne innstillingsmeny"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -1382,7 +1567,7 @@ msgstr "Uganda"
 #. module: base
 #: field:ir.model.access,perm_unlink:0
 msgid "Delete Access"
-msgstr "Slett tilgang"
+msgstr "Slettetilgang"
 
 #. module: base
 #: model:res.country,name:base.ne
@@ -1412,12 +1597,12 @@ msgstr "Spansk (AR) / Español (AR)"
 #. module: base
 #: field:ir.mail_server,smtp_port:0
 msgid "SMTP Port"
-msgstr "SMTP Port"
+msgstr "SMTP port"
 
 #. module: base
 #: help:res.users,login:0
 msgid "Used to log into the system"
-msgstr ""
+msgstr "Brukes for å logge seg inn i systemet"
 
 #. module: base
 #: view:base.language.export:0
@@ -1427,6 +1612,9 @@ msgid ""
 "                                for uploading to OpenERP's translation "
 "platform,"
 msgstr ""
+"TGZ format: dette er et komprimert arkiv som inneholder en .PO fil, som "
+"egner seg\n"
+"                         for opplastning til OpenERPs oversettelsesplattform,"
 
 #. module: base
 #: view:res.lang:0
@@ -1435,7 +1623,7 @@ msgid ""
 "decimal number [00,53]. All days in a new year preceding the first Monday "
 "are considered to be in week 0."
 msgstr ""
-"%W - Ukenummer i året (Mandag som første dag i uken) som et desimtall "
+"%W - Ukenummer i året (Mandag som første dag i uken) som et desimaltall "
 "[00,53]. Alle dager i et nytt år forut for den første mandagen blir ansett "
 "til å være i uke 0."
 
@@ -1443,7 +1631,7 @@ msgstr ""
 #: code:addons/base/module/wizard/base_language_install.py:53
 #, python-format
 msgid "Language Pack"
-msgstr ""
+msgstr "Språkpakke"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_tests
@@ -1453,12 +1641,12 @@ msgstr "Tester"
 #. module: base
 #: field:ir.actions.report.xml,attachment:0
 msgid "Save as Attachment Prefix"
-msgstr ""
+msgstr "Lagre som vedleggsprefiks"
 
 #. module: base
 #: field:ir.ui.view_sc,res_id:0
 msgid "Resource Ref."
-msgstr "Ressures ref."
+msgstr "Ressursref."
 
 #. module: base
 #: field:ir.actions.act_url,url:0
@@ -1474,13 +1662,13 @@ msgstr "Modulnavn"
 #. module: base
 #: model:res.country,name:base.mh
 msgid "Marshall Islands"
-msgstr "Marshalløyene, Republikken Marshalløyene"
+msgstr "Marshalløyene"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:429
 #, python-format
 msgid "Changing the model of a field is forbidden!"
-msgstr ""
+msgstr "Å endre modellen til et felt er ikke tillatt!"
 
 #. module: base
 #: model:res.country,name:base.ht
@@ -1490,7 +1678,7 @@ msgstr "Haiti"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_fr_hr_payroll
 msgid "French Payroll"
-msgstr ""
+msgstr "Fransk lønningsavregning"
 
 #. module: base
 #: view:ir.ui.view:0
@@ -1507,14 +1695,15 @@ msgid ""
 "reference it\n"
 "- creation/update: a mandatory field is not correctly set"
 msgstr ""
-"Handlingen kan ikke fullføres, sannsynligvis p.g.a følgende:\n"
-"- Sletting: Du forsøker å slette en post som det fremdeles refereres til\n"
-"- Ny/ Endre: Et obligatorisk felt er ikke korrekt angitt"
+"Handlingen kan ikke fullføres, sannsynligvis på grunn av følgende:\n"
+"- Sletting: Du forsøker å slette en post som andre poster fremdeles "
+"refererer til\n"
+"- Ny/Endre: Et obligatorisk felt er ikke korrekt angitt"
 
 #. module: base
 #: field:ir.module.category,parent_id:0
 msgid "Parent Application"
-msgstr ""
+msgstr "Overordnet applikasjon"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_action_wizard
@@ -1527,17 +1716,17 @@ msgstr "Veivisere"
 #: code:addons/base/res/res_users.py:131
 #, python-format
 msgid "Operation Canceled"
-msgstr "Operasjon avbrutt"
+msgstr "Operasjonen ble avbrutt"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_document
 msgid "Document Management System"
-msgstr ""
+msgstr "Dokumentbehandlingssystem"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_crm_claim
 msgid "Claims Management"
-msgstr ""
+msgstr "Claims Management"
 
 #. module: base
 #: model:ir.module.module,description:base.module_document_webdav
@@ -1570,6 +1759,33 @@ msgid ""
 "Also implements IETF RFC 5785 for services discovery on a http server,\n"
 "which needs explicit configuration in openerp-server.conf too.\n"
 msgstr ""
+"\n"
+"Med denne modulen aktiveres WebDAV serveren for dokumenter.\n"
+"=====================================================\n"
+"\n"
+"Du kan da benytte enhver kompatibel leser for å se vedlegger til "
+"OpenObject.\n"
+"\n"
+"Etter installasjon kan WebDAV serveren kontrolleres med en  [webdav] seksjon "
+"i \n"
+"serverens konfigurasjon.\n"
+"\n"
+"Serverparametre:\n"
+"---------------------------\n"
+"[webdav]:\n"
+"++++++++++ \n"
+"    * enable = True ; Tilby WebDAV via http(s) serverene\n"
+"    * vdir = webdav ; katalogen som WebDAV blir servert fra;\n"
+"    * denne standardverdien betyr at WebDAV blir tilgjengelig\n"
+"    * fra http://localhost:8069/webdav/\n"
+"    * verbose = True ; Skru på utfyllende meldinger fra WebDAV\n"
+"    * debug = True ; Skru på feilsøkingsmeldinger fra WebDAV\n"
+"    * siden meldingene er logget via Python, med nivåene\n"
+"    * \"debug\" og \"debug_rpc\", kan du la disse verdiene være\n"
+"    * \"true\"\n"
+"\n"
+"Implementerer også IETF RFC 5785 for tjenesteoppdagelse via http,\n"
+"noe som også trenger eksplisitt konfigurasjon i openerp-server.conf.\n"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_purchase_management
@@ -1596,6 +1812,16 @@ msgid ""
 "with a single statement.\n"
 "    "
 msgstr ""
+"\n"
+"Denne modulen installerer basisen for IBAN (International Bank Account "
+"Number) bankkontoer og sjekker at de er gyldige.\n"
+"============================================================================="
+"======================\n"
+"\n"
+"Gir mulighet til å hente ut korrekt representerte lokale kontoer fra IBAN "
+"kontoer\n"
+"med en enkel setning.\n"
+"    "
 
 #. module: base
 #: view:ir.module.module:0
@@ -1629,11 +1855,13 @@ msgid ""
 "If specified, this action will be opened at logon for this user, in addition "
 "to the standard menu."
 msgstr ""
+"Hvis spesifisert, vil denne handlingen bli kjørt når brukeren logger inn, i "
+"tillegg til standardmenyen."
 
 #. module: base
 #: model:res.country,name:base.mf
 msgid "Saint Martin (French part)"
-msgstr ""
+msgstr "Saint Martin (fransk del)"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_exports
@@ -1664,7 +1892,7 @@ msgstr "Språkkode \"%s\" finnes ikke"
 #: model:ir.module.category,name:base.module_category_social_network
 #: model:ir.module.module,shortdesc:base.module_mail
 msgid "Social Network"
-msgstr ""
+msgstr "Sosialt nettverk"
 
 #. module: base
 #: view:res.lang:0
@@ -1674,12 +1902,12 @@ msgstr "%Y - År med århundre."
 #. module: base
 #: view:res.company:0
 msgid "Report Footer Configuration"
-msgstr ""
+msgstr "Konfigurer fottekst på rapporter"
 
 #. module: base
 #: field:ir.translation,comments:0
 msgid "Translation comments"
-msgstr ""
+msgstr "Oversettelseskommentarer"
 
 #. module: base
 #: model:ir.module.module,description:base.module_lunch
@@ -1705,6 +1933,26 @@ msgid ""
 "in their pockets, this module is essential.\n"
 "    "
 msgstr ""
+"\n"
+"Basismodul for lunch-håndtering.\n"
+"============================\n"
+"\n"
+"Mange firma bestiller smørbrød, pizza eller lignende til sine ansatte fra "
+"forskjellige leverandører.\n"
+"\n"
+"Slike innkjøp krever administrasjon innenfor firmaet, spesielt når antall "
+"ansatte eller leverandørbruk er viktig.\n"
+"\n"
+"Lunchmodulen har blitt utviklet for å forenkle denne administrasjonen, og "
+"tilbyr også flere verktøy til ansatte.\n"
+"\n"
+"I tillegg til full kontroll over måltider og leverandører, lar denne modulen "
+"deg vise advarsler i forhold til matvalg, og gjør det mulig å gjøre raske "
+"valg basert på den ansattes preferanser.\n"
+"\n"
+"Hvis du vil spare dine ansatte tid, og forhindre småinnkjøp, er denne "
+"modulen essensiell.\n"
+"    "
 
 #. module: base
 #: view:wizard.ir.model.menu.create:0
@@ -1717,6 +1965,8 @@ msgid ""
 "The field on the current object that links to the target object record (must "
 "be a many2one, or an integer field with the record ID)"
 msgstr ""
+"Feltet på nåværende objekt som lenker til målobjektets post (må være en "
+"mange-til-en, eller et heltallsfelt med postens ID)"
 
 #. module: base
 #: model:ir.model,name:base.model_res_bank
@@ -1736,11 +1986,13 @@ msgid ""
 "Helps you manage your purchase-related processes such as requests for "
 "quotations, supplier invoices, etc..."
 msgstr ""
+"Hjelper deg med å håndtere dine innkjøps-relaterte prosesser slik som "
+"forespørsler på tilbud, leverandørfaktura, osv..."
 
 #. module: base
 #: help:res.partner,website:0
 msgid "Website of Partner or Company"
-msgstr ""
+msgstr "Nettsted til partner eller firma"
 
 #. module: base
 #: help:base.language.install,overwrite:0
@@ -1748,6 +2000,8 @@ msgid ""
 "If you check this box, your customized translations will be overwritten and "
 "replaced by the official ones."
 msgstr ""
+"Hvis du merker av denne boksen, vil dine tilpassede oversettelser "
+"overskrives med offisielle oversettelser."
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_res_partner_bank_account_form
@@ -1765,6 +2019,18 @@ msgid ""
 "              </p>  \n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Klikk for å lage en bankkonto.\n"
+"              </p><p>\n"
+"                Konfigurer ditt firmas bankkontoer, og velg de som må stå på "
+"bunnen av rapporter.\n"
+"                Du kan endre rekkefølgen på kontoene fra listevisningen.\n"
+"              </p>\n"
+"              <p>\n"
+"                Hvis du bruker regnskapsmodulen i OpenERP, vil journaler og "
+"kontoer bli automatisk skapt basert på disse dataene.\n"
+"              </p>  \n"
+"            "
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_action_report_xml
@@ -1795,20 +2061,20 @@ msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
 "used to refer to other modules data, as in module.reference_id"
 msgstr ""
-"\"%s\" inneholder for mange punktum. XML identer skal ikke inneholde punktum "
-"! Disse er forbeholdt å referere til data i andre moduler, f.eks. som i "
+"\"%s\" inneholder for mange punktum. XML id-er skal ikke inneholde punktum ! "
+"Disse er forbeholdt for å referere til data i andre moduler, f.eks. som i "
 "module.reference_id"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:85
 #, python-format
 msgid "Invalid Search Criteria"
-msgstr ""
+msgstr "Ugyldige søkekriterier"
 
 #. module: base
 #: field:res.users,login:0
 msgid "Login"
-msgstr "Login"
+msgstr "Logg inn"
 
 #. module: base
 #: view:ir.actions.server:0
@@ -1816,6 +2082,8 @@ msgid ""
 "Access all the fields related to the current object using expressions, i.e. "
 "object.partner_id.name "
 msgstr ""
+"Få tilgang til alle felt relatert til det nåværende objektet ved hjelp av "
+"setninger, slik som object.partner_id.name "
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_portal_project_issue
@@ -1840,11 +2108,15 @@ msgid ""
 "Launch Manually Once: after having been launched manually, it sets "
 "automatically to Done."
 msgstr ""
+"Manuell: Startes manuelt.\n"
+"Automatisk: Kjører når systemet blir rekonfigurert.\n"
+"Start manuelt en gang: Etter å ha blitt kjørt manuelt, settes den automatisk "
+"til Fullført."
 
 #. module: base
 #: field:res.partner,image_small:0
 msgid "Small-sized image"
-msgstr ""
+msgstr "Lite bilde"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_stock
@@ -1859,7 +2131,7 @@ msgstr "res.request.link"
 #. module: base
 #: field:ir.actions.wizard,name:0
 msgid "Wizard Info"
-msgstr "Veiviser informasjon"
+msgstr "Veiviserinformasjon"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_wizard_lang_export
@@ -1877,24 +2149,24 @@ msgstr "Handlinger på server"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_lu
 msgid "Luxembourg - Accounting"
-msgstr ""
+msgstr "Luxembourg - Regnskapsføring"
 
 #. module: base
 #: model:res.country,name:base.tp
 msgid "East Timor"
-msgstr "Øst Timor"
+msgstr "Øst-Timor"
 
 #. module: base
 #: field:workflow.transition,act_to:0
 msgid "Destination Activity"
-msgstr "Aktivitetsblokker"
+msgstr "Målaktivitet"
 
 #. module: base
 #: code:addons/base/module/module.py:414
 #: view:ir.module.module:0
 #, python-format
 msgid "Install"
-msgstr ""
+msgstr "Installer"
 
 #. module: base
 #: field:res.currency,accuracy:0
@@ -1912,11 +2184,17 @@ msgid ""
 "Please keep in mind that you should review and adapt it with your "
 "Accountant, before using it in a live Environment.\n"
 msgstr ""
+"\n"
+"Denne modulen tilbyr standard kontooppsett for Sveits, som er basert på "
+"malen fra BMF.gv.at.\n"
+"=========================================================================\n"
+"Vennligst husk at du bør se over og tilpasse oppsettet med din "
+"regnskapsfører, før du benytter det i produksjonsmiljø.\n"
 
 #. module: base
 #: model:res.country,name:base.kg
 msgid "Kyrgyz Republic (Kyrgyzstan)"
-msgstr "Kirgisistan, Republikken Kirgisistan"
+msgstr "Kirgisistan, Republikken"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_accountant
@@ -1930,6 +2208,14 @@ msgid ""
 "It assigns manager and user access rights to the Administrator and only user "
 "rights to the Demo user. \n"
 msgstr ""
+"\n"
+"Regnskapstilgangsrettigheter\n"
+"========================\n"
+"Dette gir administratorbrukeren tilgang til alle regnskapsføringsfunksjoner, "
+"slik som journaler og kontooversikten.\n"
+"\n"
+"Det gir manager og user tilgangsrettigheter til administratoren, og kun "
+"brukerrettigheter til Demo brukeren. \n"
 
 #. module: base
 #: view:ir.sequence:0
@@ -1943,12 +2229,14 @@ msgid ""
 "simplified payment mode encoding, automatic picking lists generation and "
 "more."
 msgstr ""
+"Hjelper deg med å få det meste ut av utsalgssteder med rask salgshåndtering, "
+"forenklet betalingsmåte, automatisk plukkliste generering og mer."
 
 #. module: base
 #: code:addons/base/ir/ir_fields.py:164
 #, python-format
 msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
-msgstr ""
+msgstr "Ukjent verdi '%s' for booleansk felt '%%(field)s', antar '%s'"
 
 #. module: base
 #: model:res.country,name:base.nl
@@ -1963,7 +2251,7 @@ msgstr ""
 #. module: base
 #: selection:ir.translation,state:0
 msgid "Translation in Progress"
-msgstr ""
+msgstr "Oversettelse pågår"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_rule
@@ -1978,7 +2266,7 @@ msgstr "Dager"
 #. module: base
 #: model:ir.module.module,summary:base.module_fleet
 msgid "Vehicle, leasing, insurances, costs"
-msgstr ""
+msgstr "Kjøretøy, leasing, forsikring, kostnader"
 
 #. module: base
 #: view:ir.model.access:0
@@ -1989,7 +2277,7 @@ msgstr "Lesetilgang"
 #. module: base
 #: help:ir.attachment,res_id:0
 msgid "The record id this is attached to"
-msgstr ""
+msgstr "IDen denne posten er tilkoblet"
 
 #. module: base
 #: model:ir.module.module,description:base.module_share
@@ -2011,11 +2299,27 @@ msgid ""
 "synchronization with other companies.\n"
 "    "
 msgstr ""
+"\n"
+"Denne modulen gir generiske delingsverkøty til din nåværende OpenERP "
+"database.\n"
+"===================================================================\n"
+"\n"
+"Den legger til en 'del' knapp som er tilgjengelig i webklienten, og lar deg\n"
+"dele hvilken som helst type OpenERP data med kollegaer, kunder og venner.\n"
+"\n"
+"Systemet kan lage nye brukere og grupper, og ved å kombinere riktige\n"
+"tilgangsrettigheter og ir.rules, forsikrer det at brukerene kun har tilgang "
+"til\n"
+"data som har blitt delt med dem.\n"
+"\n"
+"Dette er veldig nyttig for samarbeid, kunnskapsdeling og synkronisering\n"
+"med andre firmaer.\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_process
 msgid "Enterprise Process"
-msgstr ""
+msgstr "Enterpriseprosess"
 
 #. module: base
 #: help:res.partner,supplier:0
@@ -2023,11 +2327,13 @@ msgid ""
 "Check this box if this contact is a supplier. If it's not checked, purchase "
 "people will not see it when encoding a purchase order."
 msgstr ""
+"Merk av denne boksen hvis kontakten er en leverandør. Hvis den ikke er "
+"merket, vil ikke innkjøpsbrukere kunne se den når de lager en innkjøpsordre."
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_evaluation
 msgid "Employee Appraisals"
-msgstr ""
+msgstr "Medarbeidersamtaler"
 
 #. module: base
 #: selection:ir.actions.server,state:0
@@ -2059,18 +2365,18 @@ msgstr "Partnere"
 #. module: base
 #: field:res.partner.category,parent_left:0
 msgid "Left parent"
-msgstr ""
+msgstr "Venstre forelder"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_project_mrp
 msgid "Create Tasks on SO"
-msgstr ""
+msgstr "Lag oppgaver på SO"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:320
 #, python-format
 msgid "This column contains module data and cannot be removed!"
-msgstr ""
+msgstr "Denne kolonnen inneholder moduldata, og kan ikke fjernes!"
 
 #. module: base
 #: field:res.partner.bank,footer:0

From fe9b88a3badf8e2b105465ab3dec0837516448b4 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Mon, 12 May 2014 10:25:20 +0530
Subject: [PATCH 072/225] [REVERT] Reverted the changes of rev 9219.

---
 addons/website_sale/controllers/main.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index efa0256eb1b..082b3c7dfd7 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -260,7 +260,7 @@ class website_sale(http.Controller):
 
         # if transaction pending / done: redirect to confirmation
         tx = context.get('website_sale_transaction')
-        if tx.state != 'shopping_cart':
+        if tx and tx.state != 'shopping_cart':
             return request.redirect('/shop/payment/confirmation/%s' % order.id)
 
     def checkout_values(self, data=None):
@@ -537,7 +537,7 @@ class website_sale(http.Controller):
                 'sale_order_id': order.id,
             }, context=context)
             request.session['sale_transaction_id'] = tx_id
-        elif tx.state == 'shopping_cart':  # button cliked but no more info -> rewrite on tx or create a new one ?
+        elif tx and tx.state == 'shopping_cart':  # button cliked but no more info -> rewrite on tx or create a new one ?
             tx.write({
                 'acquirer_id': acquirer_id,
             })

From 8c139b01e754cf0c412f3f258f963244bd6ccefe Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Mon, 12 May 2014 06:38:16 +0000
Subject: [PATCH 073/225] Launchpad automatic translations update.

---
 openerp/addons/base/i18n/nb.po | 1105 ++++++++++++++++++++++----------
 1 file changed, 765 insertions(+), 340 deletions(-)

diff --git a/openerp/addons/base/i18n/nb.po b/openerp/addons/base/i18n/nb.po
index 7d23733ff7a..fc3eac424c4 100644
--- a/openerp/addons/base/i18n/nb.po
+++ b/openerp/addons/base/i18n/nb.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:35+0000\n"
-"PO-Revision-Date: 2014-05-11 02:06+0000\n"
+"PO-Revision-Date: 2014-05-11 21:08+0000\n"
 "Last-Translator: Kenneth Aalberg <kenneaal@gmail.com>\n"
 "Language-Team: Norwegian Bokmal <nb@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: 2014-05-11 07:08+0000\n"
+"X-Launchpad-Export-Date: 2014-05-12 06:38+0000\n"
 "X-Generator: Launchpad (build 16996)\n"
 
 #. module: base
@@ -2381,7 +2381,7 @@ msgstr "Denne kolonnen inneholder moduldata, og kan ikke fjernes!"
 #. module: base
 #: field:res.partner.bank,footer:0
 msgid "Display on Reports"
-msgstr ""
+msgstr "Vis på rapporter"
 
 #. module: base
 #: model:ir.module.module,description:base.module_project_timesheet
@@ -2396,6 +2396,14 @@ msgid ""
 "with the effect of creating, editing and deleting either ways.\n"
 "    "
 msgstr ""
+"\n"
+"Synkronisasjon av prosjektoppgaver med timelister.\n"
+"==========================================\n"
+"\n"
+"Denne modulen lar deg overføre timer brukt på oppgaver definert i\n"
+"prosjektstyringsmodulen til timelister for bestemte datoer og brukere.\n"
+"Redigering, oppretting eller sletting kan skje begge veier.\n"
+"    "
 
 #. module: base
 #: model:ir.model,name:base.model_ir_model_access
@@ -2415,6 +2423,13 @@ msgid ""
 "          templates to target objects.\n"
 "    "
 msgstr ""
+"\n"
+"    * Flerspråklig støtte for kontooversikt, skatt, skattekoder, journaler\n"
+"       regnskapsmaler, analytiske kontooversikter og analytiske journaler.\n"
+"    * Endringer i installasjonsveiviser.\n"
+"        - Kopier oversettelser for COA, skatt, skattekoder og finans fra\n"
+"          maler til målobjekter.\n"
+"    "
 
 #. module: base
 #: field:workflow.transition,act_from:0
@@ -2424,7 +2439,7 @@ msgstr "Aktivitetskilde"
 #. module: base
 #: view:ir.sequence:0
 msgid "Legend (for prefix, suffix)"
-msgstr "Legend (for prefix, suffix)"
+msgstr "Kartnøkkel (for prefix, suffix)"
 
 #. module: base
 #: selection:ir.server.object.lines,type:0
@@ -2454,6 +2469,12 @@ msgid ""
 "Accounting chart and localization for Ecuador.\n"
 "    "
 msgstr ""
+"\n"
+"Dette er basismodulen for å styre kontoplaner for Ecuador i OpenERP.\n"
+"=========================================================\n"
+"\n"
+"Kontoplan og lokalisering for Ecuador.\n"
+"    "
 
 #. module: base
 #: code:addons/base/ir/ir_filters.py:36
@@ -2468,7 +2489,7 @@ msgstr "%s (kopi)"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_chart
 msgid "Template of Charts of Accounts"
-msgstr ""
+msgstr "Mal for kontoplan"
 
 #. module: base
 #: field:res.partner,type:0
@@ -2488,7 +2509,7 @@ msgstr "Full sti"
 #. module: base
 #: view:base.language.export:0
 msgid "The next step depends on the file format:"
-msgstr ""
+msgstr "Neste steg avhenger av filformatet:"
 
 #. module: base
 #: view:res.lang:0
@@ -2505,6 +2526,7 @@ msgstr ""
 #: view:base.language.export:0
 msgid "PO(T) format: you should edit it with a PO editor such as"
 msgstr ""
+"PO(T) format: du bør redigere den med et PO-redigeringsprogram slik som"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_administration
@@ -2528,7 +2550,7 @@ msgstr "Opprett / Skriv / Kopier"
 #. module: base
 #: view:ir.sequence:0
 msgid "Second: %(sec)s"
-msgstr ""
+msgstr "Sekund: %(sec)s"
 
 #. module: base
 #: field:ir.actions.act_window,view_mode:0
@@ -2541,6 +2563,8 @@ msgid ""
 "Display this bank account on the footer of printed documents like invoices "
 "and sales orders."
 msgstr ""
+"Vis denne bankkontoen i bunntekst på utskrevne dokumenter, slik som "
+"fakturaer og salgsordre."
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -2555,12 +2579,12 @@ msgstr "Koreansk (KP) / 한국어 (KP)"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_vn
 msgid "Vietnam Chart of Accounts"
-msgstr ""
+msgstr "Kontoplan for Vietnam"
 
 #. module: base
 #: model:res.country,name:base.ax
 msgid "Åland Islands"
-msgstr ""
+msgstr "Åland øyene"
 
 #. module: base
 #: field:res.company,logo:0
@@ -2570,7 +2594,7 @@ msgstr "Logo"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_cr
 msgid "Costa Rica - Accounting"
-msgstr ""
+msgstr "Costa Rica - Regnskapsføring"
 
 #. module: base
 #: selection:ir.actions.act_url,target:0
@@ -2581,12 +2605,12 @@ msgstr "Nytt vindu"
 #. module: base
 #: field:ir.values,action_id:0
 msgid "Action (change only)"
-msgstr ""
+msgstr "Handling (kun endring)"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_subscription
 msgid "Recurring Documents"
-msgstr ""
+msgstr "Repeterende dokumenter"
 
 #. module: base
 #: model:res.country,name:base.bs
@@ -2596,12 +2620,12 @@ msgstr "Bahamas"
 #. module: base
 #: field:ir.rule,perm_create:0
 msgid "Apply for Create"
-msgstr ""
+msgstr "Be om opprett"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_tools
 msgid "Extra Tools"
-msgstr ""
+msgstr "Ekstra Verktøy"
 
 #. module: base
 #: view:ir.attachment:0
@@ -2619,6 +2643,8 @@ msgid ""
 "Appears by default on the top right corner of your printed documents (report "
 "header)."
 msgstr ""
+"Legges til som standard i øverste høyre hjørne av dine utskrevne dokumenter "
+"(topptekst på rapporter)."
 
 #. module: base
 #: field:base.module.update,update:0
@@ -2628,17 +2654,17 @@ msgstr "Antall moduler oppdatert"
 #. module: base
 #: field:ir.cron,function:0
 msgid "Method"
-msgstr ""
+msgstr "Metode"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_auth_crypt
 msgid "Password Encryption"
-msgstr ""
+msgstr "Passordskryptering"
 
 #. module: base
 #: view:workflow.activity:0
 msgid "Workflow Activity"
-msgstr ""
+msgstr "Arbeidsflytsaktivitet"
 
 #. module: base
 #: model:ir.module.module,description:base.module_hr_timesheet_sheet
@@ -2666,6 +2692,27 @@ msgid ""
 "* Maximal difference between timesheet and attendances\n"
 "    "
 msgstr ""
+"\n"
+"Før og godkjenn timelister og oppmøte på en enkel måte\n"
+"==============================================\n"
+"\n"
+"Denne applikasjonen gir tilgang til et nytt skjermbilde hvor du kan klokke "
+"inn og ut, og føre logg over timeforbruk. Timelister blir generert for "
+"ansatte hver dag. På slutten av perioden kan ansatte validere sine "
+"timelister, og ledere kan godkjenne dem. Perioden er definert i "
+"firmainnstillingene, og kan være ukentlige eller månedlige.\n"
+"\n"
+"Hele timelisteprosessen er:\n"
+"-----------------------------------------\n"
+"* Generer timeliste\n"
+"* Den ansatte valider timelisten på slutten av perioden\n"
+"* Leder godkjenner timelisten\n"
+"\n"
+"Valideringen kan bli konfigurert i firmaet:\n"
+"--------------------------------------------------------------\n"
+"* Periodelengde (Dag, uke, måned)\n"
+"* Maksimal differanse mellom timeliste og oppmøte\n"
+"    "
 
 #. module: base
 #: code:addons/base/ir/ir_fields.py:341
@@ -2673,11 +2720,12 @@ msgstr ""
 msgid ""
 "No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
 msgstr ""
+"Ingen matchende post for %(field_type)s '%(value)s' i felt '%%(field)s'"
 
 #. module: base
 #: field:change.password.user,new_passwd:0
 msgid "New Password"
-msgstr ""
+msgstr "Nytt passord"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
@@ -2685,11 +2733,13 @@ msgid ""
 "Views allows you to personalize each view of OpenERP. You can add new "
 "fields, move fields, rename them or delete the ones that you do not need."
 msgstr ""
+"Visninger lar deg tilpasse hver visning i OpenERP. Du kan legge til felt, "
+"flytte felt, gi dem nye navn, eller slette de du ikke trenger."
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_base_setup
 msgid "Initial Setup Tools"
-msgstr ""
+msgstr "Verktøy for grunnleggende oppsett"
 
 #. module: base
 #: field:ir.actions.act_window,groups_id:0
@@ -2714,7 +2764,7 @@ msgstr "Grupper"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CL) / Español (CL)"
-msgstr "Spanish (CL) / Español (CL)"
+msgstr "Spansk (CL) / Español (CL)"
 
 #. module: base
 #: model:res.country,name:base.bz
@@ -2724,7 +2774,7 @@ msgstr "Belize"
 #. module: base
 #: help:ir.actions.report.xml,header:0
 msgid "Add or not the corporate RML header"
-msgstr "Legg til, eller ikke RML toppteksten til selskapet"
+msgstr "Skal RML toppteksten til selskapet legges til?"
 
 #. module: base
 #: model:ir.module.module,description:base.module_portal_anonymous
@@ -2734,6 +2784,10 @@ msgid ""
 "=================================\n"
 " "
 msgstr ""
+"\n"
+"Gi anonym tilgang til Portalen.\n"
+"========================\n"
+" "
 
 #. module: base
 #: model:res.country,name:base.ge
@@ -2784,6 +2838,8 @@ msgid ""
 "Comma-separated list of allowed view modes, such as 'form', 'tree', "
 "'calendar', etc. (Default: tree,form)"
 msgstr ""
+"Kommaseparert liste over tillate visningsmoduser, slik som 'skjema', 'tre', "
+"'kalender', o.l (Standard: tre,skjema)"
 
 #. module: base
 #: code:addons/orm.py:3843
@@ -2794,13 +2850,13 @@ msgstr "Et dokument har blitt endret siden du sist så på det (%s:%d)"
 #. module: base
 #: view:workflow:0
 msgid "Workflow Editor"
-msgstr ""
+msgstr "Arbeidsflytredigering"
 
 #. module: base
 #: selection:ir.module.module,state:0
 #: selection:ir.module.module.dependency,state:0
 msgid "To be removed"
-msgstr "Å fjerne"
+msgstr "Vil bli fjernet"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_sequence
@@ -2844,6 +2900,8 @@ msgid ""
 "View type: Tree type to use for the tree view, set to 'tree' for a "
 "hierarchical tree view, or 'form' for a regular list view"
 msgstr ""
+"Visningstype: Tretype for bruk i trevisning; sett til 'tre' for et hiearkisk "
+"tre, eller 'skjema' for en vanlig listevisning"
 
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
@@ -2853,7 +2911,7 @@ msgstr "Det eksisterer allerede en svarvei til denne menyen!"
 #. module: base
 #: view:ir.rule:0
 msgid "Groups (no group = global)"
-msgstr ""
+msgstr "Grupper (ingen gruppe = global)"
 
 #. module: base
 #: view:ir.module.module:0
@@ -2895,6 +2953,27 @@ msgid ""
 "Print product labels with barcode.\n"
 "    "
 msgstr ""
+"\n"
+"Dette er basismodulen for å behandle produkter og prislister i OpenERP.\n"
+"==========================================================\n"
+"\n"
+"Produktene kan ha forskjellige varianter, prisingsmetoder, "
+"leverandørinformasjon,\n"
+"produser til lager/ordre, forskjellige måleenheter, pakking og egenskaper.\n"
+"\n"
+"Prislister støtter:\n"
+"-------------------------\n"
+"    * Flere rabattnivåer (Etter produkt, etter kategori, etter kvantitet)\n"
+"    * Beregn pris basert på forskjellige kriterier:\n"
+"       * Annen prisliste\n"
+"       * Kostpris\n"
+"       * Listepris\n"
+"       * Forhandlerpris\n"
+"\n"
+"Prislistepreferanser basert på produkt eller partner.\n"
+"\n"
+"Skriv ut produktetiketter med strekkode.\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_analytic_default
@@ -2929,12 +3008,12 @@ msgstr "Madagaskar"
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
-"Objektnavnet må starte med x_ og kan ikke inneholde noen spesial karakterer !"
+"Objektnavnet må starte med x_ og kan ikke inneholde noen spesialkarakterer !"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_auth_oauth_signup
 msgid "Signup with OAuth2 Authentication"
-msgstr ""
+msgstr "Registrer med OAuth2 autentisering"
 
 #. module: base
 #: selection:ir.model,state:0
@@ -2951,7 +3030,7 @@ msgstr "Meny"
 #. module: base
 #: field:res.currency,rate:0
 msgid "Current Rate"
-msgstr "Gjeldene rate"
+msgstr "Gjeldende rate"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -2961,12 +3040,12 @@ msgstr "Gresk / Ελληνικά"
 #. module: base
 #: field:res.company,custom_footer:0
 msgid "Custom Footer"
-msgstr ""
+msgstr "Tilpasset bunntekst"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_crm
 msgid "Opportunity to Quotation"
-msgstr ""
+msgstr "Tilbudsmulighet"
 
 #. module: base
 #: model:ir.module.module,description:base.module_sale_analytic_plans
@@ -2979,6 +3058,12 @@ msgid ""
 "orders.\n"
 "    "
 msgstr ""
+"\n"
+"Basismodul for administrasjon av analytisk distribusjon og salgsordre.\n"
+"========================================================\n"
+"\n"
+"Bruk denne modulen hvis du vil lenke analytiske kontoer til salgsordre.\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_us
@@ -2988,6 +3073,9 @@ msgid ""
 "==================================\n"
 "    "
 msgstr ""
+"\n"
+"De Forente Stater - Kontoplan\n"
+"    "
 
 #. module: base
 #: field:ir.actions.act_url,target:0
@@ -3037,12 +3125,12 @@ msgstr "Anguilla"
 #. module: base
 #: model:ir.actions.report.xml,name:base.report_ir_model_overview
 msgid "Model Overview"
-msgstr ""
+msgstr "Modelloversikt"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_product_margin
 msgid "Margins by Products"
-msgstr "Margin pr product"
+msgstr "Margin per produkt"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_invoiced
@@ -3057,7 +3145,7 @@ msgstr "Navn på snarvei"
 #. module: base
 #: field:res.partner,contact_address:0
 msgid "Complete Address"
-msgstr ""
+msgstr "Fullstendig adresse"
 
 #. module: base
 #: help:ir.actions.act_window,limit:0
@@ -3079,6 +3167,17 @@ msgid ""
 "        * Files by Partner (graph)\n"
 "        * Files Size by Month (graph)\n"
 msgstr ""
+"\n"
+"Dette er et komplett dokumentstyringssystem.\n"
+"======================================\n"
+"    * Brukerautentisering\n"
+"    * Dokumentindeksering:- .pptx og .docx er ikke ståttet på Windows-"
+"plattformen.\n"
+"    * Instrumentpanel for dokumenter som inkluderer:\n"
+"       * Nye filer (liste)\n"
+"       * Filer etter ressurstype (graf)\n"
+"       * Filer etter partner (graf)\n"
+"       * Filstørrelse etter måned (graf)\n"
 
 #. module: base
 #: view:ir.actions.report.xml:0
@@ -3128,6 +3227,39 @@ msgid ""
 "* Monthly Turnover (Graph)\n"
 "    "
 msgstr ""
+"\n"
+"Administrer tilbud og salgsordre\n"
+"==========================\n"
+"\n"
+"Denne applikasjonen lar deg styre dine salgsmål på en effektiv måte ved å "
+"spore alle salgsordre og historikk.\n"
+"\n"
+"Den håndterer hele salgsarbeidsflyten:\n"
+"\n"
+"* **Tilbud** -> **Salgsordre** -> **Faktura**\n"
+"\n"
+"Innstillinger (Kun med lagermodulen installert)\n"
+"-----------------------------------------------------------------------\n"
+"\n"
+"Hvis du også har installert lagermodulen, kan du sette de følgende "
+"innstillingene:\n"
+"\n"
+"* Frakt: Velg mellom dellevering eller full levering\n"
+"* Fakturering: Velg hvordan fakturaer skal betaler\n"
+"* Incoterms: Internasjonale kommersielle avtaler\n"
+"\n"
+"Du kan velge mellom fleksible faktureringsmetoder:\n"
+"\n"
+"* *Ved behov*: Fakturaen genereres manuelt fra salgsordren når det trengs\n"
+"* *Ved leveranseordre*: Fakturaen genereres fra plukkliste (levering)\n"
+"* *Før levering*: En faktura blir generert og må betales før levering\n"
+"\n"
+"\n"
+"Instrumentpanelet for salgssjef inkluderer\n"
+"----------------------------------------------------------------\n"
+"* Mine tilbud\n"
+"* Månedlig omsetning (Graf)\n"
+"    "
 
 #. module: base
 #: field:ir.actions.act_window,res_id:0
@@ -3135,7 +3267,7 @@ msgstr ""
 #: field:ir.translation,res_id:0
 #: field:ir.values,res_id:0
 msgid "Record ID"
-msgstr ""
+msgstr "Post-ID"
 
 #. module: base
 #: field:ir.actions.server,email:0
@@ -3149,17 +3281,20 @@ msgid ""
 "Module to attach a google document to any model.\n"
 "================================================\n"
 msgstr ""
+"\n"
+"Modul for å koble et Google dokument til en modell.\n"
+"==========================================\n"
 
 #. module: base
 #: code:addons/base/ir/ir_fields.py:333
 #, python-format
 msgid "Found multiple matches for field '%%(field)s' (%d matches)"
-msgstr ""
+msgstr "Fant flere treff for feltet '%%(field)s' (%d treff)"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "French (BE) / Français (BE)"
-msgstr "Fransk / Français"
+msgstr "Fransk (BE) / Français (BE)"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_pe
@@ -3173,6 +3308,14 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"Kontokart og skattelokalisasjon for Peru. Følger PCGE 2010.\n"
+"================================================\n"
+"\n"
+"Plan contable peruano e impuestos de acuerdo a disposiciones vigentes de la\n"
+"SUNAT 2011 (PCGE 2010).\n"
+"\n"
+"    "
 
 #. module: base
 #: view:ir.actions.server:0
@@ -3183,17 +3326,17 @@ msgstr "Tjenerhandling"
 #. module: base
 #: help:ir.actions.client,params:0
 msgid "Arguments sent to the client along withthe view tag"
-msgstr ""
+msgstr "Argumenter sent til klienten sammen med visnings-taggen"
 
 #. module: base
 #: model:ir.module.module,summary:base.module_contacts
 msgid "Contacts, People and Companies"
-msgstr ""
+msgstr "Kontakter, personer og firmaer"
 
 #. module: base
 #: model:res.country,name:base.tt
 msgid "Trinidad and Tobago"
-msgstr "Trinidad and Tobago"
+msgstr "Trinidad og Tobago"
 
 #. module: base
 #: model:res.country,name:base.lv
@@ -3222,19 +3365,27 @@ msgid ""
 "This module is currently not compatible with the ``user_ldap`` module and\n"
 "will disable LDAP authentication completely if installed at the same time.\n"
 msgstr ""
+"\n"
+"Krypterte passord\n"
+"===============\n"
+"\n"
+"Interaksjon med LDAP-autentisering:\n"
+"-------------------------------\n"
+"Denne modulen er for tiden ikke kompatibel med ''user_ldap'' modulen,\n"
+"og vil skru av LDAP-autentisering hvis den blir installert samtidig.\n"
 
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
 #: model:res.groups,name:base.group_sale_manager
 #: model:res.groups,name:base.group_tool_manager
 msgid "Manager"
-msgstr ""
+msgstr "Leder"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:726
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
-msgstr ""
+msgstr "Beklager, du har ikke tilgang til dette dokumentet."
 
 #. module: base
 #: model:res.country,name:base.py
@@ -3249,7 +3400,7 @@ msgstr "Fiji"
 #. module: base
 #: view:ir.actions.report.xml:0
 msgid "Report Xml"
-msgstr ""
+msgstr "Rapport XML"
 
 #. module: base
 #: model:ir.module.module,description:base.module_purchase
@@ -3278,6 +3429,29 @@ msgid ""
 "* Purchase Analysis\n"
 "    "
 msgstr ""
+"\n"
+"Behandle materialkrav etter innkjøpsordre\n"
+"==================================\n"
+"\n"
+"Innkjøpsstyring lar deg spore dine leverandørers prislister, og kan "
+"konvertere dem til innkjøpsordre.\n"
+"OpenERP har flere metoder for å overvåke fakturaer, og kan spore mottak av "
+"bestilte varer. Du kan håndtere delleveringer i OpenERP, slik at du kan "
+"holde øye med varer som fortsatt ikke er levert på dine ordre. Du kan også "
+"sende ut påminnelser automatisk.\n"
+"\n"
+"OpenERP har regelbasert administrasjon av lagernivåer, slik at du kan "
+"generere innkjøpsordre automatisk, eller du kan sette opp en prosess som "
+"drives helt og holdent av produksjonsbehov.\n"
+"\n"
+"Instrumentbord / rapporter for innkjøpsstyring inkluderer:\n"
+"----------------------------------------------------------\n"
+"* Be om tilbud\n"
+"* Innkjøpsordre som venter på godkjenning\n"
+"* Månedlige innkjøp etter kategori\n"
+"* Mottaksanalyse\n"
+"* Innkjøpsanalyse\n"
+"    "
 
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_act_window_close
@@ -3287,7 +3461,7 @@ msgstr "ir.actions.act_window_close"
 #. module: base
 #: field:ir.server.object.lines,col1:0
 msgid "Destination"
-msgstr "Destinasjon"
+msgstr "Mål"
 
 #. module: base
 #: model:res.country,name:base.lt
@@ -3310,22 +3484,33 @@ msgid ""
 "    * Unlimited \"Group By\" levels (not stacked), two cross level analysis "
 "(stacked)\n"
 msgstr ""
+"\n"
+"Graf-visninger for webklient.\n"
+"=======================\n"
+"\n"
+"    * Vis en <graph> visning, men lar deg endre presentasjonen\n"
+"    * Graftyper: kake, linje, områder, stolper, radar\n"
+"    * Stablet/ikke stablet for områder og stolper\n"
+"    * Kartnøkler: topp, innenfor (topp/venstre), gjemt\n"
+"    * Last ned som PNG eller CSV, vise data, bytt akser\n"
+"    * Ubegrenset \"grupper etter\" nivåer (Ikke stablet), to "
+"kryssanalysenivåer (stablet)\n"
 
 #. module: base
 #: view:res.groups:0
 msgid "Inherited"
-msgstr ""
+msgstr "Arvet"
 
 #. module: base
 #: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "yes"
-msgstr ""
+msgstr "ja"
 
 #. module: base
 #: field:ir.model.fields,serialization_field_id:0
 msgid "Serialization Field"
-msgstr ""
+msgstr "Serialiseringsfelt"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_be_hr_payroll
@@ -3345,12 +3530,26 @@ msgid ""
 "    * Salary Maj, ONSS, Withholding Tax, Child Allowance, ...\n"
 "    "
 msgstr ""
+"\n"
+"Belgiske avlønningsregler.\n"
+"=====================\n"
+"\n"
+"    * Detaljer om ansatt\n"
+"    * Arbeidskontrakter\n"
+"    * Passbasert kontrakt\n"
+"    * Dagpenger/trekk\n"
+"    * Tillater konfigurasjon av grunnlønn, bruttolønn, nettolønn\n"
+"    * Lønnsslipp\n"
+"    * Månedlig avlønningsregister\n"
+"    * Integrert med ferieplanlegger\n"
+"    * Lønns Maj, ONSS, tilbakehold av skattetrekk, barnebidrag, ...\n"
+"    "
 
 #. module: base
 #: code:addons/base/ir/ir_fields.py:174
 #, python-format
 msgid "'%s' does not seem to be an integer for field '%%(field)s'"
-msgstr ""
+msgstr "'%s' er ikke et heltall for feltet '%%(field)s'"
 
 #. module: base
 #: model:ir.module.category,description:base.module_category_report_designer
@@ -3358,6 +3557,8 @@ msgid ""
 "Lets you install various tools to simplify and enhance OpenERP's report "
 "creation."
 msgstr ""
+"Lar deg installere forskjellige verktøy for å forenkle og forbedre OpenERPs "
+"rapporter"
 
 #. module: base
 #: view:res.lang:0
@@ -3409,14 +3610,14 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_linkedin
 msgid "LinkedIn Integration"
-msgstr ""
+msgstr "LinkedIn integrasjon"
 
 #. module: base
 #: code:addons/orm.py:2021
 #: code:addons/orm.py:2032
 #, python-format
 msgid "Invalid Object Architecture!"
-msgstr ""
+msgstr "Ugyldig objektarkitektur!"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:372
@@ -3461,6 +3662,8 @@ msgid ""
 "the user will have an access to the sales configuration as well as statistic "
 "reports."
 msgstr ""
+"brukeren vil ha tilgang til salgskonfigurasjonen så vel som "
+"statistikkrapporter."
 
 #. module: base
 #: model:res.country,name:base.nz
@@ -3481,6 +3684,9 @@ msgid ""
 "partner records. You can create or delete countries to make sure the ones "
 "you are working on will be maintained."
 msgstr ""
+"Vis og administrer liste over alle land som kan bli tildelt dine partner-"
+"poster.  Du kan slette eller opprette land for å være sikker på at de du "
+"jobber med vil bli vedlikeholdt."
 
 #. module: base
 #: model:res.country,name:base.nf
@@ -3490,12 +3696,12 @@ msgstr "Norfolk øyene"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Korean (KR) / 한국어 (KR)"
-msgstr ""
+msgstr "Koreansk (KR) / 한국어 (KR)"
 
 #. module: base
 #: help:ir.model.fields,model:0
 msgid "The technical name of the model this field belongs to"
-msgstr ""
+msgstr "Det tekniske navnet til modellen dette feltet hører til"
 
 #. module: base
 #: field:ir.actions.server,action_id:0
@@ -3522,16 +3728,29 @@ msgid ""
 "      above. Specify the interval information and partner to be invoice.\n"
 "    "
 msgstr ""
+"\n"
+"Opprett gjentagende dokumenter.\n"
+"============================\n"
+"\n"
+"Denne modulen lar deg opprette nye dokumenter og legge til abonnementer på "
+"det dokumentet.\n"
+"\n"
+"For eksempel, for å lage en faktura som periodisk genereres:\n"
+"---------------------------------------------------------------\n"
+"    * Definer en dokumenttype basert på faktura objektet\n"
+"    * Definer et abonnement som har et kildedokument definert som\n"
+"       over. Spesifiser intervallet og partneren som skal faktureres.\n"
+"    "
 
 #. module: base
 #: view:res.company:0
 msgid "e.g. Global Business Solutions"
-msgstr ""
+msgstr "f.eks. Global Business Solutions"
 
 #. module: base
 #: field:res.company,rml_header1:0
 msgid "Company Tagline"
-msgstr ""
+msgstr "Firmaets tagline"
 
 #. module: base
 #: code:addons/base/res/res_users.py:674
@@ -3541,7 +3760,7 @@ msgstr ""
 #: view:res.users:0
 #, python-format
 msgid "Application"
-msgstr ""
+msgstr "Applikasjon"
 
 #. module: base
 #: model:res.groups,comment:base.group_hr_manager
@@ -3549,6 +3768,8 @@ msgid ""
 "the user will have an access to the human resources configuration as well as "
 "statistic reports."
 msgstr ""
+"brukeren vil ha tilgang på ansattekonfigurasjon så vel som statistiske "
+"rapporter."
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_pl
@@ -3571,12 +3792,12 @@ msgstr ""
 #: code:addons/base/ir/ir_mail_server.py:222
 #, python-format
 msgid "Connection Test Succeeded!"
-msgstr ""
+msgstr "Tilkoblingstest fullført!"
 
 #. module: base
 #: field:ir.actions.client,params_store:0
 msgid "Params storage"
-msgstr ""
+msgstr "Parameterlagring"
 
 #. module: base
 #: code:addons/base/module/module.py:525
@@ -3593,12 +3814,12 @@ msgstr "Cuba"
 #: code:addons/report_sxw.py:443
 #, python-format
 msgid "Unknown report type: %s"
-msgstr ""
+msgstr "Ukjent rapporttype: %s"
 
 #. module: base
 #: model:ir.module.module,summary:base.module_hr_expense
 msgid "Expenses Validation, Invoicing"
-msgstr ""
+msgstr "Utgiftsføring, fakturering"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_be_hr_payroll_account
@@ -3617,7 +3838,7 @@ msgstr "Armenia"
 #. module: base
 #: model:ir.module.module,summary:base.module_hr_evaluation
 msgid "Periodical Evaluations, Appraisals, Surveys"
-msgstr ""
+msgstr "Periodiske evalueringer, verdivurdering, spørreundersøkelser"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_property_form
@@ -3638,7 +3859,7 @@ msgstr "Sverige"
 #. module: base
 #: field:ir.actions.report.xml,report_file:0
 msgid "Report File"
-msgstr ""
+msgstr "Rapportfil"
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
@@ -3671,7 +3892,7 @@ msgstr ""
 #: code:addons/orm.py:3871
 #, python-format
 msgid "Missing document(s)"
-msgstr ""
+msgstr "Manglende dokument(er)"
 
 #. module: base
 #: model:ir.model,name:base.model_res_partner_bank_type
@@ -3707,6 +3928,27 @@ msgid ""
 "customers' expenses if your work by project.\n"
 "    "
 msgstr ""
+"\n"
+"Utgiftsføring for ansatte\n"
+"======================\n"
+"\n"
+"Denne applikasjonen lar dine ansatte føre utgifter. Den gir deg tilgang til "
+"de ansattes kvitteringer, og lar deg fullføre og validere, eller avvise "
+"kvitteringene. Etter godkjenning lager den en faktura for den ansatte.\n"
+"Ansatte kan legge inn sine utgifter, og validasjonsflyten legger utgiftene "
+"automatisk inn i regnskapet etter godkjenning fra ledere.\n"
+"\n"
+"Hele flyten er implementert slik:\n"
+"-------------------------------------------\n"
+"* Før utgift\n"
+"* Den ansatte bekrefter utgiftsføringen\n"
+"* Godkjenning av leder\n"
+"* Godkjenning fra regnskapsfører og kvittering\n"
+"\n"
+"Modulen bruker også analytisk regnskapsføring, og er kompatibel med "
+"fakturadelen av timelistemodulen, slik at du automatisk kan viderefakturere "
+"utgiftene til dine kunder hvis det er prosjektarbeid.\n"
+"    "
 
 #. module: base
 #: view:base.language.export:0
@@ -3714,6 +3956,7 @@ msgid ""
 "For more details about translating OpenERP in your language, please refer to "
 "the"
 msgstr ""
+"For mer informasjon om oversettelse av OpenERP til ditt språk, vennligst se"
 
 #. module: base
 #: field:res.partner,image:0
@@ -3736,7 +3979,7 @@ msgstr "Kalender"
 #. module: base
 #: model:ir.module.category,name:base.module_category_knowledge_management
 msgid "Knowledge"
-msgstr ""
+msgstr "Kunnskap"
 
 #. module: base
 #: field:workflow.activity,signal_send:0
@@ -3751,6 +3994,9 @@ msgid ""
 "separated list of valid field names (optionally followed by asc/desc for the "
 "direction)"
 msgstr ""
+"Ugyldig \"order\" spesifisert. En gyldig \"order\" spesifikasjon er en "
+"kommaseparert liste over feltnavn (eventuelt etterfulgt av asc/desc for "
+"retning)"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_module_module_dependency
@@ -3769,13 +4015,16 @@ msgid ""
 "way you want to print them in letters and other documents. Some example: "
 "Mr., Mrs. "
 msgstr ""
+"Administrer titulering av kontakter som du vil ha tilgjengelig i ditt "
+"system, og måten de brukes i brev og andre dokumenter. For eksempel, Herr, "
+"Fru. "
 
 #. module: base
 #: view:ir.model.access:0
 #: view:res.groups:0
 #: field:res.groups,model_access:0
 msgid "Access Controls"
-msgstr "Tilgangskontroller"
+msgstr "Tilgangskontroll"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:277
@@ -3784,11 +4033,13 @@ msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
 "provide an expression in the [('key','Label'), ...] format."
 msgstr ""
+"Utvalgspreferanse-uttrykket er ikke en gyldig Python setning. Vennligst angi "
+"et uttrykk i [('key','Label'), ...] format."
 
 #. module: base
 #: model:res.groups,name:base.group_survey_user
 msgid "Survey / User"
-msgstr ""
+msgstr "Spørreundersøkelse / Bruker"
 
 #. module: base
 #: view:ir.module.module:0
@@ -3804,17 +4055,17 @@ msgstr "Hovedfirma"
 #. module: base
 #: field:ir.ui.menu,web_icon_hover:0
 msgid "Web Icon File (hover)"
-msgstr ""
+msgstr "Webikon fil (hover)"
 
 #. module: base
 #: help:res.currency,name:0
 msgid "Currency Code (ISO 4217)"
-msgstr ""
+msgstr "Valutakode (ISO 4217)"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_contract
 msgid "Employee Contracts"
-msgstr ""
+msgstr "Arbeidskontrakter"
 
 #. module: base
 #: view:ir.actions.server:0
@@ -3828,7 +4079,7 @@ msgstr ""
 #. module: base
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr "Feil ! Du kan ikke lage rekursive firmaer."
+msgstr "Feil! Du kan ikke opprette rekursive firmaer."
 
 #. module: base
 #: field:res.partner,birthdate:0
@@ -3850,18 +4101,18 @@ msgstr "Vareprodusenter"
 #: code:addons/base/ir/ir_mail_server.py:240
 #, python-format
 msgid "SMTP-over-SSL mode unavailable"
-msgstr ""
+msgstr "SMTP over SSL modus ikke tilgjengelig"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_survey
 #: model:ir.ui.menu,name:base.next_id_10
 msgid "Survey"
-msgstr ""
+msgstr "Spørreundersøkelse"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (DO) / Español (DO)"
-msgstr "Spanish (DO) / Español (DO)"
+msgstr "Spansk (DO) / Español (DO)"
 
 #. module: base
 #: model:ir.model,name:base.model_workflow_activity
@@ -3871,7 +4122,7 @@ msgstr "workflow.activity"
 #. module: base
 #: view:base.language.export:0
 msgid "Export Complete"
-msgstr ""
+msgstr "Eksport fullført"
 
 #. module: base
 #: help:ir.ui.view_sc,res_id:0
@@ -3879,6 +4130,8 @@ msgid ""
 "Reference of the target resource, whose model/table depends on the 'Resource "
 "Name' field."
 msgstr ""
+"Referanse til målressursen, hvor modell/tabell er avhengig av 'Ressursnavn' "
+"feltet."
 
 #. module: base
 #: field:ir.model.fields,select_level:0
@@ -3898,12 +4151,12 @@ msgstr "Finland / Suomi"
 #. module: base
 #: view:ir.config_parameter:0
 msgid "System Properties"
-msgstr ""
+msgstr "Systeminnstillinger"
 
 #. module: base
 #: field:ir.sequence,prefix:0
 msgid "Prefix"
-msgstr "Prefix"
+msgstr "Prefiks"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -3913,19 +4166,19 @@ msgstr "Tysk / Deutsch"
 #. module: base
 #: view:ir.actions.server:0
 msgid "Fields Mapping"
-msgstr "Kobling av felter"
+msgstr "Kobling av felt"
 
 #. module: base
 #: code:addons/base/module/wizard/base_module_upgrade.py:84
 #, python-format
 msgid "Unmet Dependency!"
-msgstr ""
+msgstr "Uløst avhengighet!"
 
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_sir
 #: model:res.partner.title,shortcut:base.res_partner_title_sir
 msgid "Sir"
-msgstr "Hr"
+msgstr "Herr"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_ca
@@ -3943,12 +4196,12 @@ msgstr ""
 #. module: base
 #: view:base.module.import:0
 msgid "Select module package to import (.zip file):"
-msgstr ""
+msgstr "Velg modulpakke for import (.zip fil):"
 
 #. module: base
 #: field:base.language.export,modules:0
 msgid "Modules To Export"
-msgstr ""
+msgstr "Moduler for eksportering"
 
 #. module: base
 #: model:res.country,name:base.mt
@@ -3961,11 +4214,12 @@ msgstr "Malta"
 msgid ""
 "Only users with the following access level are currently allowed to do that"
 msgstr ""
+"Kun brukere med følgende tilgangsnivåer har tillatelse til å gjøre dette"
 
 #. module: base
 #: field:ir.actions.server,fields_lines:0
 msgid "Field Mappings."
-msgstr "Mapping av felter."
+msgstr "Mapping av felt."
 
 #. module: base
 #: selection:res.request,priority:0
@@ -4041,7 +4295,7 @@ msgstr ""
 #. module: base
 #: help:ir.mail_server,smtp_host:0
 msgid "Hostname or IP of SMTP server"
-msgstr ""
+msgstr "Vertsnavn eller IP-adresse til SMTP tjener"
 
 #. module: base
 #: model:res.country,name:base.aq
@@ -4051,7 +4305,7 @@ msgstr "Antarktis"
 #. module: base
 #: view:res.partner:0
 msgid "Persons"
-msgstr ""
+msgstr "Personer"
 
 #. module: base
 #: view:base.language.import:0
@@ -4071,7 +4325,7 @@ msgstr "Separatorformat"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_report_webkit
 msgid "Webkit Report Engine"
-msgstr ""
+msgstr "Webkit rapporteringsmotor"
 
 #. module: base
 #: model:ir.ui.menu,name:base.next_id_9
@@ -4081,7 +4335,7 @@ msgstr "Databasestruktur"
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_mass_mail
 msgid "Mass Mailing"
-msgstr "Masse utsendelse av e-post"
+msgstr "Masseutsendelse av e-post"
 
 #. module: base
 #: model:res.country,name:base.yt
@@ -4091,24 +4345,24 @@ msgstr "Mayotte"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_crm_todo
 msgid "Tasks on CRM"
-msgstr ""
+msgstr "Oppgaver i CRM"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_generic_modules_accounting
 #: view:res.company:0
 msgid "Accounting"
-msgstr ""
+msgstr "Regnskap"
 
 #. module: base
 #: view:ir.rule:0
 msgid "Interaction between rules"
-msgstr ""
+msgstr "Regelinteraksjon"
 
 #. module: base
 #: field:res.company,rml_footer:0
 #: field:res.company,rml_footer_readonly:0
 msgid "Report Footer"
-msgstr ""
+msgstr "Rapportens bunntekst"
 
 #. module: base
 #: selection:res.lang,direction:0
@@ -4118,7 +4372,7 @@ msgstr "Høyre-til-venstre"
 #. module: base
 #: model:res.country,name:base.sx
 msgid "Sint Maarten (Dutch part)"
-msgstr ""
+msgstr "Sint Maarten (nederlandsk del)"
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -4132,7 +4386,7 @@ msgstr "Filter"
 #: code:addons/base/module/wizard/base_module_import.py:67
 #, python-format
 msgid "Can not create the module file: %s!"
-msgstr ""
+msgstr "Kan ikke opprette modulfilen: %s!"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_cron_act
@@ -4157,25 +4411,25 @@ msgstr "Tittel"
 #. module: base
 #: help:ir.property,res_id:0
 msgid "If not set, acts as a default value for new resources"
-msgstr ""
+msgstr "Hvis ikke satt, fungerer som standard verdi for nye ressurser"
 
 #. module: base
 #: code:addons/orm.py:4246
 #, python-format
 msgid "Recursivity Detected."
-msgstr ""
+msgstr "Rekursjon oppdaget."
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_et
 msgid "Ethiopia - Accounting"
-msgstr ""
+msgstr "Etiopia - Regnskapsføring"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_config_list_action
 #: view:ir.config_parameter:0
 #: model:ir.ui.menu,name:base.ir_config_menu
 msgid "System Parameters"
-msgstr ""
+msgstr "Systeminnstillinger"
 
 #. module: base
 #: code:addons/base/module/module.py:366
@@ -4220,12 +4474,12 @@ msgstr "Togo"
 #: field:ir.actions.act_window,res_model:0
 #: field:ir.actions.client,res_model:0
 msgid "Destination Model"
-msgstr ""
+msgstr "Målmodell"
 
 #. module: base
 #: selection:ir.sequence,implementation:0
 msgid "Standard"
-msgstr ""
+msgstr "Standard"
 
 #. module: base
 #: model:res.country,name:base.ru
@@ -4244,7 +4498,7 @@ msgstr "Urdu / اردو"
 #: code:addons/orm.py:3902
 #, python-format
 msgid "Access Denied"
-msgstr ""
+msgstr "Ingen tilgang"
 
 #. module: base
 #: field:res.company,name:0
@@ -4258,6 +4512,8 @@ msgid ""
 "Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
 "integer): \"%s\""
 msgstr ""
+"Ugyldig verdi for referansefeltet \"%s.%s\" (siste del må være et heltall "
+"som ikke er null): \"%s\""
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_country
@@ -4268,7 +4524,7 @@ msgstr "Land"
 #. module: base
 #: selection:ir.translation,type:0
 msgid "RML  (deprecated - use Report)"
-msgstr ""
+msgstr "RML (utfases - bruk Rapport)"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
@@ -4306,7 +4562,7 @@ msgstr "Saint Pierre og Miquelon"
 #. module: base
 #: view:ir.actions.todo:0
 msgid "Search Actions"
-msgstr ""
+msgstr "Søkehandlinger"
 
 #. module: base
 #: model:ir.module.module,description:base.module_base_calendar
@@ -4323,11 +4579,23 @@ msgid ""
 "If you need to manage your meetings, you should install the CRM module.\n"
 "    "
 msgstr ""
+"\n"
+"Dette er et fullt kalendersystem.\n"
+"===========================\n"
+"\n"
+"Det støtter:\n"
+"------------------\n"
+"* Arrangementskalender\n"
+"* Gjentagende hendelser\n"
+"\n"
+"Hvis du trenger å administrere møtevirksomheten din, bør du installere CRM "
+"modulen.\n"
+"    "
 
 #. module: base
 #: model:res.country,name:base.je
 msgid "Jersey"
-msgstr ""
+msgstr "Jersey"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_translation
@@ -4352,12 +4620,12 @@ msgstr "%x - Passende datovisning."
 #. module: base
 #: view:res.partner:0
 msgid "Tag"
-msgstr ""
+msgstr "Tagg"
 
 #. module: base
 #: view:res.lang:0
 msgid "%d - Day of the month [01,31]."
-msgstr "%d - Dag i månedenl [01,31]."
+msgstr "%d - Dag i måneden [01,31]."
 
 #. module: base
 #: model:res.country,name:base.tj
@@ -4372,12 +4640,12 @@ msgstr "GPL-2 eller senere versjon"
 #. module: base
 #: selection:workflow.activity,kind:0
 msgid "Stop All"
-msgstr "Stop alle"
+msgstr "Stopp alle"
 
 #. module: base
 #: field:res.company,paper_format:0
 msgid "Paper Format"
-msgstr ""
+msgstr "Papirformat"
 
 #. module: base
 #: code:addons/base/module/module.py:644
@@ -4386,13 +4654,13 @@ msgid ""
 "Can not create the module file:\n"
 " %s"
 msgstr ""
-"Can not create the module file:\n"
+"Kan ikke opprette modulfilen:\n"
 " %s"
 
 #. module: base
 #: model:res.country,name:base.sk
 msgid "Slovakia"
-msgstr ""
+msgstr "Slovakia"
 
 #. module: base
 #: model:res.country,name:base.nr
@@ -4403,12 +4671,12 @@ msgstr "Nauru"
 #: code:addons/base/res/res_company.py:166
 #, python-format
 msgid "Reg"
-msgstr ""
+msgstr "Reg"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_property
 msgid "ir.property"
-msgstr "Ukjent egenskap %s"
+msgstr "ir.property"
 
 #. module: base
 #: selection:ir.actions.act_window,view_type:0
@@ -4442,7 +4710,7 @@ msgstr "Montenegro"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_fetchmail
 msgid "Email Gateway"
-msgstr ""
+msgstr "Epost gateway"
 
 #. module: base
 #: code:addons/base/ir/ir_mail_server.py:470
@@ -4451,6 +4719,8 @@ msgid ""
 "Mail delivery failed via SMTP server '%s'.\n"
 "%s: %s"
 msgstr ""
+"Levering feilet via SMTP server '%s'.\n"
+"%s: %s"
 
 #. module: base
 #: model:res.country,name:base.tk
@@ -4549,7 +4819,7 @@ msgstr "Liechtenstein"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_project_issue_sheet
 msgid "Timesheet on Issues"
-msgstr ""
+msgstr "Timeliste på saker"
 
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_ltd
@@ -4559,7 +4829,7 @@ msgstr "AS"
 #. module: base
 #: model:ir.actions.server,name:base.action_run_ir_action_todo
 msgid "Run Remaining Action Todo"
-msgstr ""
+msgstr "Kjør Gjenværende Handlinger Oppgaver"
 
 #. module: base
 #: field:res.partner,ean13:0
@@ -4570,7 +4840,7 @@ msgstr "EAN13"
 #: code:addons/orm.py:2247
 #, python-format
 msgid "Invalid Architecture!"
-msgstr ""
+msgstr "Ugyldig arkitektur!"
 
 #. module: base
 #: model:res.country,name:base.pt
@@ -4580,12 +4850,12 @@ msgstr "Portugal"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_share
 msgid "Share any Document"
-msgstr ""
+msgstr "Del et dokument"
 
 #. module: base
 #: field:workflow.transition,group_id:0
 msgid "Group Required"
-msgstr ""
+msgstr "Gruppe påkrevd"
 
 #. module: base
 #: view:res.lang:0
@@ -4595,7 +4865,7 @@ msgstr "6.  %d, %m         ==> 05, 12"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_it
 msgid "Italy - Accounting"
-msgstr ""
+msgstr "Italia - Regnskapsføring"
 
 #. module: base
 #: field:ir.actions.act_url,help:0
@@ -4607,7 +4877,7 @@ msgstr ""
 #: field:ir.actions.server,help:0
 #: field:ir.actions.wizard,help:0
 msgid "Action description"
-msgstr ""
+msgstr "Handlingsbeskrivelse"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_ma
@@ -4633,6 +4903,9 @@ msgid ""
 "its dependencies are satisfied. If the module has no dependency, it is "
 "always installed."
 msgstr ""
+"En autoinstallerbar modul blir automatisk installert av systemet når alle "
+"dens avhengigheter er oppfylt. Hvis modulen ikke har avhengigheter, blir den "
+"alltid installert."
 
 #. module: base
 #: model:ir.actions.act_window,name:base.res_lang_act_window
@@ -4651,12 +4924,12 @@ msgstr "Xor"
 #. module: base
 #: model:ir.module.category,name:base.module_category_localization_account_charts
 msgid "Account Charts"
-msgstr ""
+msgstr "Kontoplaner"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_event_main
 msgid "Events Organization"
-msgstr ""
+msgstr "Arrangementsorganisering"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_customer_form
@@ -4684,7 +4957,7 @@ msgstr "Basisfelt"
 #. module: base
 #: model:ir.module.category,name:base.module_category_managing_vehicles_and_contracts
 msgid "Managing vehicles and contracts"
-msgstr ""
+msgstr "Administrasjon av kjøretøy og kontrakter"
 
 #. module: base
 #: model:ir.module.module,description:base.module_base_setup
@@ -4699,6 +4972,14 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"Denne modulen lar deg konfigurere systemet etter installasjon av en ny "
+"database.\n"
+"==================================================================\n"
+"\n"
+"Viser deg en liste over applikasjoner du kan installere.\n"
+"\n"
+"    "
 
 #. module: base
 #: model:ir.model,name:base.model_res_config
@@ -4708,18 +4989,18 @@ msgstr "res.config"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_pl
 msgid "Poland - Accounting"
-msgstr ""
+msgstr "Polen - regnskapsføring"
 
 #. module: base
 #: view:ir.cron:0
 msgid "Action to Trigger"
-msgstr "Handling å trigge"
+msgstr "Handling som skal utføres"
 
 #. module: base
 #: field:ir.model.constraint,name:0
 #: selection:ir.translation,type:0
 msgid "Constraint"
-msgstr "Beskrankning"
+msgstr "Begrensning"
 
 #. module: base
 #: selection:ir.values,key:0
@@ -4730,14 +5011,14 @@ msgstr "Standard"
 #. module: base
 #: model:ir.module.module,summary:base.module_lunch
 msgid "Lunch Order, Meal, Food"
-msgstr ""
+msgstr "Lunchbestilling, mat"
 
 #. module: base
 #: view:ir.model.fields:0
 #: field:ir.model.fields,required:0
 #: field:res.partner.bank.type.field,required:0
 msgid "Required"
-msgstr "Obligatorisk"
+msgstr "Påkrevd"
 
 #. module: base
 #: model:res.country,name:base.ro
@@ -4753,7 +5034,7 @@ msgstr "Sammendrag"
 #. module: base
 #: model:ir.module.category,name:base.module_category_hidden_dependency
 msgid "Dependency"
-msgstr ""
+msgstr "Avhengigheter"
 
 #. module: base
 #: model:ir.module.module,description:base.module_portal
@@ -4794,16 +5075,19 @@ msgid ""
 "When no specific mail server is requested for a mail, the highest priority "
 "one is used. Default priority is 10 (smaller number = higher priority)"
 msgstr ""
+"Hvis ingen spesifikk mailtjener er forespurt for en epost, vil tjeneren med "
+"høyest prioritet bli benyttet. Standard prioritet er 10 (Mindre nummer = "
+"høyere prioritet)"
 
 #. module: base
 #: model:ir.module.module,summary:base.module_sale
 msgid "Quotations, Sales Orders, Invoicing"
-msgstr ""
+msgstr "Tilbud, salgsordre, fakturering"
 
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Related Company"
-msgstr ""
+msgstr "Relatert firma"
 
 #. module: base
 #: help:ir.actions.act_url,help:0
@@ -4818,11 +5102,13 @@ msgid ""
 "Optional help text for the users with a description of the target view, such "
 "as its usage and purpose."
 msgstr ""
+"Opsjonell hjelpetekst for brukerene med beskrivelse av målvisningen, slik "
+"som bruken av visningen."
 
 #. module: base
 #: model:res.country,name:base.va
 msgid "Holy See (Vatican City State)"
-msgstr "Pavestolen (Vatikanstaten)"
+msgstr "Vatikanstaten"
 
 #. module: base
 #: field:base.module.import,module_file:0
@@ -4832,7 +5118,7 @@ msgstr "Modul .ZIP fil"
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_17
 msgid "Telecom sector"
-msgstr "Telecom sektor"
+msgstr "Telekom sektor"
 
 #. module: base
 #: field:workflow.transition,trigger_model:0
@@ -4842,18 +5128,18 @@ msgstr "Utløserobjekt"
 #. module: base
 #: sql_constraint:ir.sequence.type:0
 msgid "`code` must be unique."
-msgstr ""
+msgstr "'code' må være unik."
 
 #. module: base
 #: code:addons/base/ir/workflow/workflow.py:99
 #, python-format
 msgid "Operation Forbidden"
-msgstr ""
+msgstr "Handling forbudt"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_knowledge
 msgid "Knowledge Management System"
-msgstr ""
+msgstr "Kunnskapsbase system"
 
 #. module: base
 #: view:workflow.activity:0
@@ -4864,7 +5150,7 @@ msgstr "Innkommende overganger"
 #. module: base
 #: field:ir.values,value_unpickle:0
 msgid "Default value or action reference"
-msgstr ""
+msgstr "Standard verdi eller handlingsreferanse"
 
 #. module: base
 #: model:ir.module.module,description:base.module_note_pad
@@ -4900,7 +5186,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_project_timesheet
 msgid "Bill Time on Tasks"
-msgstr ""
+msgstr "Fakturer timer på oppgaver"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_marketing
@@ -4923,11 +5209,15 @@ msgid ""
 "==========================\n"
 "\n"
 msgstr ""
+"\n"
+"OpenERP Webkalendervisning.\n"
+"=========================\n"
+"\n"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (HN) / Español (HN)"
-msgstr "Spanish (HN) / Español (HN)"
+msgstr "Spansk (HN) / Español (HN)"
 
 #. module: base
 #: view:ir.sequence.type:0
@@ -4937,24 +5227,24 @@ msgstr "Sekvenstype"
 #. module: base
 #: view:base.language.export:0
 msgid "Unicode/UTF-8"
-msgstr ""
+msgstr "Unicode/UTF-8"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Hindi / हिंदी"
-msgstr ""
+msgstr "Hindi / हिंदी"
 
 #. module: base
 #: view:base.language.install:0
 #: model:ir.actions.act_window,name:base.action_view_base_language_install
 #: model:ir.ui.menu,name:base.menu_view_base_language_install
 msgid "Load a Translation"
-msgstr ""
+msgstr "Last inn oversettelse"
 
 #. module: base
 #: field:ir.module.module,latest_version:0
 msgid "Installed Version"
-msgstr ""
+msgstr "Installert versjon"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_test
@@ -4975,7 +5265,7 @@ msgstr ""
 #. module: base
 #: field:ir.module.module,license:0
 msgid "License"
-msgstr "License"
+msgstr "Lisensvilkår"
 
 #. module: base
 #: field:ir.attachment,url:0
@@ -4985,7 +5275,7 @@ msgstr "Url"
 #. module: base
 #: selection:ir.translation,type:0
 msgid "SQL Constraint"
-msgstr "SQL beskrankning"
+msgstr "SQL begrensning"
 
 #. module: base
 #: help:ir.ui.menu,groups_id:0
@@ -4994,9 +5284,9 @@ msgid ""
 "groups. If this field is empty, OpenERP will compute visibility based on the "
 "related object's read access."
 msgstr ""
-"Hvis du har grupper så vil synligheten av denne menyen baseres på disse. "
-"Hvis dette feltet er tomt så vil OpenERP beregne synligheten basert på "
-"lesetilganger til relaterte objekter."
+"Hvis du har grupper, vil synligheten av denne menyen baseres på disse. Hvis "
+"dette feltet er tomt, vil OpenERP beregne synligheten basert på det "
+"relaterte objektets lesetilganger."
 
 #. module: base
 #: model:ir.module.module,description:base.module_event_sale
@@ -5054,7 +5344,7 @@ msgid ""
 "The selected language has been successfully installed. You must change the "
 "preferences of the user and open a new menu to view the changes."
 msgstr ""
-"The valgte språk har blitt installert. Du må endre preferansene til brukeren "
+"Det valgte språk har blitt installert. Du må endre preferansene til brukeren "
 "og åpne en ny meny for å se endringene."
 
 #. module: base
@@ -5069,7 +5359,7 @@ msgstr "Vis"
 #: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "no"
-msgstr ""
+msgstr "nei"
 
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
@@ -5103,7 +5393,7 @@ msgstr "Ekvatorial-Guinea"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_api
 msgid "OpenERP Web API"
-msgstr ""
+msgstr "OpenERP Web API"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_fr_rib
@@ -5151,12 +5441,12 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
-msgstr ""
+msgstr "Palestinske territorier, Okkuperte"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_ch
 msgid "Switzerland - Accounting"
-msgstr ""
+msgstr "Sveits - Regnskapsføring"
 
 #. module: base
 #: field:res.bank,zip:0
@@ -5175,7 +5465,7 @@ msgstr "Forfatter"
 #. module: base
 #: view:ir.actions.todo:0
 msgid "Set as Todo"
-msgstr ""
+msgstr "Sett som oppgave"
 
 #. module: base
 #: view:res.lang:0
@@ -5200,16 +5490,19 @@ msgid ""
 "Next number that will be used. This number can be incremented frequently so "
 "the displayed value might already be obsolete"
 msgstr ""
+"Neste nummer som vil bli brukt. Dette nummeret kan inkrementeres, så "
+"nummeret som vises kan allerede være i bruk"
 
 #. module: base
 #: model:ir.module.category,description:base.module_category_marketing
 msgid "Helps you manage your marketing campaigns step by step."
 msgstr ""
+"Hjelper deg med å administrere dine markedsførings kampanjer trinn for trinn."
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Hebrew / עִבְרִי"
-msgstr ""
+msgstr "Hebraisk / עִבְרִי"
 
 #. module: base
 #: model:res.country,name:base.bo
@@ -5230,7 +5523,7 @@ msgstr "Retning"
 #: code:addons/orm.py:4815
 #, python-format
 msgid "Sorting field %s not found on model %s"
-msgstr ""
+msgstr "Sorteringsfelt %s ble ikke funnet på modellen %s"
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -5256,7 +5549,7 @@ msgstr "Regler"
 #. module: base
 #: field:ir.mail_server,smtp_host:0
 msgid "SMTP Server"
-msgstr ""
+msgstr "SMTP tjener"
 
 #. module: base
 #: code:addons/base/module/module.py:320
@@ -5273,7 +5566,7 @@ msgstr "Modulene har blitt oppgradert / installert !"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (PR) / Español (PR)"
-msgstr "Spanish (PR) / Español (PR)"
+msgstr "Spansk (PR) / Español (PR)"
 
 #. module: base
 #: model:ir.module.module,description:base.module_crm_profiling
@@ -5309,59 +5602,62 @@ msgid ""
 "the same values as those available in the condition field, e.g. `Dear [[ "
 "object.partner_id.name ]]`"
 msgstr ""
+"Epostinnhold, kan inneholde uttrykk i doble braketter basert på de samme "
+"verdiene som er tilgjengelige i kondisjonsfeltet, slik som 'Kjære [[ "
+"object.partner_id.name ]]'"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_workflow_form
 #: model:ir.ui.menu,name:base.menu_workflow
 #: model:ir.ui.menu,name:base.menu_workflow_root
 msgid "Workflows"
-msgstr "Arbeidsflyt"
+msgstr "Arbeidsflyter"
 
 #. module: base
 #: model:ir.ui.menu,name:base.next_id_73
 msgid "Purchase"
-msgstr ""
+msgstr "Innkjøp"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Portuguese (BR) / Português (BR)"
-msgstr ""
+msgstr "Portugisisk (BR) / Português (BR)"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_needaction_mixin
 msgid "ir.needaction_mixin"
-msgstr ""
+msgstr "ir.needaction_mixin"
 
 #. module: base
 #: view:base.language.export:0
 msgid "This file was generated using the universal"
-msgstr ""
+msgstr "Denne filen ble generert ved bruk av det universale"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_7
 msgid "IT Services"
-msgstr ""
+msgstr "IT tjenester"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_specific_industry_applications
 msgid "Specific Industry Applications"
-msgstr ""
+msgstr "Spesifikke industriapplikasjoner"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_google_docs
 msgid "Google Docs integration"
-msgstr ""
+msgstr "Google Docs integrasjon"
 
 #. module: base
 #: help:ir.attachment,res_model:0
 msgid "The database object this attachment will be attached to"
-msgstr ""
+msgstr "Databaseobjektet dette vedlegget vil bli koblet til"
 
 #. module: base
 #: code:addons/base/ir/ir_fields.py:327
 #, python-format
 msgid "name"
-msgstr ""
+msgstr "navn"
 
 #. module: base
 #: model:ir.module.module,description:base.module_mrp_operations
@@ -5407,7 +5703,7 @@ msgstr "Hopp over"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_event_sale
 msgid "Events Sales"
-msgstr ""
+msgstr "Messesalg"
 
 #. module: base
 #: model:res.country,name:base.ls
@@ -5417,12 +5713,12 @@ msgstr "Lesotho"
 #. module: base
 #: view:base.language.export:0
 msgid ", or your preferred text editor"
-msgstr ""
+msgstr ", eller din foretrukne tekstredigerer"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_crm_partner_assign
 msgid "Partners Geo-Localization"
-msgstr ""
+msgstr "Partner geolokasjon"
 
 #. module: base
 #: model:res.country,name:base.ke
@@ -5433,12 +5729,12 @@ msgstr "Kenya"
 #: model:ir.actions.act_window,name:base.action_translation
 #: model:ir.ui.menu,name:base.menu_action_translation
 msgid "Translated Terms"
-msgstr ""
+msgstr "Oversatte vilkår"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Abkhazian / аҧсуа"
-msgstr ""
+msgstr "Abkhazian / аҧсуа"
 
 #. module: base
 #: view:base.module.configuration:0
@@ -5449,7 +5745,7 @@ msgstr "Systemkonfigurasjon fullført"
 #: code:addons/orm.py:1540
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
-msgstr ""
+msgstr "Feil under validering av felt(ene) %s: %s"
 
 #. module: base
 #: view:ir.property:0
@@ -5459,7 +5755,7 @@ msgstr "Generell"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_document_ftp
 msgid "Shared Repositories (FTP)"
-msgstr ""
+msgstr "Delte mapper (FTP)"
 
 #. module: base
 #: model:res.country,name:base.sm
@@ -5479,17 +5775,17 @@ msgstr "Peru"
 #. module: base
 #: selection:ir.model.fields,on_delete:0
 msgid "Set NULL"
-msgstr "Set NULL"
+msgstr "Sett NULL"
 
 #. module: base
 #: view:res.users:0
 msgid "Save"
-msgstr ""
+msgstr "Lagre"
 
 #. module: base
 #: field:ir.actions.report.xml,report_xml:0
 msgid "XML Path"
-msgstr ""
+msgstr "XML bane"
 
 #. module: base
 #: model:res.country,name:base.bj
@@ -5500,17 +5796,17 @@ msgstr "Benin"
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_type_form
 #: model:ir.ui.menu,name:base.menu_action_res_partner_bank_typeform
 msgid "Bank Account Types"
-msgstr ""
+msgstr "Bankkontotyper"
 
 #. module: base
 #: help:ir.sequence,suffix:0
 msgid "Suffix value of the record for the sequence"
-msgstr ""
+msgstr "Suffiks verdi av posten for sekvensen"
 
 #. module: base
 #: help:ir.mail_server,smtp_user:0
 msgid "Optional username for SMTP authentication"
-msgstr ""
+msgstr "Opsjonelt brukernavn for SMTP autentisering"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_actions
@@ -5520,7 +5816,7 @@ msgstr "ir.actions.actions"
 #. module: base
 #: selection:ir.model.fields,select_level:0
 msgid "Not Searchable"
-msgstr "Ikke søkbar"
+msgstr "Ikke søkbart"
 
 #. module: base
 #: view:ir.config_parameter:0
@@ -5550,6 +5846,18 @@ msgid ""
 "            \n"
 "%(country_code)s: the code of the country"
 msgstr ""
+"Her kan du definere det vanlige formatet for adresser i dette landet.\n"
+"\n"
+"Du kan bruke python-stilede strengemønster med alle feltene i adressen (For "
+"eksempel, bruk '%(street)s' for å vise feltet 'gate') pluss\n"
+"            \n"
+"%(state_name)s: navn på fylke\n"
+"      \n"
+"%(state_code)s: fylkeskode\n"
+"       \n"
+"%(country_name)s: Navn på landet\n"
+"        \n"
+"%(country_code)s: Landskode"
 
 #. module: base
 #: model:res.country,name:base.mu
@@ -5564,7 +5872,7 @@ msgstr "Full tilgang"
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_pt
 msgid "Plano de contas SNC para Portugal"
-msgstr ""
+msgstr "Kontoplan for Portugal"
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -5576,24 +5884,24 @@ msgstr "Sikkerhet"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Portuguese / Português"
-msgstr ""
+msgstr "Portugisisk / Português"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:372
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
-msgstr ""
+msgstr "Endring av lagringssystemet for feltet \"%s\" er ikke tillatt."
 
 #. module: base
 #: help:res.partner.bank,company_id:0
 msgid "Only if this bank account belong to your company"
-msgstr ""
+msgstr "Kun hvis denne bankkontoen tilhører ditt selskap"
 
 #. module: base
 #: code:addons/base/ir/ir_fields.py:337
 #, python-format
 msgid "Unknown sub-field '%s'"
-msgstr ""
+msgstr "Ukjent underfelt '%s'"
 
 #. module: base
 #: model:res.country,name:base.za
@@ -5632,11 +5940,17 @@ msgid ""
 "Collects web application usage with Google Analytics.\n"
 "    "
 msgstr ""
+"\n"
+"Google Analytics.\n"
+"==============\n"
+"\n"
+"Samler bruksdata for webapplikasjonen via Google Analytics.\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment Process"
-msgstr ""
+msgstr "Rekrutteringsprosess"
 
 #. module: base
 #: model:res.country,name:base.br
@@ -5662,12 +5976,12 @@ msgstr "Neste nummer"
 #. module: base
 #: help:workflow.transition,condition:0
 msgid "Expression to be satisfied if we want the transition done."
-msgstr ""
+msgstr "Uttrykk som må være sant hvis overgangen skal utføres"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (PA) / Español (PA)"
-msgstr "Spanish (PA) / Español (PA)"
+msgstr "Spansk (PA) / Español (PA)"
 
 #. module: base
 #: view:res.currency:0
@@ -5678,7 +5992,7 @@ msgstr "Rater"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_email_template
 msgid "Email Templates"
-msgstr ""
+msgstr "Epostmaler"
 
 #. module: base
 #: model:res.country,name:base.sy
@@ -5693,13 +6007,13 @@ msgstr "======================================================"
 #. module: base
 #: sql_constraint:ir.model:0
 msgid "Each model must be unique!"
-msgstr ""
+msgstr "Hver modell må være unik!"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_localization
 #: model:ir.ui.menu,name:base.menu_localisation
 msgid "Localization"
-msgstr ""
+msgstr "Lokalisering"
 
 #. module: base
 #: model:ir.module.module,description:base.module_web_api
@@ -5709,6 +6023,10 @@ msgid ""
 "================\n"
 "\n"
 msgstr ""
+"\n"
+"Openerp Web API.\n"
+"================\n"
+"\n"
 
 #. module: base
 #: selection:res.request,state:0
@@ -5727,7 +6045,7 @@ msgstr "Dato"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_event_moodle
 msgid "Event Moodle"
-msgstr ""
+msgstr "Arrangements-Moodle"
 
 #. module: base
 #: model:ir.module.module,description:base.module_email_template
@@ -5778,12 +6096,12 @@ msgstr ""
 #. module: base
 #: model:ir.ui.menu,name:base.menu_partner_category_form
 msgid "Partner Tags"
-msgstr ""
+msgstr "Partnertagger"
 
 #. module: base
 #: view:res.company:0
 msgid "Preview Header/Footer"
-msgstr ""
+msgstr "Forhåndsvis topptekst/bunntekst"
 
 #. module: base
 #: field:ir.ui.menu,parent_id:0
@@ -5794,13 +6112,15 @@ msgstr "Overordnet meny"
 #. module: base
 #: field:res.partner.bank,owner_name:0
 msgid "Account Owner Name"
-msgstr ""
+msgstr "Kontoeiers navn"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:420
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
 msgstr ""
+"Kan ikke gi nytt navn til kolonnen %s, siden den kolonnen allerede "
+"eksisterer!"
 
 #. module: base
 #: view:ir.attachment:0
@@ -5810,18 +6130,18 @@ msgstr "Knyttet til"
 #. module: base
 #: field:res.lang,decimal_point:0
 msgid "Decimal Separator"
-msgstr "Desimal separator"
+msgstr "Desimalseparator"
 
 #. module: base
 #: code:addons/orm.py:5319
 #, python-format
 msgid "Missing required value for the field '%s'."
-msgstr ""
+msgstr "Mangler påkrevd verdi for feltet '%s'."
 
 #. module: base
 #: view:ir.rule:0
 msgid "Write Access Right"
-msgstr ""
+msgstr "Skrivetilgangsrettighet"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_res_groups
@@ -5833,12 +6153,17 @@ msgid ""
 "to see. Whether they can have a read, write, create and delete access right "
 "can be managed from here."
 msgstr ""
+"En gruppe er et sett med funksjonelle områder som blir tilegnet brukeren for "
+"å gi dem tilgang og rettigheter til spesifikke applikasjoner og oppgaver i "
+"systemet. Du kan lage egne grupper, eller redigere allerede eksisterende "
+"grupper for å tilpasse menyen brukerene vil se. Les, skriv, opprett og slett-"
+"tilganger kan også bli håndtert herifra."
 
 #. module: base
 #: view:ir.filters:0
 #: field:ir.filters,name:0
 msgid "Filter Name"
-msgstr ""
+msgstr "Filternavn"
 
 #. module: base
 #: view:ir.attachment:0
@@ -5850,12 +6175,12 @@ msgstr "Historikk"
 #. module: base
 #: model:res.country,name:base.im
 msgid "Isle of Man"
-msgstr ""
+msgstr "Isle of Man"
 
 #. module: base
 #: help:ir.actions.client,res_model:0
 msgid "Optional model, mostly used for needactions."
-msgstr ""
+msgstr "Opsjonell modell, for det meste brukt for needactions."
 
 #. module: base
 #: code:addons/base/module/module.py:306
@@ -5871,7 +6196,7 @@ msgstr "Bouvet øyene"
 #. module: base
 #: field:ir.model.constraint,type:0
 msgid "Constraint Type"
-msgstr ""
+msgstr "Begrensningstype"
 
 #. module: base
 #: field:res.company,child_ids:0
@@ -5912,7 +6237,7 @@ msgstr "Felt"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_project_long_term
 msgid "Long Term Projects"
-msgstr ""
+msgstr "Langtidsprosjekter"
 
 #. module: base
 #: model:res.country,name:base.ve
@@ -5932,12 +6257,12 @@ msgstr "Zambia"
 #. module: base
 #: view:ir.actions.todo:0
 msgid "Launch Configuration Wizard"
-msgstr ""
+msgstr "Start konfigurasjonsveiviser"
 
 #. module: base
 #: model:ir.module.module,summary:base.module_mrp
 msgid "Manufacturing Orders, Bill of Materials, Routing"
-msgstr ""
+msgstr "Produksjonsordre, materiallister, routing"
 
 #. module: base
 #: field:ir.attachment,name:0
@@ -6010,7 +6335,7 @@ msgstr ""
 #. module: base
 #: model:res.groups,name:base.group_sale_salesman_all_leads
 msgid "See all Leads"
-msgstr ""
+msgstr "Se alle leads"
 
 #. module: base
 #: model:res.country,name:base.ci
@@ -6036,7 +6361,7 @@ msgstr "Ressursnavn"
 #. module: base
 #: model:ir.ui.menu,name:base.menu_ir_filters
 msgid "User-defined Filters"
-msgstr ""
+msgstr "Brukerdefinerte filter"
 
 #. module: base
 #: field:ir.actions.act_window_close,name:0
@@ -6079,8 +6404,8 @@ msgid ""
 "If set to true, the action will not be displayed on the right toolbar of a "
 "form view"
 msgstr ""
-"Hvis satt til sann, så vil ikke handlingen vises på den høyre verktøylinjen "
-"i skjemavisning."
+"Hvis satt til sann, vil ikke handlingen vises på den høyre verktøylinjen i "
+"skjemavisning."
 
 #. module: base
 #: model:res.country,name:base.ms
@@ -6090,18 +6415,18 @@ msgstr "Montserrat"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_decimal_precision
 msgid "Decimal Precision Configuration"
-msgstr ""
+msgstr "Desimalpresisjon konfigurasjon"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_act_url
 #: selection:ir.ui.menu,action:0
 msgid "ir.actions.act_url"
-msgstr ""
+msgstr "ir.actions.act_url"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_translation_app
 msgid "Application Terms"
-msgstr "Begrep i applikasjonen"
+msgstr "Applikasjonsvilkår"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.open_module_tree
@@ -6110,6 +6435,9 @@ msgid ""
 "              <p>You should try others search criteria.</p>\n"
 "            "
 msgstr ""
+"<p><b>Ingen modul funnet!</b></p>\n"
+"              <p>Du bør prøve andre søkekriterier.</p>\n"
+"            "
 
 #. module: base
 #: model:ir.model,name:base.model_ir_module_module
@@ -6127,7 +6455,7 @@ msgstr "Modul"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "English (UK)"
-msgstr "Britisk Engelsk"
+msgstr "Engelsk (UK)"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -6145,6 +6473,8 @@ msgid ""
 "Source activity. When this activity is over, the condition is tested to "
 "determine if we can start the ACT_TO activity."
 msgstr ""
+"Kildeaktivitet. Når denne aktiviteten er fullført, blir vilkårsbegrepet "
+"testet for å se om vi skal starte ACT_TO aktiviteten."
 
 #. module: base
 #: help:ir.model.fields,relation_field:0
@@ -6152,6 +6482,8 @@ msgid ""
 "For one2many fields, the field on the target model that implement the "
 "opposite many2one relationship"
 msgstr ""
+"For en-til-mange felt, feltet på målmodellen som implementerer den motsatte "
+"mange-til-en relasjonen"
 
 #. module: base
 #: model:ir.module.module,description:base.module_base_vat
@@ -6212,17 +6544,17 @@ msgstr "Web"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_lunch
 msgid "Lunch Orders"
-msgstr ""
+msgstr "Lunsjordre"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "English (CA)"
-msgstr ""
+msgstr "Engelsk (CA)"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_human_resources
 msgid "Human Resources"
-msgstr ""
+msgstr "Personalstyring"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_syscohada
@@ -6248,7 +6580,7 @@ msgstr ""
 #. module: base
 #: view:ir.translation:0
 msgid "Comments"
-msgstr ""
+msgstr "Kommentarer"
 
 #. module: base
 #: model:res.country,name:base.et
@@ -6258,7 +6590,7 @@ msgstr "Etiopia"
 #. module: base
 #: model:ir.module.category,name:base.module_category_authentication
 msgid "Authentication"
-msgstr ""
+msgstr "Autentisering"
 
 #. module: base
 #: model:res.country,name:base.gd
@@ -6274,7 +6606,7 @@ msgstr "ir.actions.wizard"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_kanban
 msgid "Base Kanban"
-msgstr ""
+msgstr "Base Kanban"
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -6292,7 +6624,7 @@ msgstr "tittel"
 #: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "true"
-msgstr ""
+msgstr "sann"
 
 #. module: base
 #: model:ir.model,name:base.model_base_language_install
@@ -6302,7 +6634,7 @@ msgstr "Installer språk"
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_11
 msgid "Services"
-msgstr ""
+msgstr "Tjenester"
 
 #. module: base
 #: view:ir.translation:0
@@ -6312,7 +6644,7 @@ msgstr "Oversettelse"
 #. module: base
 #: selection:res.request,state:0
 msgid "closed"
-msgstr "lukket"
+msgstr "avsluttet"
 
 #. module: base
 #: selection:base.language.export,state:0
@@ -6322,12 +6654,12 @@ msgstr "hent"
 #. module: base
 #: help:ir.model.fields,on_delete:0
 msgid "On delete property for many2one fields"
-msgstr "On delete property for many2one fields"
+msgstr "On delete attributt for mange-til-en felt"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_accounting_and_finance
 msgid "Accounting & Finance"
-msgstr ""
+msgstr "Regnskap & Finans"
 
 #. module: base
 #: field:ir.actions.server,write_id:0
@@ -6344,7 +6676,7 @@ msgstr "Produkter"
 #: model:ir.ui.menu,name:base.menu_values_form_defaults
 #: view:ir.values:0
 msgid "User-defined Defaults"
-msgstr ""
+msgstr "Brukerdefinerte standarder"
 
 #. module: base
 #: model:ir.module.module,description:base.module_auth_signup
@@ -6354,12 +6686,16 @@ msgid ""
 "===============================================\n"
 "    "
 msgstr ""
+"\n"
+"Lar brukere registrere seg og resette passordet sitt\n"
+"===============================================\n"
+"    "
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_usability
 #: view:res.users:0
 msgid "Usability"
-msgstr ""
+msgstr "Brukervennlighet"
 
 #. module: base
 #: field:ir.actions.act_window,domain:0
@@ -6410,6 +6746,19 @@ msgid ""
 "documentation at http://doc.openerp.com.\n"
 "    "
 msgstr ""
+"\n"
+"Tilbyr en felles EDI plattform som andre applikasjoner kan bruke.\n"
+"========================================================\n"
+"\n"
+"OpenERP spesifiserer et generisk EDI format for utveksling av dokumenter "
+"mellom\n"
+"forskjellige systemer, og tilbyr mekanismer for å importere og eksportere "
+"dem.\n"
+"\n"
+"Flere detaljer om OpenERPs EDI format kan du finne i OpenERPs tekniske "
+"dokumentasjon\n"
+"på http://doc.openerp.com.\n"
+"    "
 
 #. module: base
 #: view:ir.actions.server:0
@@ -6423,11 +6772,14 @@ msgid ""
 "deleting it (if you delete a native record rule, it may be re-created when "
 "you reload the module."
 msgstr ""
+"Hvis du fjerner avmerkingen for det aktive feltet, vil det deaktivere "
+"regelen for posten uten å slette den. (Hvis du sletter en innebygd regel, "
+"kan det hende den skapes på nytt når du laster inn modulen)"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (BO) / Español (BO)"
-msgstr "Spanish (BO) / Español (BO)"
+msgstr "Spansk (BO) / Español (BO)"
 
 #. module: base
 #: model:ir.module.module,description:base.module_board
@@ -6439,6 +6791,12 @@ msgid ""
 "Allows users to create custom dashboard.\n"
 "    "
 msgstr ""
+"\n"
+"Lar brukeren lage et tilpasset instrumentpanel.\n"
+"=======================================\n"
+"\n"
+"Lar brukere lage tilpassede instrumentpanel.\n"
+"    "
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_access_act
@@ -6454,7 +6812,7 @@ msgstr "USA Minor Outlying Islands"
 #. module: base
 #: view:base.language.import:0
 msgid "e.g. English"
-msgstr ""
+msgstr "f.eks Engelsk"
 
 #. module: base
 #: help:ir.cron,numbercall:0
@@ -6462,6 +6820,8 @@ msgid ""
 "How many times the method is called,\n"
 "a negative number indicates no limit."
 msgstr ""
+"Hvor mange ganger metoden kalles,\n"
+"et negativt nummer betyr ingen begrensning."
 
 #. module: base
 #: field:res.partner.bank.type.field,bank_type_id:0
@@ -6479,7 +6839,7 @@ msgstr "Navnet på gruppen kan ikke starte med \"-\""
 #: view:ir.module.module:0
 #: model:ir.ui.menu,name:base.module_mi
 msgid "Apps"
-msgstr ""
+msgstr "Applikasjoner"
 
 #. module: base
 #: view:ir.ui.view_sc:0
@@ -6494,7 +6854,7 @@ msgstr "Initiell dato"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Gujarati / ગુજરાતી"
-msgstr ""
+msgstr "Gujarati / ગુજરાતી"
 
 #. module: base
 #: code:addons/base/module/module.py:361
@@ -6502,11 +6862,13 @@ msgstr ""
 msgid ""
 "Unable to process module \"%s\" because an external dependency is not met: %s"
 msgstr ""
+"Kunne ikke prosessere modulen \"%s\" fordi en ekstern avhengighet ikke er "
+"møtt: %s"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll
 msgid "Belgium - Payroll"
-msgstr ""
+msgstr "Belgia - Lønnsavregning"
 
 #. module: base
 #: view:workflow.activity:0
@@ -6527,24 +6889,24 @@ msgstr "Bankkontoeier"
 #. module: base
 #: model:ir.module.category,name:base.module_category_uncategorized
 msgid "Uncategorized"
-msgstr ""
+msgstr "Ikke kategorisert"
 
 #. module: base
 #: view:res.partner:0
 msgid "Phone:"
-msgstr ""
+msgstr "Telefonnummer:"
 
 #. module: base
 #: field:res.partner,is_company:0
 msgid "Is a Company"
-msgstr ""
+msgstr "Er et firma"
 
 #. module: base
 #: view:res.company:0
 #: view:res.partner:0
 #: view:res.users:0
 msgid "e.g. www.openerp.com"
-msgstr ""
+msgstr "f.eks www.openerp.com"
 
 #. module: base
 #: selection:ir.cron,interval_type:0
@@ -6571,11 +6933,14 @@ msgid ""
 "form, signal tests the name of the pressed button. If signal is NULL, no "
 "button is necessary to validate this transition."
 msgstr ""
+"Når overgangen startes på grunn av et tasteslag i klientskjemaet, tester "
+"signal navnet til den trykte tasten. Hvis signal er NULL, er det ikke "
+"nødvendig å trykke en tast for å validere overgangen."
 
 #. module: base
 #: field:ir.ui.view.custom,ref_id:0
 msgid "Original View"
-msgstr "Orginal visning"
+msgstr "Original visning"
 
 #. module: base
 #: model:ir.module.module,description:base.module_web_kanban
@@ -6585,48 +6950,53 @@ msgid ""
 "========================\n"
 "\n"
 msgstr ""
+"\n"
+"OpenERP Web kanban visning.\n"
+"========================\n"
+"\n"
 
 #. module: base
 #: code:addons/base/ir/ir_fields.py:182
 #, python-format
 msgid "'%s' does not seem to be a number for field '%%(field)s'"
-msgstr ""
+msgstr "'%s' ser ikke ut til å være et tall for felt '%%(field)s'"
 
 #. module: base
 #: help:res.country.state,name:0
 msgid ""
 "Administrative divisions of a country. E.g. Fed. State, Departement, Canton"
 msgstr ""
+"Administrative inndelinger for landet. For eksempel stat, departement, fylke"
 
 #. module: base
 #: view:res.partner.bank:0
 msgid "My Banks"
-msgstr ""
+msgstr "Mine banker"
 
 #. module: base
 #: sql_constraint:ir.filters:0
 msgid "Filter names must be unique"
-msgstr ""
+msgstr "Filternavn må være unike"
 
 #. module: base
 #: help:multi_company.default,object_id:0
 msgid "Object affected by this rule"
-msgstr ""
+msgstr "Objekt påvirket av denne regelen"
 
 #. module: base
 #: selection:ir.actions.act_window,target:0
 msgid "Inline View"
-msgstr ""
+msgstr "Inline visning"
 
 #. module: base
 #: field:ir.filters,is_default:0
 msgid "Default filter"
-msgstr ""
+msgstr "Standard filter"
 
 #. module: base
 #: report:ir.module.reference:0
 msgid "Directory"
-msgstr "Katalogområde"
+msgstr "Mappe"
 
 #. module: base
 #: field:wizard.ir.model.menu.create,name:0
@@ -6636,7 +7006,7 @@ msgstr "Menynavn"
 #. module: base
 #: field:ir.values,key2:0
 msgid "Qualifier"
-msgstr ""
+msgstr "Kvalifiserer"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_vn
@@ -6763,17 +7133,17 @@ msgstr "Malaysia"
 #: code:addons/base/ir/ir_sequence.py:160
 #, python-format
 msgid "Increment number must not be zero."
-msgstr ""
+msgstr "Inkrementtallet kan ikke være null."
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_cancel
 msgid "Cancel Journal Entries"
-msgstr ""
+msgstr "Kanseller journallinjer"
 
 #. module: base
 #: field:res.partner,tz_offset:0
 msgid "Timezone offset"
-msgstr ""
+msgstr "Tidssone"
 
 #. module: base
 #: model:ir.module.module,description:base.module_marketing_campaign
@@ -6819,6 +7189,9 @@ msgid ""
 "If enabled, the full output of SMTP sessions will be written to the server "
 "log at DEBUG level(this is very verbose and may include confidential info!)"
 msgstr ""
+"Hvis skrudd på, vil all utdata fra SMTP sesjoner bli skrevet til "
+"serverloggen på DEBUG nivå (Dette er veldig detaljert, og kan inneholde "
+"konfidensiell informasjon!)"
 
 #. module: base
 #: model:ir.module.module,description:base.module_sale_margin
@@ -6835,7 +7208,7 @@ msgstr ""
 #. module: base
 #: selection:ir.actions.todo,type:0
 msgid "Launch Automatically"
-msgstr ""
+msgstr "Start automatisk"
 
 #. module: base
 #: help:ir.model.fields,translate:0
@@ -6843,6 +7216,8 @@ msgid ""
 "Whether values for this field can be translated (enables the translation "
 "mechanism for that field)"
 msgstr ""
+"Kan verdier for dette feltet oversettes? (Skrur på oversettelsesmekanismen "
+"for det feltet)"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -6857,7 +7232,7 @@ msgstr "Cape Verde"
 #. module: base
 #: model:res.groups,comment:base.group_sale_salesman
 msgid "the user will have access to his own data in the sales application."
-msgstr ""
+msgstr "brukeren vil ha tilgang til sine egne data i salgsapplikasjonen."
 
 #. module: base
 #: model:res.groups,comment:base.group_user
@@ -6865,12 +7240,14 @@ msgid ""
 "the user will be able to manage his own human resources stuff (leave "
 "request, timesheets, ...), if he is linked to an employee in the system."
 msgstr ""
+"brukeren vil være i stand til å håndtere sine egne data (fridager, "
+"timelister, ....), hvis han er registrert som en ansatt i systemet."
 
 #. module: base
 #: code:addons/orm.py:2247
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
-msgstr ""
+msgstr "Det fins ingen visning av typen '%s' for denne strukturen!"
 
 #. module: base
 #: help:ir.values,key:0
@@ -6878,6 +7255,8 @@ msgid ""
 "- Action: an action attached to one slot of the given model\n"
 "- Default: a default value for a model field"
 msgstr ""
+"-Action: en handling koblet til en gitt modell\n"
+"-Default: en standard verdi for et modellfelt"
 
 #. module: base
 #: field:base.module.update,add:0
@@ -6887,7 +7266,7 @@ msgstr "Antall moduler lagt til"
 #. module: base
 #: view:res.currency:0
 msgid "Price Accuracy"
-msgstr ""
+msgstr "Prisnøyaktighet"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -6909,12 +7288,12 @@ msgstr "Opprettet menyer"
 #: view:ir.module.module:0
 #, python-format
 msgid "Uninstall"
-msgstr ""
+msgstr "Avinstaller"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_budget
 msgid "Budgets Management"
-msgstr ""
+msgstr "Budsjettstyring"
 
 #. module: base
 #: field:workflow.triggers,workitem_id:0
@@ -6924,12 +7303,12 @@ msgstr "Arbeidselement"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_anonymization
 msgid "Database Anonymization"
-msgstr ""
+msgstr "Databaseanonymisering"
 
 #. module: base
 #: field:res.partner,commercial_partner_id:0
 msgid "Commercial Entity"
-msgstr ""
+msgstr "Kommersiell enhet"
 
 #. module: base
 #: selection:ir.mail_server,smtp_encryption:0
@@ -6987,27 +7366,27 @@ msgstr "E-post konfigurasjon"
 #. module: base
 #: model:ir.model,name:base.model_ir_cron
 msgid "ir.cron"
-msgstr "ir.actions.actions"
+msgstr "ir.cron"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_sales_followup
 msgid "Payment Follow-up"
-msgstr ""
+msgstr "Betalingsoppfølgning"
 
 #. module: base
 #: model:res.country,name:base.cw
 msgid "Curaçao"
-msgstr ""
+msgstr "Curaçao"
 
 #. module: base
 #: view:ir.sequence:0
 msgid "Current Year without Century: %(y)s"
-msgstr ""
+msgstr "Inneværende år uten århundre: %(y)s"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_es
 msgid "Spanish Charts of Accounts (PGCE 2008)"
-msgstr ""
+msgstr "Spansk kontoplan (PGCE 2008)"
 
 #. module: base
 #: help:ir.actions.client,tag:0
@@ -7015,16 +7394,18 @@ msgid ""
 "An arbitrary string, interpreted by the client according to its own needs "
 "and wishes. There is no central tag repository across clients."
 msgstr ""
+"En hvilken som helst tekststreng, tolket av klienten etter egne behov eller "
+"ønsker. Det er ingen sentral mappe for tagger på tvers av klienter."
 
 #. module: base
 #: sql_constraint:ir.rule:0
 msgid "Rule must have at least one checked access right !"
-msgstr ""
+msgstr "Regelen må ha minst en tilgangsrettighet sjekket!"
 
 #. module: base
 #: field:res.partner.bank.type,format_layout:0
 msgid "Format Layout"
-msgstr ""
+msgstr "Formater utseende"
 
 #. module: base
 #: model:ir.module.module,description:base.module_document_ftp
@@ -7048,13 +7429,13 @@ msgstr "Størrelse"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_audittrail
 msgid "Audit Trail"
-msgstr ""
+msgstr "Revisjonssporing"
 
 #. module: base
 #: code:addons/base/ir/ir_fields.py:264
 #, python-format
 msgid "Value '%s' not found in selection field '%%(field)s'"
-msgstr ""
+msgstr "Verdi '%s' ble ikke funnet i utvalgsfeltet '%%(field)s'"
 
 #. module: base
 #: model:res.country,name:base.sd
@@ -7067,7 +7448,7 @@ msgstr "Sudan"
 #: field:res.currency.rate,currency_rate_type_id:0
 #: view:res.currency.rate.type:0
 msgid "Currency Rate Type"
-msgstr ""
+msgstr "Valuta vekslingstype"
 
 #. module: base
 #: code:addons/base/res/res_lang.py:189
@@ -7076,6 +7457,8 @@ msgid ""
 "You cannot delete the language which is Active!\n"
 "Please de-activate the language first."
 msgstr ""
+"Du kan ikke slette det aktive språket!\n"
+"Deaktiver språket først."
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_fr
@@ -7128,7 +7511,7 @@ msgstr "Menyer"
 #. module: base
 #: selection:ir.actions.todo,type:0
 msgid "Launch Manually Once"
-msgstr ""
+msgstr "Start manuelt en gang"
 
 #. module: base
 #: view:workflow:0
@@ -7143,7 +7526,7 @@ msgstr "Arbeidsflyt"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Serbian (Latin) / srpski"
-msgstr ""
+msgstr "Serbisk (Latin) / srpski"
 
 #. module: base
 #: model:res.country,name:base.il
@@ -7154,22 +7537,22 @@ msgstr "Israel"
 #: code:addons/base/res/res_config.py:475
 #, python-format
 msgid "Cannot duplicate configuration!"
-msgstr ""
+msgstr "Kan ikke duplisere konfigurasjon!"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_syscohada
 msgid "OHADA - Accounting"
-msgstr ""
+msgstr "OHADA - Regnskapsføring"
 
 #. module: base
 #: help:res.bank,bic:0
 msgid "Sometimes called BIC or Swift."
-msgstr ""
+msgstr "Noen ganger kalt BIC eller Swift."
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_in
 msgid "Indian - Accounting"
-msgstr ""
+msgstr "India - Regnskapsføring"
 
 #. module: base
 #: field:res.lang,time_format:0
@@ -7179,12 +7562,12 @@ msgstr "Tidsformat"
 #. module: base
 #: field:res.company,rml_header3:0
 msgid "RML Internal Header for Landscape Reports"
-msgstr ""
+msgstr "RML intern topptekst for rapporter i landskapsformat"
 
 #. module: base
 #: model:res.groups,name:base.group_partner_manager
 msgid "Contact Creation"
-msgstr ""
+msgstr "Kontakt skapt"
 
 #. module: base
 #: view:ir.module.module:0
@@ -7194,7 +7577,7 @@ msgstr "Definerte rapporter"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_project_gtd
 msgid "Todo Lists"
-msgstr ""
+msgstr "Oppgavelister"
 
 #. module: base
 #: view:ir.actions.report.xml:0
@@ -7235,21 +7618,27 @@ msgid ""
 "This module provides the core of the OpenERP Web Client.\n"
 "        "
 msgstr ""
+"\n"
+"OpenERP Web core module.\n"
+"========================\n"
+"\n"
+"Denne modulen tilbyr kjernen i OpenERP webklienten.\n"
+"        "
 
 #. module: base
 #: view:ir.sequence:0
 msgid "Week of the Year: %(woy)s"
-msgstr ""
+msgstr "Ukenummer: %(woy)s"
 
 #. module: base
 #: field:res.users,id:0
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: base
 #: field:ir.cron,doall:0
 msgid "Repeat Missed"
-msgstr "Repeter uteblitte"
+msgstr "Repeter manglende"
 
 #. module: base
 #: help:ir.actions.server,state:0
@@ -7265,17 +7654,17 @@ msgstr "Objektkobling"
 #: field:ir.module.category,xml_id:0
 #: field:ir.ui.view,xml_id:0
 msgid "External ID"
-msgstr ""
+msgstr "Ekstern ID"
 
 #. module: base
 #: help:res.currency.rate,rate:0
 msgid "The rate of the currency to the currency of rate 1"
-msgstr "The rate of the currency to the currency of rate 1"
+msgstr "Vekslingsraten til valutaen mot valutaen med vekslingsrate lik 1"
 
 #. module: base
 #: model:res.country,name:base.uk
 msgid "United Kingdom"
-msgstr "United Kingdom"
+msgstr "Storbritannia"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_pa
@@ -7302,24 +7691,24 @@ msgstr "Botswana"
 #. module: base
 #: view:res.partner.title:0
 msgid "Partner Titles"
-msgstr "Partner titler"
+msgstr "Partnertitler"
 
 #. module: base
 #: code:addons/base/ir/ir_fields.py:196
 #: code:addons/base/ir/ir_fields.py:227
 #, python-format
 msgid "Use the format '%s'"
-msgstr ""
+msgstr "Bruk formatet '%s'"
 
 #. module: base
 #: help:ir.actions.act_window,auto_refresh:0
 msgid "Add an auto-refresh on the view"
-msgstr "Legg til automatisk oppdatereing av denne visningen"
+msgstr "Legg til automatisk oppdatering av denne visningen"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_crm_profiling
 msgid "Customer Profiling"
-msgstr ""
+msgstr "Kundeprofilering"
 
 #. module: base
 #: selection:ir.cron,interval_type:0
@@ -7329,7 +7718,7 @@ msgstr "Arbeidsdager"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_multi_company
 msgid "Multi-Company"
-msgstr ""
+msgstr "Flerfirma"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_workflow_workitem_form
@@ -7341,12 +7730,12 @@ msgstr "Arbeidselementer"
 #: code:addons/base/res/res_bank.py:195
 #, python-format
 msgid "Invalid Bank Account Type Name format."
-msgstr ""
+msgstr "Ugyldig navneformat for kontotype"
 
 #. module: base
 #: view:ir.filters:0
 msgid "Filters visible only for one user"
-msgstr ""
+msgstr "Filter synlig for bare en bruker"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_attachment
@@ -7360,6 +7749,8 @@ msgid ""
 "You cannot perform this operation. New Record Creation is not allowed for "
 "this object as this object is for reporting purpose."
 msgstr ""
+"Du kan ikke utføre denne operasjonen. Nye poster kan ikke lages på dette "
+"objektet, da det er et rapporteringsobjekt."
 
 #. module: base
 #: model:ir.module.module,description:base.module_base_import
@@ -7389,12 +7780,12 @@ msgstr ""
 #. module: base
 #: selection:res.currency,position:0
 msgid "After Amount"
-msgstr ""
+msgstr "Etter beløp"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Lithuanian / Lietuvių kalba"
-msgstr ""
+msgstr "Litauensk / Lietuvių kalba"
 
 #. module: base
 #: help:ir.actions.server,record_id:0
@@ -7402,23 +7793,23 @@ msgid ""
 "Provide the field name where the record id is stored after the create "
 "operations. If it is empty, you can not track the new record."
 msgstr ""
-"Angi feltnavnet hvor nøkkel på nøkkelen på raden blir lagret etter "
-"oppretting. Hvis den er tom kan du ikke spore den nye raden."
+"Angi feltnavnet hvor postens ID blir lagret etter oppretting. Hvis den er "
+"tom, kan du ikke spore den nye posten."
 
 #. module: base
 #: model:res.groups,comment:base.group_hr_user
 msgid "the user will be able to approve document created by employees."
-msgstr ""
+msgstr "brukeren vil kunne godkjenne dokumenter laget av ansatte."
 
 #. module: base
 #: field:ir.ui.menu,needaction_enabled:0
 msgid "Target model uses the need action mechanism"
-msgstr ""
+msgstr "Målmodellen bruker 'trenger handling' mekanismen"
 
 #. module: base
 #: help:ir.model.fields,relation:0
 msgid "For relationship fields, the technical name of the target model"
-msgstr ""
+msgstr "For relasjonsfelt, det tekniske navnet til målmodellen"
 
 #. module: base
 #: view:res.lang:0
@@ -7431,16 +7822,18 @@ msgid ""
 "If you enable this option, existing translations (including custom ones) "
 "will be overwritten and replaced by those in this file"
 msgstr ""
+"Hvis du skrur på dette valget, vil nåværende oversettelser (inkludert "
+"tilpassede oversettelser) bli overskrevet av oversettelser fra denne filen"
 
 #. module: base
 #: field:ir.ui.view,inherit_id:0
 msgid "Inherited View"
-msgstr "Inherited View"
+msgstr "Nedarvet visning"
 
 #. module: base
 #: view:ir.translation:0
 msgid "Source Term"
-msgstr ""
+msgstr "Kildedata"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_project_management
@@ -7453,7 +7846,7 @@ msgstr "Prosjekt"
 #. module: base
 #: field:ir.ui.menu,web_icon_hover_data:0
 msgid "Web Icon Image (hover)"
-msgstr ""
+msgstr "Webikon bilde (hover)"
 
 #. module: base
 #: view:base.module.import:0
@@ -7465,7 +7858,7 @@ msgstr "Modul ble importert uten feil !"
 #: view:ir.model.constraint:0
 #: model:ir.ui.menu,name:base.ir_model_constraint_menu
 msgid "Model Constraints"
-msgstr ""
+msgstr "Modellbegrensninger"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_workflow_transition_form
@@ -7478,12 +7871,12 @@ msgstr "Overganger"
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
 msgid "Timesheets"
-msgstr ""
+msgstr "Timelister"
 
 #. module: base
 #: help:ir.values,company_id:0
 msgid "If set, action binding only applies for this company"
-msgstr ""
+msgstr "Hvis satt, gjelder handlingsbindingen kun for dette firmaet"
 
 #. module: base
 #: model:res.country,name:base.lc
@@ -7497,6 +7890,9 @@ msgid ""
 "password, otherwise leave empty. After a change of password, the user has to "
 "login again."
 msgstr ""
+"Spesifiser en verdi bare når du lager en bruker, eller hvis du ønsker å "
+"endre brukerens passord. La stå tomt ellers. Etter at passord har blitt "
+"endret, må brukeren logge inn på nytt."
 
 #. module: base
 #: model:res.country,name:base.so
@@ -7506,7 +7902,7 @@ msgstr "Somalia"
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_doctor
 msgid "Dr."
-msgstr ""
+msgstr "Dr."
 
 #. module: base
 #: model:res.groups,name:base.group_user
@@ -7554,6 +7950,20 @@ msgid ""
 "up a management by affair.\n"
 "    "
 msgstr ""
+"\n"
+"Denne modulen implementerer et timelistesystem.\n"
+"==========================================\n"
+"\n"
+"Hver ansatt kan legge inn og spore tid brukt på forskjellige prosjekter.\n"
+"Et prosjekt er en analytisk konto, og tid brukt på prosjektet genererer "
+"kostnaer på\n"
+"den analytiske kontoen.\n"
+"\n"
+"Mange muligheter for rapportering på time og ressursbruk tilbys.\n"
+"\n"
+"Modulen er tett integrert med kostnadsstyringsmodulen. Den lar deg sette\n"
+"opp styring per affære.\n"
+"    "
 
 #. module: base
 #: field:res.bank,state:0
@@ -7570,23 +7980,23 @@ msgstr "Kopi av"
 #. module: base
 #: field:ir.model.data,display_name:0
 msgid "Record Name"
-msgstr ""
+msgstr "Postens navn"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_client
 #: selection:ir.ui.menu,action:0
 msgid "ir.actions.client"
-msgstr ""
+msgstr "ir.actions.client"
 
 #. module: base
 #: model:res.country,name:base.io
 msgid "British Indian Ocean Territory"
-msgstr "British Indian Ocean Territory"
+msgstr "Det britiske territoriet i Indiahavet"
 
 #. module: base
 #: model:ir.actions.server,name:base.action_server_module_immediate_install
 msgid "Module Immediate Install"
-msgstr ""
+msgstr "Umiddelbar installasjon av modul"
 
 #. module: base
 #: view:ir.actions.server:0
@@ -7606,7 +8016,7 @@ msgstr "Statskode"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_multilang
 msgid "Multi Language Chart of Accounts"
-msgstr ""
+msgstr "Flerspråklig kontoplan"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_gt
@@ -7636,7 +8046,7 @@ msgstr "Oversettbar"
 #. module: base
 #: help:base.language.import,code:0
 msgid "ISO Language and Country code, e.g. en_US"
-msgstr ""
+msgstr "ISO språk- og landskode, f.eks en_US"
 
 #. module: base
 #: model:res.country,name:base.vn
@@ -7656,12 +8066,12 @@ msgstr "Fullt navn"
 #. module: base
 #: view:ir.attachment:0
 msgid "on"
-msgstr ""
+msgstr "på"
 
 #. module: base
 #: view:ir.property:0
 msgid "Parameters that are used by all resources."
-msgstr ""
+msgstr "Parametre som brukes av alle ressurser."
 
 #. module: base
 #: model:res.country,name:base.mz
@@ -7674,6 +8084,8 @@ msgid ""
 "Action bound to this entry - helper field for binding an action, will "
 "automatically set the correct reference"
 msgstr ""
+"Handling knyttet til denne posten - hjelpefelt for å binde en handling, "
+"setter automatisk korrekt referanse"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_project_long_term
@@ -7689,7 +8101,7 @@ msgstr "Melding"
 #: field:ir.actions.act_window.view,multi:0
 #: field:ir.actions.report.xml,multi:0
 msgid "On Multiple Doc."
-msgstr "On Multiple Doc."
+msgstr "På flere dok."
 
 #. module: base
 #: view:base.language.export:0
@@ -7706,17 +8118,17 @@ msgstr "On Multiple Doc."
 #: view:res.users:0
 #: view:wizard.ir.model.menu.create:0
 msgid "or"
-msgstr ""
+msgstr "eller"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_accountant
 msgid "Accounting and Finance"
-msgstr ""
+msgstr "Regnskap og finans"
 
 #. module: base
 #: view:ir.module.module:0
 msgid "Upgrade"
-msgstr ""
+msgstr "Oppgrader"
 
 #. module: base
 #: model:ir.module.module,description:base.module_base_action_rule
@@ -7738,7 +8150,7 @@ msgstr ""
 #. module: base
 #: field:res.partner,function:0
 msgid "Job Position"
-msgstr ""
+msgstr "Stilling"
 
 #. module: base
 #: view:res.partner:0
@@ -7754,12 +8166,12 @@ msgstr "Færøyene"
 #. module: base
 #: field:ir.mail_server,smtp_encryption:0
 msgid "Connection Security"
-msgstr ""
+msgstr "Tilkoblingssikkerhet"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_ec
 msgid "Ecuador - Accounting"
-msgstr ""
+msgstr "Ecuador - Regnskapsføring"
 
 #. module: base
 #: field:res.partner.category,name:0
@@ -7774,17 +8186,17 @@ msgstr "Marianaøyene"
 #. module: base
 #: field:change.password.user,user_login:0
 msgid "User Login"
-msgstr ""
+msgstr "Brukernavn"
 
 #. module: base
 #: view:ir.filters:0
 msgid "Filters created by myself"
-msgstr ""
+msgstr "Filter laget av meg"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
-msgstr ""
+msgstr "Honduras - Regnskapsføring"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_report_intrastat
@@ -7798,6 +8210,8 @@ msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
 "change your own password."
 msgstr ""
+"Vennligst bruk endre passord veiviseren (I brukerinnstillinger eller i "
+"brukermenyen) for å endre ditt eget passord."
 
 #. module: base
 #: model:ir.model,name:base.model_ir_config_parameter
@@ -7837,12 +8251,12 @@ msgstr ""
 #: code:addons/orm.py:2021
 #, python-format
 msgid "Insufficient fields for Calendar View!"
-msgstr ""
+msgstr "Ikke tilstrekkelige felt for kalendervisning!"
 
 #. module: base
 #: selection:ir.property,type:0
 msgid "Integer"
-msgstr "Integer"
+msgstr "Heltall"
 
 #. module: base
 #: help:ir.actions.report.xml,report_rml:0
@@ -7850,16 +8264,18 @@ msgid ""
 "The path to the main report file (depending on Report Type) or NULL if the "
 "content is in another data field"
 msgstr ""
+"Filbane til hovedrapportfilen (avhengig av rapporttype) eller NULL hvis "
+"innholdet er i et annet felt"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_14
 msgid "Manufacturer"
-msgstr ""
+msgstr "Produsent"
 
 #. module: base
 #: help:res.users,company_id:0
 msgid "The company this user is currently working for."
-msgstr ""
+msgstr "Firmaet denne brukeren jobber for."
 
 #. module: base
 #: model:ir.model,name:base.model_wizard_ir_model_menu_create
@@ -7932,7 +8348,7 @@ msgstr "Feil"
 #: code:addons/base/res/res_partner.py:566
 #, python-format
 msgid "Couldn't create contact without email address!"
-msgstr ""
+msgstr "Kunne ikke skape kontakt uten epostadresse!"
 
 #. module: base
 #: help:res.partner,tz:0
@@ -7942,11 +8358,14 @@ msgid ""
 "use the same timezone that is otherwise used to pick and render date and "
 "time values: your computer's timezone."
 msgstr ""
+"Partnerens tidssone, som blir brukt til å skrive ut korrekt dato og tid på "
+"raporter. Det er viktig å sette en verdi for dette feltet. Du bør bruke den "
+"samme tidssonen som ellers blir brukt av din datamaskin."
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_analytic_default
 msgid "Account Analytic Defaults"
-msgstr ""
+msgstr "Standardverdier for kontoanalyser"
 
 #. module: base
 #: selection:ir.ui.view,type:0
@@ -7956,7 +8375,7 @@ msgstr "mdx"
 #. module: base
 #: view:ir.cron:0
 msgid "Scheduled Action"
-msgstr ""
+msgstr "Tidsbestemt handling"
 
 #. module: base
 #: model:res.country,name:base.bi
@@ -7974,12 +8393,12 @@ msgstr "Lukk"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (MX) / Español (MX)"
-msgstr "Spanish (MX) / Español (MX)"
+msgstr "Spansk (MX) / Español (MX)"
 
 #. module: base
 #: view:ir.actions.todo:0
 msgid "Wizards to be Launched"
-msgstr ""
+msgstr "Veivisere som skal startes"
 
 #. module: base
 #: model:res.country,name:base.bt
@@ -8006,17 +8425,17 @@ msgstr "Neste nummer på denne sekvensen"
 #: view:res.partner:0
 #: view:res.users:0
 msgid "Tags..."
-msgstr ""
+msgstr "Tagger..."
 
 #. module: base
 #: view:res.partner:0
 msgid "at"
-msgstr ""
+msgstr "på"
 
 #. module: base
 #: view:ir.rule:0
 msgid "Rule Definition (Domain Filter)"
-msgstr ""
+msgstr "Regeldefinisjon (domenefilter)"
 
 #. module: base
 #: selection:ir.actions.act_url,target:0
@@ -8026,7 +8445,7 @@ msgstr "Dette vinduet"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_portal_anonymous
 msgid "Anonymous portal"
-msgstr ""
+msgstr "Anonym portal"
 
 #. module: base
 #: field:base.language.export,format:0
@@ -8036,28 +8455,28 @@ msgstr "Filformat"
 #. module: base
 #: view:ir.filters:0
 msgid "My filters"
-msgstr ""
+msgstr "Mine filter"
 
 #. module: base
 #: field:res.lang,iso_code:0
 msgid "ISO code"
-msgstr "ISO code"
+msgstr "ISO kode"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_association
 msgid "Associations Management"
-msgstr ""
+msgstr "Relasjonsstyring"
 
 #. module: base
 #: help:ir.model,modules:0
 msgid "List of modules in which the object is defined or inherited"
-msgstr ""
+msgstr "Liste over moduler hvor objektet er definert eller arvet"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_localization_payroll
 #: model:ir.module.module,shortdesc:base.module_hr_payroll
 msgid "Payroll"
-msgstr ""
+msgstr "Lønnsavregning"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_country_state
@@ -8066,11 +8485,14 @@ msgid ""
 "federal states you are working on from here. Each state is attached to one "
 "country."
 msgstr ""
+"Hvis du arbeider med det amerikanske markedet, kan du administrere de "
+"forskjellige føderale statene du jobber med herifra. Hver stat er tilknyttet "
+"et land."
 
 #. module: base
 #: view:workflow.workitem:0
 msgid "Workflow Workitems"
-msgstr "Arbeidsflyt arbeidselementer"
+msgstr "Arbeidselementer i arbeidsflyt"
 
 #. module: base
 #: model:res.country,name:base.vc
@@ -8100,6 +8522,9 @@ msgid ""
 "Allow users to login through OAuth2 Provider.\n"
 "=============================================\n"
 msgstr ""
+"\n"
+"Lar brukere logge på via OAuth2.\n"
+"=============================================\n"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_model_fields
@@ -8109,7 +8534,7 @@ msgstr ""
 #: view:ir.model.fields:0
 #: model:ir.ui.menu,name:base.ir_model_model_fields
 msgid "Fields"
-msgstr "Felter"
+msgstr "Felt"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_employee_form
@@ -8134,17 +8559,17 @@ msgstr ""
 #. module: base
 #: field:res.company,rml_header2:0
 msgid "RML Internal Header"
-msgstr "RML Internal Header"
+msgstr "RML Intern topptekst"
 
 #. module: base
 #: field:ir.actions.act_window,search_view_id:0
 msgid "Search View Ref."
-msgstr ""
+msgstr "Søk Vis Ref."
 
 #. module: base
 #: help:res.users,partner_id:0
 msgid "Partner-related data of the user"
-msgstr ""
+msgstr "Partnerrelatert brukerdata"
 
 #. module: base
 #: model:ir.module.module,description:base.module_crm_todo
@@ -8158,7 +8583,7 @@ msgstr ""
 #. module: base
 #: view:ir.mail_server:0
 msgid "Test Connection"
-msgstr ""
+msgstr "Test tilkobling"
 
 #. module: base
 #: model:res.country,name:base.mm

From cce820565d9b85786d528b17670031bb112f1e64 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Mon, 12 May 2014 12:11:08 +0530
Subject: [PATCH 074/225] Missed commit while merging.

---
 addons/sale/sale.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 5bb025b4d12..c40946a61aa 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -34,6 +34,7 @@ AVAILABLE_STATES = [
     ('waiting_date', 'Waiting Schedule'),
     ('progress', 'Sales Order'),
     ('manual', 'Sale to Invoice'),
+    ('shipping_except', 'Shipping Exception'),
     ('invoice_except', 'Invoice Exception'),
     ('done', 'Done'),
 ]

From d2716e2db9109601d9e6e183e9df01d7829a9de4 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Mon, 12 May 2014 09:41:50 +0200
Subject: [PATCH 075/225] [ADD] hw_escpos: TM-T20II printer added in supported
 device list

bzr revid: dle@openerp.com-20140512074150-9wepj7andgwrgj7x
---
 addons/hw_escpos/escpos/supported_devices.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/hw_escpos/escpos/supported_devices.py b/addons/hw_escpos/escpos/supported_devices.py
index 2c6a6be2d07..bd08433de0e 100644
--- a/addons/hw_escpos/escpos/supported_devices.py
+++ b/addons/hw_escpos/escpos/supported_devices.py
@@ -6,5 +6,6 @@
 device_list = [
     { 'vendor' : 0x04b8, 'product' : 0x0e03, 'name' : 'Epson TM-T20' },
     { 'vendor' : 0x04b8, 'product' : 0x0202, 'name' : 'Epson TM-T70' },
+    { 'vendor' : 0x04b8, 'product' : 0x0e15, 'name' : 'Epson TM-T20II' },
 ]
 

From e70fc38f2fac33d138bbd3c6bbca1082ff720572 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Mon, 12 May 2014 09:59:19 +0200
Subject: [PATCH 076/225] [FIX] crm: The get_formview_id method does not expect
 a model arg anymore

bzr revid: dle@openerp.com-20140512075919-ewldirr5ejd5py13
---
 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 785f2a6e8ce..bf6ef242cc8 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -977,7 +977,7 @@ class crm_lead(format_address, osv.osv):
         if obj.type == 'opportunity':
             model, view_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'crm', 'crm_case_form_view_oppor')
         else:
-            view_id = super(crm_lead, self).get_formview_id(cr, uid, id, model='crm.lead', context=context)
+            view_id = super(crm_lead, self).get_formview_id(cr, uid, id, context=context)
         return view_id
 
     def message_get_suggested_recipients(self, cr, uid, ids, context=None):

From 443c830bfc65a6b7235cb99d205740429c30d771 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 12 May 2014 10:37:47 +0200
Subject: [PATCH 077/225] [RENAME] sale_team renamed to sales_team. Update
 module name, file name and reference to the module.

---
 addons/crm/__openerp__.py                     |  2 +-
 addons/crm/crm_action_rule_demo.xml           |  2 +-
 addons/crm/crm_case_section_view.xml          | 10 ++--
 addons/crm/crm_data.xml                       | 10 ++--
 addons/crm/crm_lead_data.xml                  | 34 ++++++------
 addons/crm/crm_lead_demo.xml                  | 52 +++++++++----------
 addons/crm/crm_phonecall_data.xml             |  4 +-
 addons/crm/crm_phonecall_demo.xml             | 12 ++---
 addons/crm/test/crm_lead_cancel.yml           |  2 +-
 addons/crm/test/crm_lead_find_stage.yml       |  2 +-
 addons/crm/test/lead2opportunity2win.yml      |  2 +-
 .../test/lead2opportunity_assign_salesmen.yml |  2 +-
 addons/crm_claim/crm_claim_data.xml           | 10 ++--
 addons/crm_claim/crm_claim_demo.xml           | 14 ++---
 addons/crm_helpdesk/crm_helpdesk_demo.xml     |  6 +--
 addons/crm_partner_assign/crm_lead_demo.xml   |  2 +-
 addons/project_issue/project_issue_demo.xml   | 30 +++++------
 addons/sale/__openerp__.py                    |  2 +-
 addons/sale/crm_case_section_view.xml         |  4 +-
 addons/sale_crm/sale_crm_demo.xml             | 24 ++++-----
 addons/{sale_team => sales_team}/__init__.py  |  4 +-
 .../{sale_team => sales_team}/__openerp__.py  | 10 ++--
 .../res_config_view.xml                       |  0
 .../sale_team.py => sales_team/sales_team.py} |  0
 .../sales_team.xml}                           |  2 +-
 .../sales_team_config.py}                     |  2 +-
 .../sales_team_data.xml}                      |  0
 .../sales_team_demo.xml}                      |  0
 .../security/ir.model.access.csv              |  0
 .../security/sales_team_security.xml}         |  0
 .../static/src/css/sales_team.css}            |  0
 31 files changed, 122 insertions(+), 122 deletions(-)
 rename addons/{sale_team => sales_team}/__init__.py (96%)
 rename addons/{sale_team => sales_team}/__openerp__.py (88%)
 rename addons/{sale_team => sales_team}/res_config_view.xml (100%)
 rename addons/{sale_team/sale_team.py => sales_team/sales_team.py} (100%)
 rename addons/{sale_team/sale_team.xml => sales_team/sales_team.xml} (98%)
 rename addons/{sale_team/sale_team_config.py => sales_team/sales_team_config.py} (98%)
 rename addons/{sale_team/sale_team_data.xml => sales_team/sales_team_data.xml} (100%)
 rename addons/{sale_team/sale_team_demo.xml => sales_team/sales_team_demo.xml} (100%)
 rename addons/{sale_team => sales_team}/security/ir.model.access.csv (100%)
 rename addons/{sale_team/security/sale_team_security.xml => sales_team/security/sales_team_security.xml} (100%)
 rename addons/{sale_team/static/src/css/sale_team.css => sales_team/static/src/css/sales_team.css} (100%)

diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 7ff51a470e3..ecdefb9e051 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -51,7 +51,7 @@ Dashboard for CRM will include:
     'depends': [
         'base_action_rule',
         'base_setup',
-        'sale_team',
+        'sales_team',
         'mail',
         'email_template',
         'calendar',
diff --git a/addons/crm/crm_action_rule_demo.xml b/addons/crm/crm_action_rule_demo.xml
index 2524132c4d4..d77211a0f12 100644
--- a/addons/crm/crm_action_rule_demo.xml
+++ b/addons/crm/crm_action_rule_demo.xml
@@ -41,7 +41,7 @@
             <field name="condition">True</field>
             <field name="type">ir.actions.server</field>
             <field name="state">code</field>
-            <field name="code">sales_team = self.pool.get('ir.model.data').get_object(cr, uid, 'sale_team', 'section_sales_department')
+            <field name="code">sales_team = self.pool.get('ir.model.data').get_object(cr, uid, 'sales_team', 'section_sales_department')
 object.write({'section_id': sales_team.id})
             </field>
         </record>
diff --git a/addons/crm/crm_case_section_view.xml b/addons/crm/crm_case_section_view.xml
index 94f59217065..cc6aba3c408 100644
--- a/addons/crm/crm_case_section_view.xml
+++ b/addons/crm/crm_case_section_view.xml
@@ -83,7 +83,7 @@
         <record model="ir.ui.view" id="crm_case_section_salesteams_view_kanban">
             <field name="name">crm.case.section.kanban</field>
             <field name="model">crm.case.section</field>
-            <field name="inherit_id" ref="sale_team.crm_case_section_salesteams_view_kanban"/>
+            <field name="inherit_id" ref="sales_team.crm_case_section_salesteams_view_kanban"/>
             <field name="arch" type="xml">
                 <data>
                     <xpath expr="//field[@name='name']" position="after">
@@ -100,7 +100,7 @@
         <record model="ir.ui.view" id="crm_case_section_salesteams_view_kanban">
             <field name="name">crm.case.section.kanban</field>
             <field name="model">crm.case.section</field>
-            <field name="inherit_id" ref="sale_team.crm_case_section_salesteams_view_kanban"/>
+            <field name="inherit_id" ref="sales_team.crm_case_section_salesteams_view_kanban"/>
             <field name="arch" type="xml">
                 <data>
                     <xpath expr="//field[@name='name']" position="after">
@@ -158,13 +158,13 @@
             <field name="res_model">crm.case.section</field>
             <field name="domain">[('parent_id','=',False)]</field>
             <field name="view_type">tree</field>
-            <field name="view_id" ref="sale_team.crm_case_section_view_tree"/>
+            <field name="view_id" ref="sales_team.crm_case_section_view_tree"/>
         </record>
 
-    <record model="ir.ui.view" id="sale_team_form_view_in_crm">
+    <record model="ir.ui.view" id="sales_team_form_view_in_crm">
             <field name="name">crm.case.section.form</field>
             <field name="model">crm.case.section</field>
-            <field name="inherit_id" ref="sale_team.crm_case_section_view_form"/>
+            <field name="inherit_id" ref="sales_team.crm_case_section_view_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='name']" position="after">
                     <h6><field name="use_leads"/><label for="use_leads" string="Leads"/></h6>
diff --git a/addons/crm/crm_data.xml b/addons/crm/crm_data.xml
index cec54a683bd..a5a732747ab 100644
--- a/addons/crm/crm_data.xml
+++ b/addons/crm/crm_data.xml
@@ -26,7 +26,7 @@
             <field name="name">Email</field>
         </record>
 
-        <record model="crm.case.section" id="sale_team.section_sales_department">
+        <record model="crm.case.section" id="sales_team.section_sales_department">
             <field name="use_leads">True</field>
             <field name="alias_name">sales</field>
         </record>
@@ -35,22 +35,22 @@
 
         <record model="crm.payment.mode" id="payment_mode_1">
             <field name="name">Cash</field>
-            <field name="section_id" ref="sale_team.section_sales_department"/>
+            <field name="section_id" ref="sales_team.section_sales_department"/>
         </record>
 
         <record model="crm.payment.mode" id="payment_mode_2">
             <field name="name">Check</field>
-            <field name="section_id" ref="sale_team.section_sales_department"/>
+            <field name="section_id" ref="sales_team.section_sales_department"/>
         </record>
 
         <record model="crm.payment.mode" id="payment_mode_3">
             <field name="name">Credit Card</field>
-            <field name="section_id" ref="sale_team.section_sales_department"/>
+            <field name="section_id" ref="sales_team.section_sales_department"/>
         </record>
 
         <record model="crm.payment.mode" id="payment_mode_4">
             <field name="name">Demand Draft</field>
-            <field name="section_id" ref="sale_team.section_sales_department"/>
+            <field name="section_id" ref="sales_team.section_sales_department"/>
         </record>
 
         <!--default alias for leads-->
diff --git a/addons/crm/crm_lead_data.xml b/addons/crm/crm_lead_data.xml
index dbc0f94f65e..9ea859937a2 100644
--- a/addons/crm/crm_lead_data.xml
+++ b/addons/crm/crm_lead_data.xml
@@ -61,7 +61,7 @@
             <field name="type">opportunity</field>
         </record>
         
-        <record model="crm.case.section" id="sale_team.section_sales_department">
+        <record model="crm.case.section" id="sales_team.section_sales_department">
             <field name="stage_ids" eval="[ (4, ref('stage_lead1')), (4, ref('stage_lead2')),
                                             (4, ref('stage_lead3')), (4, ref('stage_lead4')),
                                             (4, ref('stage_lead5')), (4, ref('stage_lead6')),
@@ -71,76 +71,76 @@
         <!-- Crm campain -->
         <record model="crm.case.resource.type" id="type_lead1">
             <field name="name">Telesales</field>
-            <field name="section_id" ref="sale_team.section_sales_department"/>
+            <field name="section_id" ref="sales_team.section_sales_department"/>
         </record>
         <record model="crm.case.resource.type" id="type_lead2">
             <field name="name">Email Campaign - Services</field>
-            <field name="section_id" ref="sale_team.section_sales_department"/>
+            <field name="section_id" ref="sales_team.section_sales_department"/>
         </record>
         <record model="crm.case.resource.type" id="type_lead3">
             <field name="name">Email Campaign - Products</field>
-            <field name="section_id" ref="sale_team.section_sales_department"/>
+            <field name="section_id" ref="sales_team.section_sales_department"/>
         </record>
         <record model="crm.case.resource.type" id="type_lead4">
             <field name="name">Twitter Ads</field>
-            <field name="section_id" ref="sale_team.section_sales_department"/>
+            <field name="section_id" ref="sales_team.section_sales_department"/>
         </record>
         <record model="crm.case.resource.type" id="type_lead5">
             <field name="name">Google Adwords</field>
-            <field name="section_id" ref="sale_team.section_sales_department"/>
+            <field name="section_id" ref="sales_team.section_sales_department"/>
         </record>
         <record model="crm.case.resource.type" id="type_lead6">
             <field name="name">Banner Ads</field>
-            <field name="section_id" ref="sale_team.section_sales_department"/>
+            <field name="section_id" ref="sales_team.section_sales_department"/>
         </record>
         <record model="crm.case.resource.type" id="type_lead7">
             <field name="name">Television</field>
-            <field name="section_id" ref="sale_team.section_sales_department"/>
+            <field name="section_id" ref="sales_team.section_sales_department"/>
         </record>
         <record model="crm.case.resource.type" id="type_lead8">
             <field name="name">Newsletter</field>
-            <field name="section_id" ref="sale_team.section_sales_department"/>
+            <field name="section_id" ref="sales_team.section_sales_department"/>
         </record>
 
         <!--  crm categories -->
         <record model="crm.case.categ" id="categ_oppor1">
             <field name="name">Product</field>
-            <field name="section_id" ref="sale_team.section_sales_department"/>
+            <field name="section_id" ref="sales_team.section_sales_department"/>
             <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
         </record>
         <record model="crm.case.categ" id="categ_oppor2">
             <field name="name">Software</field>
-            <field name="section_id" ref="sale_team.section_sales_department"/>
+            <field name="section_id" ref="sales_team.section_sales_department"/>
             <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
         </record>
         <record model="crm.case.categ" id="categ_oppor3">
             <field name="name">Services</field>
-            <field name="section_id" ref="sale_team.section_sales_department"/>
+            <field name="section_id" ref="sales_team.section_sales_department"/>
             <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
         </record>
         <record model="crm.case.categ" id="categ_oppor4">
             <field name="name">Information</field>
-            <field name="section_id" ref="sale_team.section_sales_department"/>
+            <field name="section_id" ref="sales_team.section_sales_department"/>
             <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
         </record>
         <record model="crm.case.categ" id="categ_oppor5">
             <field name="name">Design</field>
-            <field name="section_id" ref="sale_team.section_sales_department"/>
+            <field name="section_id" ref="sales_team.section_sales_department"/>
             <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
         </record>
         <record model="crm.case.categ" id="categ_oppor6">
             <field name="name">Training</field>
-            <field name="section_id" ref="sale_team.section_sales_department"/>
+            <field name="section_id" ref="sales_team.section_sales_department"/>
             <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
         </record>
         <record model="crm.case.categ" id="categ_oppor7">
             <field name="name">Consulting</field>
-            <field name="section_id" ref="sale_team.section_sales_department"/>
+            <field name="section_id" ref="sales_team.section_sales_department"/>
             <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
         </record>
         <record model="crm.case.categ" id="categ_oppor8">
             <field name="name">Other</field>
-            <field name="section_id" ref="sale_team.section_sales_department"/>
+            <field name="section_id" ref="sales_team.section_sales_department"/>
             <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
         </record>
 
diff --git a/addons/crm/crm_lead_demo.xml b/addons/crm/crm_lead_demo.xml
index 64ee8f7b870..ef105d3989e 100644
--- a/addons/crm/crm_lead_demo.xml
+++ b/addons/crm/crm_lead_demo.xml
@@ -20,7 +20,7 @@
             <field name="categ_ids" eval="[(6, 0, [categ_oppor6])]"/>
             <field name="channel_id" ref="crm_case_channel_email"/>
             <field name="priority">1</field>
-            <field name="section_id" ref="sale_team.section_sales_department"/>
+            <field name="section_id" ref="sales_team.section_sales_department"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="stage_lead1"/>
             <field name="description">Hello,
@@ -55,7 +55,7 @@ Could you please send me the details ?</field>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor2])]"/>
             <field name="channel_id" ref="crm_case_channel_website"/>
             <field name="priority">4</field>
-            <field name="section_id" ref="sale_team.section_sales_department"/>
+            <field name="section_id" ref="sales_team.section_sales_department"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="stage_lead1"/>
         </record>
@@ -84,7 +84,7 @@ Could you please send me the details ?</field>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor4])]"/>
             <field name="channel_id" ref=""/>
             <field name="priority">2</field>
-            <field name="section_id" ref="sale_team.crm_case_section_1"/>
+            <field name="section_id" ref="sales_team.crm_case_section_1"/>
             <field name="user_id" ref="base.user_demo"/>
             <field name="stage_id" ref="stage_lead1"/>
         </record>
@@ -105,7 +105,7 @@ Could you please send me the details ?</field>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor5])]"/>
             <field name="channel_id" ref=""/>
             <field name="priority">3</field>
-            <field name="section_id" ref="sale_team.crm_case_section_2"/>
+            <field name="section_id" ref="sales_team.crm_case_section_2"/>
             <field name="user_id" ref="base.user_demo"/>
             <field name="stage_id" ref="stage_lead6"/>
         </record>
@@ -130,7 +130,7 @@ Could you please send me the details ?</field>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor1])]"/>
             <field name="channel_id" ref="crm_case_channel_website"/>
             <field name="priority">3</field>
-            <field name="section_id" ref="sale_team.crm_case_section_1"/>
+            <field name="section_id" ref="sales_team.crm_case_section_1"/>
             <field name="user_id" ref=""/>
             <field name="stage_id" ref="stage_lead1"/>
             <field name="description">Hi,
@@ -157,7 +157,7 @@ Contact: +1 813 494 5005</field>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor3,categ_oppor4])]"/>
             <field name="channel_id" ref=""/>
             <field name="priority">2</field>
-            <field name="section_id" ref="sale_team.crm_case_section_2"/>
+            <field name="section_id" ref="sales_team.crm_case_section_2"/>
             <field name="user_id" ref=""/>
             <field name="stage_id" ref="stage_lead1"/>
         </record>
@@ -175,7 +175,7 @@ Contact: +1 813 494 5005</field>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor4])]"/>
             <field name="channel_id" ref=""/>
             <field name="priority">0</field>
-            <field name="section_id" ref="sale_team.crm_case_section_2"/>
+            <field name="section_id" ref="sales_team.crm_case_section_2"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="stage_lead1"/>
         </record>
@@ -194,7 +194,7 @@ Contact: +1 813 494 5005</field>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor6,categ_oppor8])]"/>
             <field name="channel_id" ref=""/>
             <field name="priority">1</field>
-            <field name="section_id" ref="sale_team.section_sales_department"/>
+            <field name="section_id" ref="sales_team.section_sales_department"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="stage_lead1"/>
         </record>
@@ -213,7 +213,7 @@ Contact: +1 813 494 5005</field>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor7])]"/>
             <field name="channel_id" ref="crm_case_channel_phone"/>
             <field name="priority">2</field>
-            <field name="section_id" ref="sale_team.section_sales_department"/>
+            <field name="section_id" ref="sales_team.section_sales_department"/>
             <field name="user_id" ref="base.user_demo"/>
             <field name="stage_id" ref="stage_lead1"/>
         </record>
@@ -231,7 +231,7 @@ Contact: +1 813 494 5005</field>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor1])]"/>
             <field name="channel_id" ref="crm_case_channel_email"/>
             <field name="priority">2</field>
-            <field name="section_id" ref="sale_team.crm_case_section_2"/>
+            <field name="section_id" ref="sales_team.crm_case_section_2"/>
             <field name="user_id" ref="base.user_demo"/>
             <field name="stage_id" ref="stage_lead1"/>
             <field name="description">Hi,
@@ -254,7 +254,7 @@ Andrew</field>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor7])]"/>
             <field name="channel_id" ref="crm_case_channel_direct"/>
             <field name="priority">2</field>
-            <field name="section_id" ref="sale_team.crm_case_section_1"/>
+            <field name="section_id" ref="sales_team.crm_case_section_1"/>
             <field name="user_id" ref=""/>
             <field name="stage_id" ref="stage_lead1"/>
         </record>
@@ -272,7 +272,7 @@ Andrew</field>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor1])]"/>
             <field name="channel_id" ref="crm_case_channel_website"/>
             <field name="priority">2</field>
-            <field name="section_id" ref="sale_team.section_sales_department"/>
+            <field name="section_id" ref="sales_team.section_sales_department"/>
             <field name="user_id" ref=""/>
             <field name="stage_id" ref="stage_lead1"/>
         </record>
@@ -310,7 +310,7 @@ Andrew</field>
             <field eval="time.strftime('%Y-%m-25')" name="date_deadline"/>
             <field eval="time.strftime('%Y-%m-12')" name="date_action"/>
             <field name="title_action">Meeting for pricing information.</field>
-            <field name="section_id" ref="sale_team.section_sales_department"/>
+            <field name="section_id" ref="sales_team.section_sales_department"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="crm.stage_lead1"/>
         </record>
@@ -335,7 +335,7 @@ Andrew</field>
             <field eval="time.strftime('%Y-%m-23')" name="date_deadline"/>
             <field eval="time.strftime('%Y-%m-10')" name="date_action"/>
             <field name="title_action">Send Catalogue by Email</field>
-            <field name="section_id" ref="sale_team.section_sales_department"/>
+            <field name="section_id" ref="sales_team.section_sales_department"/>
             <field name="user_id" ref="base.user_demo"/>
             <field name="stage_id" ref="crm.stage_lead3"/>
         </record>
@@ -356,7 +356,7 @@ Andrew</field>
             <field eval="time.strftime('%Y-%m-12')" name="date_deadline"/>
             <field eval="time.strftime('%Y-%m-10')" name="date_action"/>
             <field name="title_action">Call to ask system requirement</field>
-            <field name="section_id" ref="sale_team.section_sales_department"/>
+            <field name="section_id" ref="sales_team.section_sales_department"/>
             <field name="user_id" ref="base.user_demo"/>
             <field name="stage_id" ref="crm.stage_lead3"/>
             <field name="date_closed" eval="(DateTime.today() - relativedelta(months=2)).strftime('%Y-%m-%d %H:%M')"/>
@@ -383,7 +383,7 @@ Andrew</field>
             <field eval="time.strftime('%Y-%m-28')" name="date_deadline"/>
             <field eval="time.strftime('%Y-%m-1')" name="date_action"/>
             <field name="title_action">Convert to quote</field>
-            <field name="section_id" ref="sale_team.crm_case_section_1"/>
+            <field name="section_id" ref="sales_team.crm_case_section_1"/>
             <field name="user_id" ref="base.user_demo"/>
             <field name="stage_id" ref="crm.stage_lead3"/>
             <field name="date_closed" eval="(DateTime.today() - relativedelta(hours=1)).strftime('%Y-%m-%d %H:%M')"/>
@@ -408,7 +408,7 @@ Andrew</field>
             <field eval="time.strftime('%Y-%m-8')" name="date_deadline"/>
             <field eval="time.strftime('%Y-%m-3')" name="date_action"/>
             <field name="title_action">Send price list regarding our interventions</field>
-            <field name="section_id" ref="sale_team.crm_case_section_1"/>
+            <field name="section_id" ref="sales_team.crm_case_section_1"/>
             <field name="user_id" ref="base.user_demo"/>
             <field name="stage_id" ref="crm.stage_lead4"/>
             <field name="date_closed" eval="(DateTime.today() - relativedelta(hours=1)).strftime('%Y-%m-%d %H:%M')"/>
@@ -435,7 +435,7 @@ Andrew</field>
             <field eval="time.strftime('%Y-%m-13')" name="date_deadline"/>
             <field eval="time.strftime('%Y-%m-4')" name="date_action"/>
             <field name="title_action">Call to define real needs about training</field>
-            <field name="section_id" ref="sale_team.crm_case_section_1"/>
+            <field name="section_id" ref="sales_team.crm_case_section_1"/>
             <field name="user_id" ref="base.user_demo"/>
             <field name="stage_id" ref="crm.stage_lead4"/>
             <field eval="1" name="active"/>
@@ -462,7 +462,7 @@ Andrew</field>
             <field eval="time.strftime('%Y-%m-10')" name="date_deadline"/>
             <field eval="time.strftime('%Y-%m-5')" name="date_action"/>
             <field name="title_action">Ask for the good receprion of the proposition</field>
-            <field name="section_id" ref="sale_team.crm_case_section_1"/>
+            <field name="section_id" ref="sales_team.crm_case_section_1"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="crm.stage_lead4"/>
             <field name="date_closed" eval="(DateTime.today() - relativedelta(months=3)).strftime('%Y-%m-%d %H:%M')"/>
@@ -479,7 +479,7 @@ Andrew</field>
             <field name="type_id" ref="type_lead3"/>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor4,categ_oppor8])]"/>
             <field name="priority">2</field>
-            <field name="section_id" ref="sale_team.crm_case_section_1"/>
+            <field name="section_id" ref="sales_team.crm_case_section_1"/>
             <field name="user_id" ref="base.user_demo"/>
             <field name="stage_id" ref="crm.stage_lead4"/>
         </record>
@@ -493,7 +493,7 @@ Andrew</field>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor7])]"/>
             <field name="channel_id" ref="crm_case_channel_phone"/>
             <field name="priority">2</field>
-            <field name="section_id" ref="sale_team.crm_case_section_2"/>
+            <field name="section_id" ref="sales_team.crm_case_section_2"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="crm.stage_lead4"/>
             <field name="date_closed" eval="(DateTime.today() - relativedelta(months=1)).strftime('%Y-%m-%d %H:%M')"/>
@@ -511,7 +511,7 @@ Andrew</field>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor3])]"/>
             <field name="channel_id" ref="crm_case_channel_email"/>
             <field name="priority">1</field>
-            <field name="section_id" ref="sale_team.crm_case_section_2"/>
+            <field name="section_id" ref="sales_team.crm_case_section_2"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="crm.stage_lead5"/>
         </record>
@@ -526,7 +526,7 @@ Andrew</field>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor3])]"/>
             <field name="channel_id" ref="crm_case_channel_direct"/>
             <field name="priority">0</field>
-            <field name="section_id" ref="sale_team.section_sales_department"/>
+            <field name="section_id" ref="sales_team.section_sales_department"/>
             <field name="user_id" ref="base.user_demo"/>
             <field name="stage_id" ref="crm.stage_lead5"/>
             <field name="date_closed" eval="(DateTime.today() - relativedelta(hours=1)).strftime('%Y-%m-%d %H:%M')"/>
@@ -545,7 +545,7 @@ Andrew</field>
             <field name="channel_id" ref="crm_case_channel_website"/>
             <field name="priority">0</field>
             <field eval="time.strftime('%Y-%m-6')" name="date_deadline"/>
-            <field name="section_id" ref="sale_team.section_sales_department"/>
+            <field name="section_id" ref="sales_team.section_sales_department"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="crm.stage_lead5"/>
             <field name="date_closed" eval="(DateTime.today() - relativedelta(month=1)).strftime('%Y-%m-%d %H:%M')"/>
@@ -568,7 +568,7 @@ Andrew</field>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor4])]"/>
             <field name="priority">2</field>
             <field name="title_action">Conf call with technical service</field>
-            <field name="section_id" ref="sale_team.crm_case_section_1"/>
+            <field name="section_id" ref="sales_team.crm_case_section_1"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="crm.stage_lead5"/>
         </record>
@@ -592,7 +592,7 @@ Andrew</field>
             <field eval="time.strftime('%Y-%m-23')" name="date_deadline"/>
             <field eval="time.strftime('%Y-%m-10')" name="date_action"/>
             <field name="title_action">Send Catalogue by Email</field>
-            <field name="section_id" ref="sale_team.crm_case_section_2"/>
+            <field name="section_id" ref="sales_team.crm_case_section_2"/>
             <field name="user_id" ref="base.user_demo"/>
             <field name="stage_id" ref="crm.stage_lead5"/>
             <!-- <field name="date_closed" eval="(DateTime.today() - relativedelta(hours=1)).strftime('%Y-%m-%d %H:%M')"/> -->
diff --git a/addons/crm/crm_phonecall_data.xml b/addons/crm/crm_phonecall_data.xml
index 4e613e7f72a..ce82a9a7b51 100644
--- a/addons/crm/crm_phonecall_data.xml
+++ b/addons/crm/crm_phonecall_data.xml
@@ -6,13 +6,13 @@
     -->
     <record model="crm.case.categ" id="categ_phone1">
         <field name="name">Inbound</field>
-        <field name="section_id" ref="sale_team.section_sales_department"/>
+        <field name="section_id" ref="sales_team.section_sales_department"/>
         <field name="object_id" search="[('model','=','crm.phonecall')]" model="ir.model"/>
 
     </record>
     <record model="crm.case.categ" id="categ_phone2">
         <field name="name">Outbound</field>
-        <field name="section_id" ref="sale_team.section_sales_department"/>
+        <field name="section_id" ref="sales_team.section_sales_department"/>
         <field name="object_id" search="[('model','=','crm.phonecall')]" model="ir.model"/>
     </record>
 
diff --git a/addons/crm/crm_phonecall_demo.xml b/addons/crm/crm_phonecall_demo.xml
index 8d41c868c27..8563a38b075 100644
--- a/addons/crm/crm_phonecall_demo.xml
+++ b/addons/crm/crm_phonecall_demo.xml
@@ -11,7 +11,7 @@
             <field name="name">Left the message</field>
             <field name="state">done</field>
             <field name="partner_phone">+34 934 340 230</field>
-            <field name="section_id" ref="sale_team.section_sales_department"/>
+            <field name="section_id" ref="sales_team.section_sales_department"/>
             <field eval="1" name="active"/>
             <field name="categ_id" ref="crm.categ_phone1"/>
             <field eval="2.3" name="duration"/>
@@ -24,7 +24,7 @@
             <field name="name">Need more information on the proposed deal</field>
             <field name="state">done</field>
             <field name="partner_phone">+44 121 690 4596</field>
-            <field name="section_id" ref="sale_team.crm_case_section_1"/>
+            <field name="section_id" ref="sales_team.crm_case_section_1"/>
             <field eval="1" name="active"/>
             <field name="categ_id" ref="crm.categ_phone1"/>
             <field eval="1.5" name="duration"/>
@@ -37,7 +37,7 @@
             <field name="name">Ask for convenient time of meeting</field>
             <field name="state">open</field>
             <field name="partner_phone">+1 786 525 0724</field>
-            <field name="section_id" ref="sale_team.crm_case_section_2"/>
+            <field name="section_id" ref="sales_team.crm_case_section_2"/>
             <field eval="1" name="active"/>
             <field name="categ_id" ref="crm.categ_phone2"/>
             <field eval="5.0" name="duration"/>
@@ -50,7 +50,7 @@
             <field name="state">done</field>
             <field name="partner_phone">(077) 582-4035</field>
             <field name="partner_mobile">(077) 341-3591</field>
-            <field name="section_id" ref="sale_team.crm_case_section_2"/>
+            <field name="section_id" ref="sales_team.crm_case_section_2"/>
             <field eval="1" name="active"/>
             <field name="categ_id" ref="crm.categ_phone1"/>
             <field eval="5.45" name="duration"/>
@@ -63,7 +63,7 @@
             <field name="name">More information on the proposed deal</field>
             <field name="state">pending</field>
             <field name="partner_phone">+1 312 349 2324</field>
-            <field name="section_id" ref="sale_team.crm_case_section_1"/>
+            <field name="section_id" ref="sales_team.crm_case_section_1"/>
             <field eval="1" name="active"/>
             <field name="categ_id" ref="crm.categ_phone1"/>
             <field eval="2.08" name="duration"/>
@@ -74,7 +74,7 @@
             <field name="name">Proposal for discount offer</field>
             <field name="state">open</field>
             <field name="partner_phone">+34 230 953 485</field>
-            <field name="section_id" ref="sale_team.crm_case_section_2"/>
+            <field name="section_id" ref="sales_team.crm_case_section_2"/>
             <field eval="time.strftime('%Y-%m-28 14:15:30')" name="date"/>
             <field name="categ_id" ref="crm.categ_phone2"/>
             <field eval="8.56" name="duration"/>
diff --git a/addons/crm/test/crm_lead_cancel.yml b/addons/crm/test/crm_lead_cancel.yml
index fa98f47e6ea..eca85e4b7a1 100644
--- a/addons/crm/test/crm_lead_cancel.yml
+++ b/addons/crm/test/crm_lead_cancel.yml
@@ -5,7 +5,7 @@
     uid: 'crm_res_users_salesmanager'
 -
   !python {model: crm.lead}: |
-    section_id = self.pool.get('crm.case.section').create(cr, uid, {'name': "Phone Marketing", 'parent_id': ref("sale_team.crm_case_section_2")})
+    section_id = self.pool.get('crm.case.section').create(cr, uid, {'name': "Phone Marketing", 'parent_id': ref("sales_team.crm_case_section_2")})
     self.write(cr, uid, [ref("crm_case_1")], {'section_id': section_id})
 -
   Salesman check unqualified lead .
diff --git a/addons/crm/test/crm_lead_find_stage.yml b/addons/crm/test/crm_lead_find_stage.yml
index 9fcff6ab512..19bed36fc7e 100644
--- a/addons/crm/test/crm_lead_find_stage.yml
+++ b/addons/crm/test/crm_lead_find_stage.yml
@@ -6,7 +6,7 @@
     name: 'Test lead new'
     partner_id: base.res_partner_1
     description: This is the description of the test new lead.
-    section_id: sale_team.section_sales_department
+    section_id: sales_team.section_sales_department
 -
   I check default stage of lead.
 -
diff --git a/addons/crm/test/lead2opportunity2win.yml b/addons/crm/test/lead2opportunity2win.yml
index c91768bcc07..1bae79bf983 100644
--- a/addons/crm/test/lead2opportunity2win.yml
+++ b/addons/crm/test/lead2opportunity2win.yml
@@ -65,7 +65,7 @@
 -
   !python {model: crm.lead2opportunity.partner.mass}: |
     context.update({'active_model': 'crm.lead', 'active_ids': [ref("crm_case_13"), ref("crm_case_2")], 'active_id': ref("crm_case_13")})
-    id = self.create(cr, uid, {'user_ids': [(6, 0, [ref('base.user_root')])], 'section_id': ref('sale_team.section_sales_department')}, context=context)
+    id = self.create(cr, uid, {'user_ids': [(6, 0, [ref('base.user_root')])], 'section_id': ref('sales_team.section_sales_department')}, context=context)
     self.mass_convert(cr, uid, [id], context=context)
 -
   Now I check first lead converted on opportunity.
diff --git a/addons/crm/test/lead2opportunity_assign_salesmen.yml b/addons/crm/test/lead2opportunity_assign_salesmen.yml
index 6206db33050..9ac3e954f88 100644
--- a/addons/crm/test/lead2opportunity_assign_salesmen.yml
+++ b/addons/crm/test/lead2opportunity_assign_salesmen.yml
@@ -66,7 +66,7 @@
 -
   !python {model: crm.lead2opportunity.partner.mass}: |
     context.update({'active_model': 'crm.lead', 'active_ids': [ref("test_crm_lead_01"), ref("test_crm_lead_02"), ref("test_crm_lead_03"), ref("test_crm_lead_04"), ref("test_crm_lead_05"), ref("test_crm_lead_06")], 'active_id': ref("test_crm_lead_01")})
-    id = self.create(cr, uid, {'user_ids': [(6, 0, [ref('test_res_user_01'), ref('test_res_user_02'), ref('test_res_user_03'), ref('test_res_user_04')])], 'section_id': ref('sale_team.section_sales_department'), 'deduplicate': False, 'force_assignation': True}, context=context)
+    id = self.create(cr, uid, {'user_ids': [(6, 0, [ref('test_res_user_01'), ref('test_res_user_02'), ref('test_res_user_03'), ref('test_res_user_04')])], 'section_id': ref('sales_team.section_sales_department'), 'deduplicate': False, 'force_assignation': True}, context=context)
     self.mass_convert(cr, uid, [id], context=context)
 -
   The leads should now be opps with a salesman and a salesteam.  Also, salesmen should have been assigned following a round-robin method.
diff --git a/addons/crm_claim/crm_claim_data.xml b/addons/crm_claim/crm_claim_data.xml
index 8a1bae29a2b..fca7ac51178 100644
--- a/addons/crm_claim/crm_claim_data.xml
+++ b/addons/crm_claim/crm_claim_data.xml
@@ -8,19 +8,19 @@
         
         <record model="crm.case.categ" id="categ_claim1">
             <field name="name">Factual Claims</field>
-            <field name="section_id" ref="sale_team.section_sales_department"/>
+            <field name="section_id" ref="sales_team.section_sales_department"/>
             <field name="object_id" search="[('model','=','crm.claim')]" model="ir.model"/> 
         </record>
         
         <record model="crm.case.categ" id="categ_claim2">
             <field name="name">Value Claims</field>
-            <field name="section_id" ref="sale_team.section_sales_department"/>
+            <field name="section_id" ref="sales_team.section_sales_department"/>
             <field name="object_id" search="[('model','=','crm.claim')]" model="ir.model"/> 
         </record>
         
         <record model="crm.case.categ" id="categ_claim3">
             <field name="name">Policy Claims</field>
-            <field name="section_id" ref="sale_team.section_sales_department"/>
+            <field name="section_id" ref="sales_team.section_sales_department"/>
             <field name="object_id" search="[('model','=','crm.claim')]" model="ir.model"/> 
         </record>
     
@@ -30,12 +30,12 @@
         
         <record model="crm.case.resource.type" id="type_claim1">
             <field name="name">Corrective</field>
-            <field name="section_id" ref="sale_team.section_sales_department"/>
+            <field name="section_id" ref="sales_team.section_sales_department"/>
         </record>
         
         <record model="crm.case.resource.type" id="type_claim2">
             <field name="name">Preventive</field>
-            <field name="section_id" ref="sale_team.section_sales_department"/>
+            <field name="section_id" ref="sales_team.section_sales_department"/>
         </record>
     
         <!--
diff --git a/addons/crm_claim/crm_claim_demo.xml b/addons/crm_claim/crm_claim_demo.xml
index ec06d3f6577..ef318c97be5 100644
--- a/addons/crm_claim/crm_claim_demo.xml
+++ b/addons/crm_claim/crm_claim_demo.xml
@@ -12,7 +12,7 @@
             <field eval="&quot;1&quot;" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;Problem with the delivery of goods&quot;" name="name"/>
-            <field name="section_id" ref="sale_team.section_sales_department"/>
+            <field name="section_id" ref="sales_team.section_sales_department"/>
             <field name="categ_id" ref="crm_claim.categ_claim1"/>
             <field name="stage_id" ref="crm_claim.stage_claim1"/>
             <field eval="&quot;(769) 703-274&quot;" name="partner_phone"/>
@@ -24,7 +24,7 @@
             <field eval="&quot;0&quot;" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;Damaged Products&quot;" name="name"/>
-            <field name="section_id" ref="sale_team.section_sales_department"/>
+            <field name="section_id" ref="sales_team.section_sales_department"/>
             <field name="categ_id" ref="crm_claim.categ_claim2"/>
             <field name="stage_id" ref="crm_claim.stage_claim5"/>
             <field eval="&quot;(956) 293-2595&quot;" name="partner_phone"/>
@@ -36,7 +36,7 @@
             <field eval="&quot;2&quot;" name="priority"/>
             <field name="user_id" ref="base.user_demo"/>
             <field eval="&quot;Document related problems&quot;" name="name"/>
-            <field name="section_id" ref="sale_team.section_sales_department"/>
+            <field name="section_id" ref="sales_team.section_sales_department"/>
             <field name="categ_id" ref="crm_claim.categ_claim3"/>
             <field name="stage_id" ref="crm_claim.stage_claim2"/>
             <field eval="&quot;(079) 681-2139&quot;" name="partner_phone"/>
@@ -49,7 +49,7 @@
             <field eval="&quot;1&quot;" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;Product quality not maintained&quot;" name="name"/>
-            <field name="section_id" ref="sale_team.section_sales_department"/>
+            <field name="section_id" ref="sales_team.section_sales_department"/>
             <field name="categ_id" ref="crm_claim.categ_claim1"/>
             <field name="stage_id" ref="crm_claim.stage_claim5"/>
             <field eval="&quot;(514) 698-4118&quot;" name="partner_phone"/>
@@ -61,7 +61,7 @@
             <field eval="&quot;1&quot;" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;Some products missing&quot;" name="name"/>
-            <field name="section_id" ref="sale_team.section_sales_department"/>
+            <field name="section_id" ref="sales_team.section_sales_department"/>
             <field name="categ_id" ref="crm_claim.categ_claim3"/>
             <field name="stage_id" ref="crm_claim.stage_claim3"/>
             <field eval="&quot;(855) 924-4364&quot;" name="partner_phone"/>
@@ -72,7 +72,7 @@
             <field eval="&quot;1&quot;" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;Problem with the delivery of assignments&quot;" name="name"/>
-            <field name="section_id" ref="sale_team.section_sales_department"/>
+            <field name="section_id" ref="sales_team.section_sales_department"/>
             <field eval="time.strftime('%Y-%m-28 14:15:30')" name="date"/>
             <field name="categ_id" ref="crm_claim.categ_claim1"/>
             <field name="stage_id" ref="crm_claim.stage_claim5"/>
@@ -85,7 +85,7 @@
             <field eval="&quot;1&quot;" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;Documents unclear&quot;" name="name"/>
-            <field name="section_id" ref="sale_team.section_sales_department"/>
+            <field name="section_id" ref="sales_team.section_sales_department"/>
             <field eval="time.strftime('%Y-%m-19 13:01:05')" name="date"/>
             <field name="categ_id" ref="crm_claim.categ_claim3"/>
             <field name="stage_id" ref="crm_claim.stage_claim2"/>
diff --git a/addons/crm_helpdesk/crm_helpdesk_demo.xml b/addons/crm_helpdesk/crm_helpdesk_demo.xml
index eed8f73af1f..d0c9094aa63 100644
--- a/addons/crm_helpdesk/crm_helpdesk_demo.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_demo.xml
@@ -7,7 +7,7 @@
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">1</field>
             <field name="state">draft</field>
-            <field name="section_id" ref="sale_team.section_sales_department"/>
+            <field name="section_id" ref="sales_team.section_sales_department"/>
             <field name="date" eval="time.strftime('%Y-%m-04 11:10:36')"/>
             <field name="name">Download old version of OpenERP? </field>
             <field eval="&quot;Is there any link to download old versions of OpenERP?&quot;" name="description"/>
@@ -19,7 +19,7 @@
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">1</field>
             <field name="state">draft</field>
-            <field name="section_id" ref="sale_team.section_sales_department"/>
+            <field name="section_id" ref="sales_team.section_sales_department"/>
             <field name="date" eval="time.strftime('%Y-%m-12 11:12:09')"/>
             <field name="name">Can not able to connect to Server</field>
             <field eval="&quot;I am not able to connect Server, Can anyone help?&quot;" name="description"/>
@@ -31,7 +31,7 @@
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">2</field>
             <field name="state">draft</field>
-            <field name="section_id" ref="sale_team.section_sales_department"/>
+            <field name="section_id" ref="sales_team.section_sales_department"/>
             <field name="date" eval="time.strftime('%Y-%m-12 11:13:10')"/>
             <field name="name">Documentation for CRM?</field>
             <field eval="&quot;Can anyone give link of document for CRM&quot;" name="description"/>
diff --git a/addons/crm_partner_assign/crm_lead_demo.xml b/addons/crm_partner_assign/crm_lead_demo.xml
index 3338b392048..a6373ff2f8a 100644
--- a/addons/crm_partner_assign/crm_lead_demo.xml
+++ b/addons/crm_partner_assign/crm_lead_demo.xml
@@ -16,7 +16,7 @@
                   <field name="categ_ids" eval="[(6, 0, [ref('crm.categ_oppor1')])]"/>
                   <field name="channel_id" ref="crm.crm_case_channel_email"/>
                   <field name="priority">2</field>
-                  <field name="section_id" ref="sale_team.crm_case_section_2"/>
+                  <field name="section_id" ref="sales_team.crm_case_section_2"/>
                   <field name="user_id" ref=""/>
                   <field name="stage_id" ref="crm.stage_lead1"/>
                   <field name="description">Hi,
diff --git a/addons/project_issue/project_issue_demo.xml b/addons/project_issue/project_issue_demo.xml
index e19141aab59..7da36f1d4c6 100644
--- a/addons/project_issue/project_issue_demo.xml
+++ b/addons/project_issue/project_issue_demo.xml
@@ -38,7 +38,7 @@
             <field name="priority">0</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="partner_id" ref="base.res_partner_2"/>
-            <field name="section_id" ref="sale_team.section_sales_department"/>
+            <field name="section_id" ref="sales_team.section_sales_department"/>
             <field eval="1" name="active"/>
             <field name="project_id" ref="project.project_project_1"/>
             <field eval="15.0" name="duration"/>
@@ -54,7 +54,7 @@
             <field name="priority">1</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="partner_id" ref="base.res_partner_1"/>
-            <field name="section_id" ref="sale_team.section_sales_department"/>
+            <field name="section_id" ref="sales_team.section_sales_department"/>
             <field eval="1" name="active"/>
             <field eval="3.5" name="duration"/>
             <field name="name">Program not giving proper output</field>
@@ -66,7 +66,7 @@
             <field eval="time.strftime('%Y-%m-18 14:30:00')" name="date"/>
             <field name="priority">0</field>
             <field name="user_id" ref="base.user_demo"/>
-            <field name="section_id" ref="sale_team.section_sales_department"/>
+            <field name="section_id" ref="sales_team.section_sales_department"/>
             <field eval="1" name="active"/>
             <field eval="2.3" name="duration"/>
             <field name="project_id" ref="project.project_project_5"/>
@@ -82,7 +82,7 @@
             <field name="priority">1</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="partner_id" ref="base.res_partner_14"/>
-            <field name="section_id" ref="sale_team.section_sales_department"/>
+            <field name="section_id" ref="sales_team.section_sales_department"/>
             <field eval="1" name="active"/>
             <field eval="4.0" name="duration"/>
             <field name="project_id" ref="project.project_project_4"/>
@@ -95,7 +95,7 @@
             <field name="priority">1</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="partner_id" ref="base.res_partner_13"/>
-            <field name="section_id" ref="sale_team.section_sales_department"/>
+            <field name="section_id" ref="sales_team.section_sales_department"/>
             <field eval="1" name="active"/>
             <field eval="1.0" name="duration"/>
             <field name="project_id" ref="project.project_project_4"/>
@@ -108,7 +108,7 @@
             <field name="priority">1</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="partner_id" ref="base.res_partner_5"/>
-            <field name="section_id" ref="sale_team.section_sales_department"/>
+            <field name="section_id" ref="sales_team.section_sales_department"/>
             <field eval="1" name="active"/>
             <field eval="4.0" name="duration"/>
             <field name="project_id" ref="project.project_project_4"/>
@@ -124,7 +124,7 @@
             <field name="priority">2</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="partner_id" ref="base.res_partner_6"/>
-            <field name="section_id" ref="sale_team.section_sales_department"/>
+            <field name="section_id" ref="sales_team.section_sales_department"/>
             <field eval="1" name="active"/>
             <field eval="2.0" name="duration"/>
             <field name="project_id" ref="project.project_project_2"/>
@@ -137,7 +137,7 @@
             <field name="priority">2</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="partner_id" ref="base.res_partner_6"/>
-            <field name="section_id" ref="sale_team.section_sales_department"/>
+            <field name="section_id" ref="sales_team.section_sales_department"/>
             <field eval="1" name="active"/>
             <field eval="7.3" name="duration"/>
             <field name="project_id" ref="project.project_project_2"/>
@@ -162,7 +162,7 @@
             <field name="priority">2</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="partner_id" ref="base.res_partner_2"/>
-            <field name="section_id" ref="sale_team.section_sales_department"/>
+            <field name="section_id" ref="sales_team.section_sales_department"/>
             <field eval="1" name="active"/>
             <field eval="13.0" name="duration"/>
             <field name="project_id" ref="project.project_project_2"/>
@@ -175,7 +175,7 @@
             <field name="priority">0</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="partner_id" ref="base.res_partner_8"/>
-            <field name="section_id" ref="sale_team.section_sales_department"/>
+            <field name="section_id" ref="sales_team.section_sales_department"/>
             <field eval="1" name="active"/>
             <field eval="3.2" name="duration"/>
             <field name="project_id" ref="project.project_project_3"/>
@@ -188,7 +188,7 @@
             <field name="priority">1</field>
             <field name="user_id" ref="base.user_demo"/>
             <field name="partner_id" ref="base.res_partner_9"/>
-            <field name="section_id" ref="sale_team.section_sales_department"/>
+            <field name="section_id" ref="sales_team.section_sales_department"/>
             <field eval="1" name="active"/>
             <field eval="3.0" name="duration"/>
             <field name="project_id" ref="project.project_project_3"/>
@@ -202,7 +202,7 @@
             <field name="priority">1</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="partner_id" ref="base.res_partner_10"/>
-            <field name="section_id" ref="sale_team.section_sales_department"/>
+            <field name="section_id" ref="sales_team.section_sales_department"/>
             <field eval="1" name="active"/>
             <field eval="2.0" name="duration"/>
             <field name="project_id" ref="project.project_project_2"/>
@@ -216,7 +216,7 @@
             <field name="priority">1</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="partner_id" ref="base.res_partner_6"/>
-            <field name="section_id" ref="sale_team.section_sales_department"/>
+            <field name="section_id" ref="sales_team.section_sales_department"/>
             <field eval="1" name="active"/>
             <field eval="2.45" name="duration"/>
             <field name="project_id" ref="project.project_project_4"/>
@@ -229,7 +229,7 @@
             <field name="priority">0</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="partner_id" ref="base.res_partner_11"/>
-            <field name="section_id" ref="sale_team.section_sales_department"/>
+            <field name="section_id" ref="sales_team.section_sales_department"/>
             <field eval="1" name="active"/>
             <field eval="15.0" name="duration"/>
             <field name="project_id" ref="project.project_project_4"/>
@@ -242,7 +242,7 @@
             <field name="priority">2</field>
             <field name="user_id" ref="base.user_demo"/>
             <field name="partner_id" ref="base.res_partner_11"/>
-            <field name="section_id" ref="sale_team.section_sales_department"/>
+            <field name="section_id" ref="sales_team.section_sales_department"/>
             <field eval="1" name="active"/>
             <field eval="06.15" name="duration"/>
             <field name="project_id" ref="project.project_project_4"/>
diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py
index 96a3dde5075..52baff32ab7 100644
--- a/addons/sale/__openerp__.py
+++ b/addons/sale/__openerp__.py
@@ -59,7 +59,7 @@ The Dashboard for the Sales Manager will include
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'images': ['images/Sale_order_line_to_invoice.jpeg','images/sale_order.jpeg','images/sales_analysis.jpeg'],
-    'depends': ['sale_team','account_voucher', 'procurement', 'report'],
+    'depends': ['sales_team','account_voucher', 'procurement', 'report'],
     'data': [
         'wizard/sale_make_invoice_advance.xml',
         'wizard/sale_line_invoice.xml',
diff --git a/addons/sale/crm_case_section_view.xml b/addons/sale/crm_case_section_view.xml
index e4d36f23918..c577a67713f 100644
--- a/addons/sale/crm_case_section_view.xml
+++ b/addons/sale/crm_case_section_view.xml
@@ -4,7 +4,7 @@
         <record id="crm_case_section_salesteams_view_form" model="ir.ui.view">
             <field name="name">crm.case.section.form</field>
             <field name="model">crm.case.section</field>
-            <field name="inherit_id" ref="sale_team.crm_case_section_view_form"/>
+            <field name="inherit_id" ref="sales_team.crm_case_section_view_form"/>
             <field name="arch" type="xml">
             <data>
                 <xpath expr="//field[@name='code']" position="after">
@@ -18,7 +18,7 @@
         <record id="crm_case_section_salesteams_view_kanban" model="ir.ui.view">
             <field name="name">crm.case.section.kanban</field>
             <field name="model">crm.case.section</field>
-            <field name="inherit_id" ref="sale_team.crm_case_section_salesteams_view_kanban"/>
+            <field name="inherit_id" ref="sales_team.crm_case_section_salesteams_view_kanban"/>
             <field name="arch" type="xml">
             <data>
                 <xpath expr="//field[@name='name']" position="after">
diff --git a/addons/sale_crm/sale_crm_demo.xml b/addons/sale_crm/sale_crm_demo.xml
index 9af5ae7ebce..4af287b0587 100644
--- a/addons/sale_crm/sale_crm_demo.xml
+++ b/addons/sale_crm/sale_crm_demo.xml
@@ -2,12 +2,12 @@
 <openerp>
     <data>
 
-        <record model="crm.case.section" id="sale_team.section_sales_department">
+        <record model="crm.case.section" id="sales_team.section_sales_department">
             <field name="invoiced_forecast">52700</field>
             <field name="invoiced_target">60000</field>
         </record>
         
-        <record model="crm.case.section" id="sale_team.crm_case_section_1">
+        <record model="crm.case.section" id="sales_team.crm_case_section_1">
             <field name="name">Indirect Sales</field>
             <field name="code">IM</field>
             <field name="invoiced_forecast">36000</field>
@@ -21,7 +21,7 @@
             <field name="company_id" ref="base.main_company"/>
             <field name="partner_id" ref="base.res_partner_1"/>
             <field name="journal_id" ref="account.sales_journal"/>
-            <field name="section_id" ref="sale_team.section_sales_department"/>
+            <field name="section_id" ref="sales_team.section_sales_department"/>
             <field name="state">draft</field>
             <field name="type">in_invoice</field>
             <field name="account_id" ref="account.a_recv"/>
@@ -69,7 +69,7 @@
             <field name="company_id" ref="base.main_company"/>
             <field name="partner_id" ref="base.res_partner_1"/>
             <field name="journal_id" ref="account.sales_journal"/>
-            <field name="section_id" ref="sale_team.crm_case_section_1"/>
+            <field name="section_id" ref="sales_team.crm_case_section_1"/>
             <field name="state">draft</field>
             <field name="type">out_invoice</field>
             <field name="account_id" ref="account.a_recv"/>
@@ -98,32 +98,32 @@
 
 
         <record id="sale.sale_order_1" model="sale.order">
-            <field name="section_id" ref="sale_team.section_sales_department"/>
+            <field name="section_id" ref="sales_team.section_sales_department"/>
             <field name="date_order" eval="(DateTime.today() - relativedelta(months=1)).strftime('%Y-%m-%d %H:%M')"/>
         </record>
         <record id="sale.sale_order_2" model="sale.order">
-            <field name="section_id" ref="sale_team.section_sales_department"/>
+            <field name="section_id" ref="sales_team.section_sales_department"/>
             <field name="date_order" eval="(DateTime.today() - relativedelta(months=1)).strftime('%Y-%m-%d %H:%M')"/>
         </record>
         <record id="sale.sale_order_3" model="sale.order">
-            <field name="section_id" ref="sale_team.section_sales_department"/>
+            <field name="section_id" ref="sales_team.section_sales_department"/>
         </record>
         <record id="sale.sale_order_4" model="sale.order">
-            <field name="section_id" ref="sale_team.section_sales_department"/>
+            <field name="section_id" ref="sales_team.section_sales_department"/>
         </record>
         <record id="sale.sale_order_5" model="sale.order">
-            <field name="section_id" ref="sale_team.crm_case_section_1"/>
+            <field name="section_id" ref="sales_team.crm_case_section_1"/>
             <field name="date_order" eval="(DateTime.today() - relativedelta(months=1)).strftime('%Y-%m-%d %H:%M')"/>
         </record>
         <record id="sale.sale_order_6" model="sale.order">
-            <field name="section_id" ref="sale_team.crm_case_section_1"/>
+            <field name="section_id" ref="sales_team.crm_case_section_1"/>
         </record>
         <record id="sale.sale_order_7" model="sale.order">
-            <field name="section_id" ref="sale_team.section_sales_department"/>
+            <field name="section_id" ref="sales_team.section_sales_department"/>
             <field name="date_confirm" eval="(DateTime.today() - relativedelta(months=1)).strftime('%Y-%m-%d %H:%M')"/>
         </record>
         <record id="sale.sale_order_8" model="sale.order">
-            <field name="section_id" ref="sale_team.crm_case_section_1"/>
+            <field name="section_id" ref="sales_team.crm_case_section_1"/>
         </record>
 
     </data>
diff --git a/addons/sale_team/__init__.py b/addons/sales_team/__init__.py
similarity index 96%
rename from addons/sale_team/__init__.py
rename to addons/sales_team/__init__.py
index f13bb5e3771..075d782f564 100644
--- a/addons/sale_team/__init__.py
+++ b/addons/sales_team/__init__.py
@@ -18,7 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-import sale_team
-import sale_team_config
+import sales_team
+import sales_team_config
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale_team/__openerp__.py b/addons/sales_team/__openerp__.py
similarity index 88%
rename from addons/sale_team/__openerp__.py
rename to addons/sales_team/__openerp__.py
index ebca1e7100e..c9cb20cd401 100644
--- a/addons/sale_team/__openerp__.py
+++ b/addons/sales_team/__openerp__.py
@@ -30,13 +30,13 @@ Using this application you can manage Sales Team  with CRM and/or Sales
  """,
     'website': 'http://www.openerp.com',
     'depends': ['base','mail','web_kanban_sparkline',],
-    'data': ['security/sale_team_security.xml',
+    'data': ['security/sales_team_security.xml',
              'security/ir.model.access.csv',
              'res_config_view.xml',
-             'sale_team_data.xml',
-             'sale_team.xml',],
-    'demo': ['sale_team_demo.xml'],
-    'css': ['static/src/css/sale_team.css'],
+             'sales_team_data.xml',
+             'sales_team.xml',],
+    'demo': ['sales_team_demo.xml'],
+    'css': ['static/src/css/sales_team.css'],
     'installable': True,
     'auto_install': True,
 }
diff --git a/addons/sale_team/res_config_view.xml b/addons/sales_team/res_config_view.xml
similarity index 100%
rename from addons/sale_team/res_config_view.xml
rename to addons/sales_team/res_config_view.xml
diff --git a/addons/sale_team/sale_team.py b/addons/sales_team/sales_team.py
similarity index 100%
rename from addons/sale_team/sale_team.py
rename to addons/sales_team/sales_team.py
diff --git a/addons/sale_team/sale_team.xml b/addons/sales_team/sales_team.xml
similarity index 98%
rename from addons/sale_team/sale_team.xml
rename to addons/sales_team/sales_team.xml
index 56d709efce5..5913565c98b 100644
--- a/addons/sale_team/sale_team.xml
+++ b/addons/sales_team/sales_team.xml
@@ -195,6 +195,6 @@
                 </p>
             </field>
         </record>
-    <menuitem id="sale_team.menu_sale_team_act" action="crm_case_section_salesteams_act" sequence="1" parent="base.menu_sales" groups="base.group_multi_salesteams"/>
+    <menuitem id="sales_team.menu_sales_team_act" action="crm_case_section_salesteams_act" sequence="1" parent="base.menu_sales" groups="base.group_multi_salesteams"/>
     </data>
 </openerp>
diff --git a/addons/sale_team/sale_team_config.py b/addons/sales_team/sales_team_config.py
similarity index 98%
rename from addons/sale_team/sale_team_config.py
rename to addons/sales_team/sales_team_config.py
index 0c36ac31084..1e2a193acf7 100644
--- a/addons/sale_team/sale_team_config.py
+++ b/addons/sales_team/sales_team_config.py
@@ -22,7 +22,7 @@
 from openerp.osv import fields, osv
 
 
-class sale_team_configuration(osv.TransientModel):
+class sales_team_configuration(osv.TransientModel):
     _name = 'sale.config.settings'
     _inherit = ['sale.config.settings', 'fetchmail.config.settings']
 
diff --git a/addons/sale_team/sale_team_data.xml b/addons/sales_team/sales_team_data.xml
similarity index 100%
rename from addons/sale_team/sale_team_data.xml
rename to addons/sales_team/sales_team_data.xml
diff --git a/addons/sale_team/sale_team_demo.xml b/addons/sales_team/sales_team_demo.xml
similarity index 100%
rename from addons/sale_team/sale_team_demo.xml
rename to addons/sales_team/sales_team_demo.xml
diff --git a/addons/sale_team/security/ir.model.access.csv b/addons/sales_team/security/ir.model.access.csv
similarity index 100%
rename from addons/sale_team/security/ir.model.access.csv
rename to addons/sales_team/security/ir.model.access.csv
diff --git a/addons/sale_team/security/sale_team_security.xml b/addons/sales_team/security/sales_team_security.xml
similarity index 100%
rename from addons/sale_team/security/sale_team_security.xml
rename to addons/sales_team/security/sales_team_security.xml
diff --git a/addons/sale_team/static/src/css/sale_team.css b/addons/sales_team/static/src/css/sales_team.css
similarity index 100%
rename from addons/sale_team/static/src/css/sale_team.css
rename to addons/sales_team/static/src/css/sales_team.css

From 55ac64258f7aa8fa0f96475eac1f42343250cd7d Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 12 May 2014 10:50:41 +0200
Subject: [PATCH 078/225] [FIX] gamification: correct name of ir.rule fixing
 bad copy-paste

bzr revid: mat@openerp.com-20140512085041-b0euexzgxgvb30oe
---
 addons/gamification/security/gamification_security.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/gamification/security/gamification_security.xml b/addons/gamification/security/gamification_security.xml
index 5339b400061..4e73c223a22 100644
--- a/addons/gamification/security/gamification_security.xml
+++ b/addons/gamification/security/gamification_security.xml
@@ -40,7 +40,7 @@
         </record>
 
         <record id="goal_global_multicompany" model="ir.rule">
-            <field name="name">User can only see his/her goals or goal from the same challenge in board visibility</field>
+            <field name="name">Multicompany rule on challenges</field>
             <field name="model_id" ref="model_gamification_goal"/>
             <field name="domain_force">[('user_id.company_id', 'child_of', [user.company_id.id])]</field>
             <field name="global" eval="True"/>

From 9199587ec99929777cd41270693e8e84a844fc80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 12 May 2014 13:41:49 +0200
Subject: [PATCH 079/225] [CLEAN] crm: cleaned crm module before merging : -
 removed unnecessary changes - rewrote on_change_user and
 get_default_sectoin_id to have a correct default section - removed duplicated
 code in sales_team module due to code moving not correctly cleaned

---
 addons/crm/__init__.py                        |  2 +-
 addons/crm/crm_case_section_view.xml          | 79 ++++++++-----------
 addons/crm/crm_lead.py                        | 11 ++-
 addons/crm/crm_lead_demo.xml                  |  6 +-
 addons/crm/crm_lead_view.xml                  |  2 +-
 addons/crm/res_config.py                      | 30 -------
 .../{crm_case_section.py => sales_team.py}    |  1 -
 addons/sales_team/__init__.py                 |  2 +-
 .../{sales_team_config.py => res_config.py}   | 30 +------
 .../security/sales_team_security.xml          | 40 +---------
 10 files changed, 50 insertions(+), 153 deletions(-)
 rename addons/crm/{crm_case_section.py => sales_team.py} (99%)
 rename addons/sales_team/{sales_team_config.py => res_config.py} (59%)

diff --git a/addons/crm/__init__.py b/addons/crm/__init__.py
index aac80a22695..872d0390303 100644
--- a/addons/crm/__init__.py
+++ b/addons/crm/__init__.py
@@ -22,7 +22,7 @@
 import crm
 import crm_segmentation
 import crm_lead
-import crm_case_section
+import sales_team
 import calendar_event
 import crm_phonecall
 import report
diff --git a/addons/crm/crm_case_section_view.xml b/addons/crm/crm_case_section_view.xml
index cc6aba3c408..8be2d888fb6 100644
--- a/addons/crm/crm_case_section_view.xml
+++ b/addons/crm/crm_case_section_view.xml
@@ -79,7 +79,6 @@
             <field name="help">Opportunities Analysis gives you an instant access to your opportunities with information such as the expected revenue, planned cost, missed deadlines or the number of interactions per opportunity. This report is mainly used by the sales manager in order to do the periodic review with the teams of the sales pipeline.</field>
         </record>
 
-        <!-- Case Sections Salesteams kanban view -->
         <record model="ir.ui.view" id="crm_case_section_salesteams_view_kanban">
             <field name="name">crm.case.section.kanban</field>
             <field name="model">crm.case.section</field>
@@ -94,15 +93,6 @@
                             <small><span class="oe_e oe_e_alias" style="float: none;">%%</span><t t-raw="record.alias_id.raw_value[1]"/></small>
                         </div>
                     </xpath>
-                </data>
-            </field>
-        </record>
-        <record model="ir.ui.view" id="crm_case_section_salesteams_view_kanban">
-            <field name="name">crm.case.section.kanban</field>
-            <field name="model">crm.case.section</field>
-            <field name="inherit_id" ref="sales_team.crm_case_section_salesteams_view_kanban"/>
-            <field name="arch" type="xml">
-                <data>
                     <xpath expr="//field[@name='name']" position="after">
                         <field name="use_leads"/>
                         <field name="monthly_open_leads"/>
@@ -130,8 +120,41 @@
             </field>
         </record>
 
-        <!-- Case Sections Action -->
+        <record model="ir.ui.view" id="sales_team_form_view_in_crm">
+                <field name="name">crm.case.section.form</field>
+                <field name="model">crm.case.section</field>
+                <field name="inherit_id" ref="sales_team.crm_case_section_view_form"/>
+                <field name="arch" type="xml">
+                    <xpath expr="//field[@name='name']" position="after">
+                        <h6><field name="use_leads"/><label for="use_leads" string="Leads"/></h6>
+                    </xpath>
+                    <xpath expr="//group/field[@name='active']" position="inside">
+                        <group>
+                            <label for="alias_name" string="Email Alias"
+                                    attrs="p'invisible': [('alias_domain', '=', False)]}"/>
+                            <div name="alias_def"
+                                    attrs="{'invisible': [('alias_domain', '=', False)]}">
+                                <field name="alias_id" class="oe_read_only oe_inline"
+                                        string="Email Alias" required="0"/>
+                                <div class="oe_edit_only oe_inline" name="edit_alias" style="display: inline;" >
+                                    <field name="alias_name" class="oe_inline"/>@<field name="alias_domain" class="oe_inline" readonly="1"/>
+                                </div>
+                            </div>
+                            <field name="alias_contact" class="oe_inline"
+                                    string="Accept Emails From"
+                                    attrs="{'invisible': [('alias_domain', '=', False)]}"/>
+                        </group>
+                    </xpath>
+                    <xpath expr="//page[@string='Team Members']" position="after">
+                        <page string="Stages">
+                            <separator string="Select Stages for this Sales Team"/>
+                                <field name="stage_ids"/>
+                        </page>
+                   </xpath>
+                </field>
+            </record>
 
+        <!-- Case Sections Action -->
         <record model="ir.actions.act_window.view" id="action_crm_tag_kanban_view_salesteams_oppor11">
             <field name="sequence" eval="0"/>
             <field name="view_mode">kanban</field>
@@ -160,39 +183,5 @@
             <field name="view_type">tree</field>
             <field name="view_id" ref="sales_team.crm_case_section_view_tree"/>
         </record>
-
-    <record model="ir.ui.view" id="sales_team_form_view_in_crm">
-            <field name="name">crm.case.section.form</field>
-            <field name="model">crm.case.section</field>
-            <field name="inherit_id" ref="sales_team.crm_case_section_view_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="//field[@name='name']" position="after">
-                    <h6><field name="use_leads"/><label for="use_leads" string="Leads"/></h6>
-                </xpath>
-                <xpath expr="//group/field[@name='active']" position="inside">
-                    <group>
-                        <label for="alias_name" string="Email Alias"
-                                attrs="p'invisible': [('alias_domain', '=', False)]}"/>
-                        <div name="alias_def"
-                                attrs="{'invisible': [('alias_domain', '=', False)]}">
-                            <field name="alias_id" class="oe_read_only oe_inline"
-                                    string="Email Alias" required="0"/>
-                            <div class="oe_edit_only oe_inline" name="edit_alias" style="display: inline;" >
-                                <field name="alias_name" class="oe_inline"/>@<field name="alias_domain" class="oe_inline" readonly="1"/>
-                            </div>
-                        </div>
-                        <field name="alias_contact" class="oe_inline"
-                                string="Accept Emails From"
-                                attrs="{'invisible': [('alias_domain', '=', False)]}"/>
-                    </group>
-                </xpath>
-                <xpath expr="//page[@string='Team Members']" position="after">
-                    <page string="Stages">
-                        <separator string="Select Stages for this Sales Team"/>
-                            <field name="stage_ids"/>
-                    </page>
-               </xpath>
-            </field>
-        </record>
   </data>
 </openerp>
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 6be094c2227..7f5ae17dc33 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -90,7 +90,10 @@ class crm_lead(format_address, osv.osv):
 
     def _get_default_section_id(self, cr, uid, context=None):
         """ Gives default section by checking if present in the context """
-        return self._resolve_section_id_from_context(cr, uid, context=context) or False
+        section_id = self._resolve_section_id_from_context(cr, uid, context=context) or False
+        if not section_id:
+            section_id = self.pool.get('res.users').browse(cr, uid, uid, context).default_section_id.id or False
+        return section_id
 
     def _get_default_stage_id(self, cr, uid, context=None):
         """ Gives default stage_id """
@@ -352,12 +355,8 @@ class crm_lead(format_address, osv.osv):
             section_ids = self.pool.get('crm.case.section').search(cr, uid, ['|', ('user_id', '=', user_id), ('member_ids', '=', user_id)], context=context)
             if section_ids:
                 section_id = section_ids[0]
-        else:
-            user = self.pool.get('res.users').browse(cr, uid, user_id, context=context)
-            if user.default_section_id and user.default_section_id.id:
-                return {'value': {'section_id': user.default_section_id.id}}
         return {'value': {'section_id': section_id}}
-    
+
     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:
diff --git a/addons/crm/crm_lead_demo.xml b/addons/crm/crm_lead_demo.xml
index ef105d3989e..8acefd5c610 100644
--- a/addons/crm/crm_lead_demo.xml
+++ b/addons/crm/crm_lead_demo.xml
@@ -54,7 +54,7 @@ Could you please send me the details ?</field>
             <field name="type_id" ref="type_lead7"/>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor2])]"/>
             <field name="channel_id" ref="crm_case_channel_website"/>
-            <field name="priority">4</field>
+            <field name="priority">1</field>
             <field name="section_id" ref="sales_team.section_sales_department"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="stage_lead1"/>
@@ -104,7 +104,7 @@ Could you please send me the details ?</field>
             <field name="type_id" ref="type_lead8"/>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor5])]"/>
             <field name="channel_id" ref=""/>
-            <field name="priority">3</field>
+            <field name="priority">2</field>
             <field name="section_id" ref="sales_team.crm_case_section_2"/>
             <field name="user_id" ref="base.user_demo"/>
             <field name="stage_id" ref="stage_lead6"/>
@@ -129,7 +129,7 @@ Could you please send me the details ?</field>
             <field name="type_id" ref="type_lead3"/>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor1])]"/>
             <field name="channel_id" ref="crm_case_channel_website"/>
-            <field name="priority">3</field>
+            <field name="priority">2</field>
             <field name="section_id" ref="sales_team.crm_case_section_1"/>
             <field name="user_id" ref=""/>
             <field name="stage_id" ref="stage_lead1"/>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 3481e29baf5..995a1ddea43 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-      <!-- TODO: Apply group for the sales team where you find section_id fields in any view
+        <!--
             CRM CASE STAGE
         -->
         <!-- Stage Search view -->
diff --git a/addons/crm/res_config.py b/addons/crm/res_config.py
index 1cd31cd0dd0..d48e66e286c 100644
--- a/addons/crm/res_config.py
+++ b/addons/crm/res_config.py
@@ -27,33 +27,6 @@ class crm_configuration(osv.TransientModel):
     _name = 'sale.config.settings'
     _inherit = ['sale.config.settings', 'fetchmail.config.settings']
 
-    def set_group_multi_salesteams(self, cr, uid, ids, context=None):
-        """ This method is automatically called by res_config as it begins
-            with set. It is used to implement the 'one group or another'
-            behavior. We have to perform some group manipulation by hand
-            because in res_config.execute(), set_* methods are called
-            after group_*; therefore writing on an hidden res_config file
-            could not work.
-            If group_multi_salesteams is checked: remove group_mono_salesteams
-            from group_user, remove the users. Otherwise, just add
-            group_mono_salesteams in group_user.
-            The inverse logic about group_multi_salesteams is managed by the
-            normal behavior of 'group_multi_salesteams' field.
-        """
-        def ref(xml_id):
-            mod, xml = xml_id.split('.', 1)
-            return self.pool['ir.model.data'].get_object(cr, uid, mod, xml, context)
-
-        for obj in self.browse(cr, uid, ids, context=context):
-            config_group = ref('base.group_mono_salesteams')
-            base_group = ref('base.group_user')
-            if obj.group_multi_salesteams:
-                base_group.write({'implied_ids': [(3, config_group.id)]})
-                config_group.write({'users': [(3, u.id) for u in base_group.users]})
-            else:
-                base_group.write({'implied_ids': [(4, config_group.id)]})
-        return True
-
     _columns = {
         'group_fund_raising': fields.boolean("Manage Fund Raising",
             implied_group='crm.group_fund_raising',
@@ -64,9 +37,6 @@ class crm_configuration(osv.TransientModel):
         'module_crm_helpdesk': fields.boolean("Manage Helpdesk and Support",
             help='Allows you to communicate with Customer, process Customer query, and provide better help and support.\n'
                  '-This installs the module crm_helpdesk.'),
-        'group_multi_salesteams': fields.boolean("Organize Sales activities into multiple Sales Teams",
-            implied_group='base.group_multi_salesteams',
-            help="""Allows you to use Sales Teams to manage your leads and opportunities."""),
         'alias_prefix': fields.char('Default Alias Name for Leads'),
         'alias_domain' : fields.char('Alias Domain'),
         'group_scheduled_calls': fields.boolean("Schedule calls to manage call center",
diff --git a/addons/crm/crm_case_section.py b/addons/crm/sales_team.py
similarity index 99%
rename from addons/crm/crm_case_section.py
rename to addons/crm/sales_team.py
index 7a8baca5a44..ac626563f36 100644
--- a/addons/crm/crm_case_section.py
+++ b/addons/crm/sales_team.py
@@ -78,4 +78,3 @@ class crm_case_section(osv.Model):
         res = super(crm_case_section, self).unlink(cr, uid, ids, context=context)
         mail_alias.unlink(cr, uid, alias_ids, context=context)
         return res
-
diff --git a/addons/sales_team/__init__.py b/addons/sales_team/__init__.py
index 075d782f564..3b2a8f41267 100644
--- a/addons/sales_team/__init__.py
+++ b/addons/sales_team/__init__.py
@@ -19,6 +19,6 @@
 #
 ##############################################################################
 import sales_team
-import sales_team_config
+import res_config
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sales_team/sales_team_config.py b/addons/sales_team/res_config.py
similarity index 59%
rename from addons/sales_team/sales_team_config.py
rename to addons/sales_team/res_config.py
index 1e2a193acf7..3081a2e918d 100644
--- a/addons/sales_team/sales_team_config.py
+++ b/addons/sales_team/res_config.py
@@ -1,30 +1,11 @@
 # -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-today OpenERP SA (<http://www.openerp.com>)
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
 
 from openerp.osv import fields, osv
 
 
 class sales_team_configuration(osv.TransientModel):
     _name = 'sale.config.settings'
-    _inherit = ['sale.config.settings', 'fetchmail.config.settings']
+    _inherit = ['sale.config.settings']
 
     def set_group_multi_salesteams(self, cr, uid, ids, context=None):
         """ This method is automatically called by res_config as it begins
@@ -58,12 +39,3 @@ class sales_team_configuration(osv.TransientModel):
             implied_group='base.group_multi_salesteams',
             help="""Allows you to use Sales Teams to manage your leads and opportunities."""),
     }
-
-    def _get_group_multi_salesteams(self, cr, uid, ids, context=None):
-        pass
-        # Todo: return the current state for the group_multi_salesteams field
-
-    _defaults = {
-        'group_multi_salesteams': _get_group_multi_salesteams
-    }
-
diff --git a/addons/sales_team/security/sales_team_security.xml b/addons/sales_team/security/sales_team_security.xml
index fe999715a7a..d9002f8332f 100644
--- a/addons/sales_team/security/sales_team_security.xml
+++ b/addons/sales_team/security/sales_team_security.xml
@@ -1,49 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="0">
-
-        <record id="base.group_sale_salesman" model="res.groups">
-            <field name="name">User: Own Leads Only</field>
-            <field name="category_id" ref="base.module_category_sales_management"/>
-            <field name="implied_ids" eval="[(4, ref('base.group_user'))]"/>
-            <field name="comment">the user will have access to his own data in the sales application.</field>
-        </record>
-    
-        <record id="base.group_sale_salesman_all_leads" model="res.groups">
-            <field name="name">User: All Leads</field>
-            <field name="category_id" ref="base.module_category_sales_management"/>
-            <field name="implied_ids" eval="[(4, ref('base.group_sale_salesman'))]"/>
-            <field name="comment">the user will have access to all records of everyone in the sales application.</field>
-        </record>
-    
-        <record id="base.group_sale_manager" model="res.groups">
-            <field name="name">Manager</field>
-            <field name="comment">the user will have an access to the sales configuration as well as statistic reports.</field>
-            <field name="category_id" ref="base.module_category_sales_management"/>
-            <field name="implied_ids" eval="[(4, ref('base.group_sale_salesman_all_leads'))]"/>
-            <field name="users" eval="[(4, ref('base.user_root'))]"/>
-        </record>
-        
         <record id="base.group_mono_salesteams" model="res.groups">
             <field name="name">Do Not Use Sales Teams</field>
             <field name="category_id" ref="base.module_category_hidden"/>
         </record>
-        
+        <record id="base.group_user" model="res.groups">
+            <field name="implied_ids" eval="[(4, ref('base.group_mono_salesteams'))]"/>
+        </record>
+
         <record id="base.group_multi_salesteams" model="res.groups">
             <field name="name">Manage Sales Teams</field>
             <field name="category_id" ref="base.module_category_hidden"/>
         </record>
-        
-        <record model="res.users" id="base.user_root">
-            <field eval="[(4,ref('base.group_partner_manager'))]" name="groups_id"/>
-        </record>
-    
-        <record model='ir.ui.menu' id='base.menu_base_partner'>
-            <field name="groups_id" eval="[(4,ref('base.group_sale_manager')),(4,ref('base.group_sale_salesman'))]"/>
-        </record>
-    
-        <record model="ir.ui.menu" id="base.menu_base_config">
-            <field eval="[(4, ref('base.group_sale_manager'))]" name="groups_id"/>
-        </record>
     </data>
 </openerp>

From 3406b6db397506c3fedb974f0fe470e2d99b9a92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 12 May 2014 14:56:01 +0200
Subject: [PATCH 080/225] [CLEAN] sale, sale_crm: cleaning before merging.
 Cleaned calculation of default section id + removed duplicated code.

---
 addons/crm/__openerp__.py                     |  2 +-
 ...e_section_view.xml => sales_team_view.xml} |  0
 .../sale_crm_goals_demo.xml                   |  2 +-
 addons/sale/__init__.py                       |  8 +--
 addons/sale/__openerp__.py                    |  2 +-
 addons/sale/sale.py                           | 63 ++++++++++++++-----
 .../{crm_case_section.py => sales_team.py}    | 30 +--------
 ...e_section_view.xml => sales_team_view.xml} |  0
 addons/sale_crm/sale_crm.py                   |  1 -
 9 files changed, 56 insertions(+), 52 deletions(-)
 rename addons/crm/{crm_case_section_view.xml => sales_team_view.xml} (100%)
 rename addons/sale/{crm_case_section.py => sales_team.py} (74%)
 rename addons/sale/{crm_case_section_view.xml => sales_team_view.xml} (100%)

diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index ecdefb9e051..1bf4c611be6 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -91,7 +91,7 @@ Dashboard for CRM will include:
         'res_config_view.xml',
         'base_partner_merge_view.xml',
 
-        'crm_case_section_view.xml',
+        'sales_team_view.xml',
         'views/crm.xml',
     ],
     'demo': [
diff --git a/addons/crm/crm_case_section_view.xml b/addons/crm/sales_team_view.xml
similarity index 100%
rename from addons/crm/crm_case_section_view.xml
rename to addons/crm/sales_team_view.xml
diff --git a/addons/gamification_sale_crm/sale_crm_goals_demo.xml b/addons/gamification_sale_crm/sale_crm_goals_demo.xml
index a4720b1e566..b149af31f48 100644
--- a/addons/gamification_sale_crm/sale_crm_goals_demo.xml
+++ b/addons/gamification_sale_crm/sale_crm_goals_demo.xml
@@ -6,6 +6,6 @@
         <record model="gamification.challenge" id="challenge_crm_sale">
             <field name="state">inprogress</field>
         </record>
-
+        
     </data>
 </openerp>
diff --git a/addons/sale/__init__.py b/addons/sale/__init__.py
index 509364643ae..c99fc936467 100644
--- a/addons/sale/__init__.py
+++ b/addons/sale/__init__.py
@@ -19,16 +19,10 @@
 #
 ##############################################################################
 
-#----------------------------------------------------------
-# Init Sales
-#----------------------------------------------------------
-
 import sale
-import crm_case_section
+import sales_team
 import res_partner
 import wizard
 import report
 import edi
 import res_config
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py
index 52baff32ab7..039e765cd71 100644
--- a/addons/sale/__openerp__.py
+++ b/addons/sale/__openerp__.py
@@ -71,7 +71,7 @@ The Dashboard for the Sales Manager will include
         'sale_report.xml',
         'sale_data.xml',
         'sale_view.xml',
-        'crm_case_section_view.xml',
+        'sales_team_view.xml',
         'res_partner_view.xml',
         'report/sale_report_view.xml',
         'edi/sale_order_action_data.xml',
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 34886a22991..e3b59c00015 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -19,11 +19,7 @@
 #
 ##############################################################################
 
-import calendar
-from openerp import tools
-from datetime import date, datetime, timedelta
-from dateutil.relativedelta import relativedelta
-from dateutil import relativedelta
+from datetime import datetime, timedelta
 import time
 from openerp.osv import fields, osv
 from openerp.tools.translate import _
@@ -166,12 +162,29 @@ class sale_order(osv.osv):
         if not company_id:
             raise osv.except_osv(_('Error!'), _('There is no default company for the current user!'))
         return company_id
-    
+
     def _get_default_section_id(self, cr, uid, context=None):
         """ Gives default section by checking if present in the context """
-        section_id = self.pool.get('res.users').browse(cr, uid, uid, context).default_section_id.id or False
+        section_id = self._resolve_section_id_from_context(cr, uid, context=context) or False
+        if not section_id:
+            section_id = self.pool.get('res.users').browse(cr, uid, uid, context).default_section_id.id or False
         return section_id
 
+    def _resolve_section_id_from_context(self, cr, uid, context=None):
+        """ Returns ID of section based on the value of 'section_id'
+            context key, or None if it cannot be resolved to a single
+            Sales Team.
+        """
+        if context is None:
+            context = {}
+        if type(context.get('default_section_id')) in (int, long):
+            return context.get('default_section_id')
+        if isinstance(context.get('default_section_id'), basestring):
+            section_ids = self.pool.get('crm.case.section').name_search(cr, uid, name=context['default_section_id'], context=context)
+            if len(section_ids) == 1:
+                return int(section_ids[0][0])
+        return None
+
     _columns = {
         'name': fields.char('Order Reference', size=64, required=True,
             readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, select=True),
@@ -252,7 +265,6 @@ class sale_order(osv.osv):
         'partner_shipping_id': lambda self, cr, uid, context: context.get('partner_id', False) and self.pool.get('res.partner').address_get(cr, uid, [context['partner_id']], ['delivery'])['delivery'],
         'note': lambda self, cr, uid, context: self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.sale_note,
         'section_id': lambda s, cr, uid, c: s._get_default_section_id(cr, uid, c),
-        
     }
     _sql_constraints = [
         ('name_uniq', 'unique(name, company_id)', 'Order Reference must be unique per Company!'),
@@ -1199,13 +1211,40 @@ class mail_compose_message(osv.Model):
             self.pool.get('sale.order').signal_quotation_sent(cr, uid, [context['default_res_id']])
         return super(mail_compose_message, self).send_mail(cr, uid, ids, context=context)
 
+
 class account_invoice(osv.Model):
     _inherit = 'account.invoice'
-    
+
+    def _get_default_section_id(self, cr, uid, context=None):
+        """ Gives default section by checking if present in the context """
+        section_id = self._resolve_section_id_from_context(cr, uid, context=context) or False
+        if not section_id:
+            section_id = self.pool.get('res.users').browse(cr, uid, uid, context).default_section_id.id or False
+        return section_id
+
+    def _resolve_section_id_from_context(self, cr, uid, context=None):
+        """ Returns ID of section based on the value of 'section_id'
+            context key, or None if it cannot be resolved to a single
+            Sales Team.
+        """
+        if context is None:
+            context = {}
+        if type(context.get('default_section_id')) in (int, long):
+            return context.get('default_section_id')
+        if isinstance(context.get('default_section_id'), basestring):
+            section_ids = self.pool.get('crm.case.section').name_search(cr, uid, name=context['default_section_id'], context=context)
+            if len(section_ids) == 1:
+                return int(section_ids[0][0])
+        return None
+
     _columns = {
         'section_id': fields.many2one('crm.case.section', 'Sales Team'),
     }
-    
+
+    _defaults = {
+        'section_id': lambda self, cr, uid, c=None: self._get_default_section_id(cr, uid, context=c)
+    }
+
     def confirm_paid(self, cr, uid, ids, context=None):
         sale_order_obj = self.pool.get('sale.order')
         res = super(account_invoice, self).confirm_paid(cr, uid, ids, context=context)
@@ -1224,10 +1263,6 @@ class account_invoice(osv.Model):
             for id in ids:
                 workflow.trg_validate(uid, 'account.invoice', id, 'invoice_cancel', cr)
         return super(account_invoice, self).unlink(cr, uid, ids, context=context)
-        
-    _defaults = {
-       'section_id': lambda self, cr, uid, c=None: self.pool.get('res.users').browse(cr, uid, uid, c).default_section_id.id or False,
-    }
 
 
 class procurement_order(osv.osv):
diff --git a/addons/sale/crm_case_section.py b/addons/sale/sales_team.py
similarity index 74%
rename from addons/sale/crm_case_section.py
rename to addons/sale/sales_team.py
index 11c8cdc8bb4..e8161d7325c 100644
--- a/addons/sale/crm_case_section.py
+++ b/addons/sale/sales_team.py
@@ -1,35 +1,11 @@
 # -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
 
 import calendar
-from openerp import tools
-from datetime import date, datetime, timedelta
+from datetime import date
 from dateutil.relativedelta import relativedelta
-from dateutil import relativedelta
-import time
+
+from openerp import tools
 from openerp.osv import fields, osv
-from openerp.tools.translate import _
-from openerp.tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT, DATETIME_FORMATS_MAP, float_compare
-import openerp.addons.decimal_precision as dp
-from openerp import workflow
 
 
 class crm_case_section(osv.osv):
diff --git a/addons/sale/crm_case_section_view.xml b/addons/sale/sales_team_view.xml
similarity index 100%
rename from addons/sale/crm_case_section_view.xml
rename to addons/sale/sales_team_view.xml
diff --git a/addons/sale_crm/sale_crm.py b/addons/sale_crm/sale_crm.py
index 1b91ef4ef49..92c0abf2df0 100644
--- a/addons/sale_crm/sale_crm.py
+++ b/addons/sale_crm/sale_crm.py
@@ -29,7 +29,6 @@ from openerp.osv import osv, fields
 class sale_order(osv.osv):
     _inherit = 'sale.order'
     _columns = {
-        'section_id': fields.many2one('crm.case.section', 'Sales Team'),
         'categ_ids': fields.many2many('crm.case.categ', 'sale_order_category_rel', 'order_id', 'category_id', 'Tags', \
             domain="['|', ('section_id', '=', section_id), ('section_id', '=', False), ('object_id.model', '=', 'crm.lead')]", context="{'object_name': 'crm.lead'}")
     }

From fc7a31f84282db827b50b3e40f4d5d0f15c818dd Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 12 May 2014 14:56:30 +0200
Subject: [PATCH 081/225] [FIX] ir_ui_view: remove undetermist order on search
 for views as the _order on the model is more specific (opw 607262)

This was problematic on some views where two views with the same priority could be chosen depending on the server, postgresql version and the age of the captain
---
 openerp/addons/base/ir/ir_ui_view.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/ir/ir_ui_view.py b/openerp/addons/base/ir/ir_ui_view.py
index 9bc9ad36b1d..3bbb87eefea 100644
--- a/openerp/addons/base/ir/ir_ui_view.py
+++ b/openerp/addons/base/ir/ir_ui_view.py
@@ -236,7 +236,7 @@ class view(osv.osv):
             ['type', '=', view_type],
             ['inherit_id', '=', False],
         ]
-        ids = self.search(cr, uid, domain, limit=1, order='priority', context=context)
+        ids = self.search(cr, uid, domain, limit=1, context=context)
         if not ids:
             return False
         return ids[0]

From e53cadcf2a16d5bad3c04b56a2e9f7016c00bdd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 12 May 2014 15:47:12 +0200
Subject: [PATCH 082/225] [FIX] sale: fixed import error about relativedelta

---
 addons/sale/sales_team.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale/sales_team.py b/addons/sale/sales_team.py
index e8161d7325c..10acac1dddc 100644
--- a/addons/sale/sales_team.py
+++ b/addons/sale/sales_team.py
@@ -2,7 +2,7 @@
 
 import calendar
 from datetime import date
-from dateutil.relativedelta import relativedelta
+from dateutil import relativedelta
 
 from openerp import tools
 from openerp.osv import fields, osv

From 03ee7ed00d15132377ed5586872dc4e3e28b25ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 12 May 2014 15:58:25 +0200
Subject: [PATCH 083/225] [FIX] sales_team: indentation issue

---
 addons/sales_team/sales_team.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sales_team/sales_team.py b/addons/sales_team/sales_team.py
index b356fa55900..ed3a3876231 100644
--- a/addons/sales_team/sales_team.py
+++ b/addons/sales_team/sales_team.py
@@ -78,7 +78,7 @@ class crm_case_section(osv.osv):
         'note': fields.text('Description'),
         'working_hours': fields.float('Working Hours', digits=(16, 2)),
         'color': fields.integer('Color Index'),
-           }
+    }
 
     _defaults = {
         'active': 1,

From 3af0824fa585217853b297d2fd88df5a99b3375d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 12 May 2014 15:58:39 +0200
Subject: [PATCH 084/225] [FIX] crm: typo

---
 addons/crm/sales_team.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/sales_team.py b/addons/crm/sales_team.py
index ac626563f36..aeaf2cd8ec6 100644
--- a/addons/crm/sales_team.py
+++ b/addons/crm/sales_team.py
@@ -45,7 +45,7 @@ class crm_case_section(osv.Model):
         'monthly_planned_revenue': fields.function(_get_opportunities_data,
             type="string", readonly=True, multi='_get_opportunities_data',
             string='Planned Revenue per Month'),
-        'alias_id': fields.many2one('mail.alias', 'Alias', ondelete="restrict", required=True, help="The email address associated with this team. New emails received will automatically ""create new leads assigned to the team."),
+        'alias_id': fields.many2one('mail.alias', 'Alias', ondelete="restrict", required=True, help="The email address associated with this team. New emails received will automatically create new leads assigned to the team."),
     }
 
     def _auto_init(self, cr, context=None):

From 1101c618a5113623dcb40190935c0b5f0b3cbc0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 12 May 2014 15:58:47 +0200
Subject: [PATCH 085/225] [FIX] sales_team: fixed kanban view inheritance

---
 addons/crm/sales_team_view.xml   | 14 +++++---------
 addons/sales_team/sales_team.xml |  2 +-
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/addons/crm/sales_team_view.xml b/addons/crm/sales_team_view.xml
index 8be2d888fb6..0a1b1933385 100644
--- a/addons/crm/sales_team_view.xml
+++ b/addons/crm/sales_team_view.xml
@@ -85,20 +85,16 @@
             <field name="inherit_id" ref="sales_team.crm_case_section_salesteams_view_kanban"/>
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="//field[@name='name']" position="after">
+                    <xpath expr="//templates" position="before">
                         <field name="alias_id"/>
-                    </xpath>
-                    <xpath expr="//h4[@class='oe_center']" position="after">
-                        <div class="oe_kanban_alias oe_center" t-if="record.use_leads.raw_value and record.alias_id.value">
-                            <small><span class="oe_e oe_e_alias" style="float: none;">%%</span><t t-raw="record.alias_id.raw_value[1]"/></small>
-                        </div>
-                    </xpath>
-                    <xpath expr="//field[@name='name']" position="after">
                         <field name="use_leads"/>
                         <field name="monthly_open_leads"/>
                         <field name="monthly_planned_revenue"/>
                     </xpath>
-                    <xpath expr="//h4[@class='oe_center']" position="after">
+                    <xpath expr="//h4[@name='name']" position="after">
+                        <div class="oe_kanban_alias oe_center" t-if="record.use_leads.raw_value and record.alias_id.value">
+                            <small><span class="oe_e oe_e_alias" style="float: none;">%%</span><t t-raw="record.alias_id.raw_value[1]"/></small>
+                        </div>
                         <div class="oe_items_list">
                             <div class="oe_salesteams_leads" t-if="record.use_leads.raw_value">
                                 <a name="%(crm_case_form_view_salesteams_lead)d" type="action">Leads</a>
diff --git a/addons/sales_team/sales_team.xml b/addons/sales_team/sales_team.xml
index 5913565c98b..95fcb6f3078 100644
--- a/addons/sales_team/sales_team.xml
+++ b/addons/sales_team/sales_team.xml
@@ -56,7 +56,7 @@
                                     </ul>
                                 </div>
                                 <div class="oe_kanban_content">
-                                    <h4 class="oe_center"><field name="name"/></h4>
+                                    <h4 class="oe_center" name="name"><field name="name"/></h4>
                                     <div class="oe_clear"></div>
                                     <div class="oe_kanban_salesteams_avatars">
                                         <t t-foreach="record.member_ids.raw_value.slice(0,10)" t-as="member">

From d34c54dbb6c034062743fa6bca7792d3f4e335c2 Mon Sep 17 00:00:00 2001
From: "Richard Mathot (OpenERP)" <rim@openerp.com>
Date: Mon, 12 May 2014 16:20:48 +0200
Subject: [PATCH 086/225] [FIX] URL generation in blog template

---
 addons/website_blog/views/website_blog_templates.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_blog/views/website_blog_templates.xml b/addons/website_blog/views/website_blog_templates.xml
index fa6c6af53c6..7d7bdbf86a3 100644
--- a/addons/website_blog/views/website_blog_templates.xml
+++ b/addons/website_blog/views/website_blog_templates.xml
@@ -49,7 +49,7 @@
                     <t t-foreach="posts" t-as="post">
                       <div class="col-md-4">
                         <h4>
-                            <a t-attf-href="#{blog_url('', ['blogpost'], blogpost=post)}" t-field="post.name"></a>
+                            <a t-attf-href="#{blog_url('', ['blog', 'post'], blog=post.blog_id, post=post)}" t-field="post.name"></a>
                             <span t-if="not post.website_published" class="text-warning">
                                 &amp;nbsp;
                                 <span class="fa fa-warning" title="Not published"/>

From 4a29752451e793d4dc6f967bf1709b2ce481ff25 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 12 May 2014 17:19:34 +0200
Subject: [PATCH 087/225] [IMP] openerpframework moved in common asset bundle

---
 addons/website/views/website_templates.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index 890d6080039..cc0b4aa8b3a 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -16,8 +16,6 @@
     <t t-call="website.theme"/>
 
     <script type="text/javascript" src="/web/static/src/js/watch.js"></script>
-    <script type="text/javascript" src="/web/static/lib/qweb/qweb2.js"></script>
-    <script type="text/javascript" src="/web/static/src/js/openerpframework.js"></script>
 
     <script type="text/javascript" src="/website/static/src/js/website.js"></script>
 

From 1d08697bc1a13e694f037f5d62116fff7abb0819 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 12 May 2014 17:42:01 +0200
Subject: [PATCH 088/225] [FIX] Do not display language choice if
 multilang=False

---
 addons/website/models/ir_http.py           |  2 ++
 addons/website/views/website_templates.xml | 12 +++++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/addons/website/models/ir_http.py b/addons/website/models/ir_http.py
index 358f105b0d0..b25509180b0 100644
--- a/addons/website/models/ir_http.py
+++ b/addons/website/models/ir_http.py
@@ -46,10 +46,12 @@ class ir_http(orm.AbstractModel):
         try:
             func, arguments = self._find_handler()
             request.website_enabled = func.routing.get('website', False)
+            request.website_multilang = func.routing.get('multilang', False)
         except werkzeug.exceptions.NotFound:
             # either we have a language prefixed route, either a real 404
             # in all cases, website processes them
             request.website_enabled = True
+            request.website_multilang = True
 
         if request.website_enabled:
             if func:
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index 890d6080039..c34b5a90ae0 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -83,10 +83,12 @@
                 and main_object.website_meta_keywords or website_meta_keywords"/>
             <title><t t-esc="title"/></title>
 
-            <t t-set="languages" t-value="website.get_languages()"/>
-            <t t-foreach="languages" t-as="lg">
-                <t t-set="force_lang" t-value="lg[0] if lg[0] != website.default_lang_code else None"/>
-                <link rel="alternate" t-att-href="url_for(request.httprequest.path + '?' + keep_query(), lang=force_lang)" t-att-hreflang="lg[0].replace('_', '-').lower()" />
+            <t t-if="request.website_multilang">
+                <t t-set="languages" t-value="website.get_languages()"/>
+                <t t-foreach="languages" t-as="lg">
+                    <t t-set="force_lang" t-value="lg[0] if lg[0] != website.default_lang_code else None"/>
+                    <link rel="alternate" t-att-href="url_for(request.httprequest.path + '?' + keep_query(), lang=force_lang)" t-att-hreflang="lg[0].replace('_', '-').lower()" />
+                </t>
             </t>
 
             <t t-call-assets="website.assets_frontend"/>
@@ -177,7 +179,7 @@
                                         their performance.
                                     </p>
                                 </div>
-                                <ul class="list-inline js_language_selector mt16" t-if="(len(languages) &gt; 1 or editable)">
+                                <ul class="list-inline js_language_selector mt16" t-if="(request.website_multilang and len(languages) &gt; 1) or editable">
                                     <li t-foreach="languages" t-as="lg">
                                         <a t-att-href="url_for(request.httprequest.path + '?' + keep_query(), lang=lg[0])"
                                            t-att-data-default-lang="editable and 'true' if lg[0] == website.default_lang_code else None">

From 2b8739cf8b2a395c65f758593f622fc4dd5f2b42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 12 May 2014 17:52:10 +0200
Subject: [PATCH 089/225] [IMP] website sales salesteam: refactored
 implementation - now having a website sales sales team in website_sale; -
 temporarily crm accepted as a dependency of website_sale (will be improved
 when sales team are taken out of crm); - removed website_sale_crm unnecessary
 module + dead code - removed shopping cart state + its management - added
 acquirer and transaction fields on sale order - azdded use_opportunities and
 use_quotations fields on sales team like use_leads

---
 addons/crm/crm.py                             |  3 +-
 addons/crm/crm_case_section_view.xml          |  4 +-
 addons/delivery/sale.py                       |  2 +-
 addons/sale/sale.py                           | 24 +++---
 addons/sale_crm/sale_crm.py                   |  7 +-
 addons/sale_crm/sale_crm_view.xml             |  6 +-
 addons/website_sale/controllers/main.py       | 26 ++++---
 addons/website_sale/data/data.xml             |  8 +-
 addons/website_sale/data/demo.xml             |  2 +-
 addons/website_sale/models/sale_order.py      | 12 ++-
 addons/website_sale/views/views.xml           | 74 -------------------
 addons/website_sale_crm/__init__.py           |  0
 addons/website_sale_crm/__openerp__.py        | 15 ----
 .../data/website_sale_crm.xml                 | 13 ----
 addons/website_sale_crm/models/__init__.py    |  1 -
 addons/website_sale_crm/models/website.py     | 14 ----
 .../website_sale_delivery/models/__init__.py  |  1 -
 .../website_sale_delivery/models/website.py   | 21 ------
 18 files changed, 56 insertions(+), 177 deletions(-)
 delete mode 100644 addons/website_sale_crm/__init__.py
 delete mode 100644 addons/website_sale_crm/__openerp__.py
 delete mode 100644 addons/website_sale_crm/data/website_sale_crm.xml
 delete mode 100644 addons/website_sale_crm/models/__init__.py
 delete mode 100644 addons/website_sale_crm/models/website.py
 delete mode 100644 addons/website_sale_delivery/models/website.py

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 29aa900c16d..312d6d467d8 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -176,7 +176,7 @@ class crm_case_section(osv.osv):
         'color': fields.integer('Color Index'),
         'use_leads': fields.boolean('Leads',
             help="The first contact you get with a potential customer is a lead you qualify before converting it into a real business opportunity. Check this box to manage leads in this sales team."),
-
+        'use_opportunities': fields.boolean('Opportunities', help="Check this box to manage opportunities in this sales team."),
         'monthly_open_leads': fields.function(_get_opportunities_data,
             type="string", readonly=True, multi='_get_opportunities_data',
             string='Open Leads per Month'),
@@ -193,6 +193,7 @@ class crm_case_section(osv.osv):
         'active': 1,
         'stage_ids': _get_stage_common,
         'use_leads': True,
+        'use_opportunities': True,
     }
 
     _sql_constraints = [
diff --git a/addons/crm/crm_case_section_view.xml b/addons/crm/crm_case_section_view.xml
index 04ad124f652..ee4d11f6df1 100644
--- a/addons/crm/crm_case_section_view.xml
+++ b/addons/crm/crm_case_section_view.xml
@@ -87,6 +87,7 @@
             <field name="arch" type="xml">
                 <kanban version="7.0" class="oe_background_grey">
                     <field name="use_leads"/>
+                    <field name="use_opportunities"/>
                     <field name="name"/>
                     <field name="user_id"/>
                     <field name="member_ids"/>
@@ -119,7 +120,7 @@
                                                     options="{'height': '20px', 'barWidth': 4, 'barSpacing': 1, 'delayIn': '3000', 'tooltip_suffix': ' Leads'}">Open Leads per Month<br/>Click to see a detailed analysis of leads.</field>
                                             </a>
                                         </div>
-                                        <div class="oe_salesteams_opportunities">
+                                        <div class="oe_salesteams_opportunities" t-if="record.use_opportunities.raw_value">
                                             <a name="%(crm_case_form_view_salesteams_opportunity)d" type="action">Opportunities</a>
                                             <a name="%(action_report_crm_opportunity_salesteam)d" type="action">
                                                 <field name="monthly_planned_revenue" widget="sparkline_bar"
@@ -197,6 +198,7 @@
                             </h1>
                             <div name="options_active">
                                 <field name="use_leads" class="oe_inline"/><label for="use_leads"/>
+                                <field name="use_opportunities" class="oe_inline"/><label for="use_opportunities"/>
                             </div>
                         </div>
                         <group>
diff --git a/addons/delivery/sale.py b/addons/delivery/sale.py
index 829498274fe..1bfeabfe15d 100644
--- a/addons/delivery/sale.py
+++ b/addons/delivery/sale.py
@@ -74,7 +74,7 @@ class sale_order(osv.Model):
             if not grid_id:
                 raise osv.except_osv(_('No Grid Available!'), _('No grid matching for this carrier!'))
 
-            if order.state in ['sent', 'cancel', 'progress', 'manual', 'done']:
+            if order.state != 'draft':
                 raise osv.except_osv(_('Order not in Draft State!'), _('The order state have to be draft to add delivery lines.'))
 
             grid = grid_obj.browse(cr, uid, grid_id, context=context)
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index c40946a61aa..880f9811ffc 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -27,18 +27,6 @@ from openerp.tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FO
 import openerp.addons.decimal_precision as dp
 from openerp import workflow
 
-AVAILABLE_STATES = [
-    ('draft', 'Draft Quotation'),
-    ('sent', 'Quotation Sent'),
-    ('cancel', 'Cancelled'),
-    ('waiting_date', 'Waiting Schedule'),
-    ('progress', 'Sales Order'),
-    ('manual', 'Sale to Invoice'),
-    ('shipping_except', 'Shipping Exception'),
-    ('invoice_except', 'Invoice Exception'),
-    ('done', 'Done'),
-]
-
 class sale_order(osv.osv):
     _name = "sale.order"
     _inherit = ['mail.thread', 'ir.needaction_mixin']
@@ -180,7 +168,17 @@ class sale_order(osv.osv):
             readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, select=True),
         'origin': fields.char('Source Document', size=64, help="Reference of the document that generated this sales order request."),
         'client_order_ref': fields.char('Reference/Description', size=64),
-        'state': fields.selection(AVAILABLE_STATES , 'Status', readonly=True, help="Gives the status of the quotation or sales order.\
+        'state': fields.selection([
+            ('draft', 'Draft Quotation'),
+            ('sent', 'Quotation Sent'),
+            ('cancel', 'Cancelled'),
+            ('waiting_date', 'Waiting Schedule'),
+            ('progress', 'Sales Order'),
+            ('manual', 'Sale to Invoice'),
+            ('shipping_except', 'Shipping Exception'),
+            ('invoice_except', 'Invoice Exception'),
+            ('done', 'Done'),
+            ], 'Status', readonly=True, help="Gives the status of the quotation or sales order.\
               \nThe exception status is automatically set when a cancel operation occurs \
               in the invoice validation (Invoice Exception) or in the picking list process (Shipping Exception).\nThe 'Waiting Schedule' status is set when the invoice is confirmed\
                but waiting for the scheduler to run on the order date.", select=True),
diff --git a/addons/sale_crm/sale_crm.py b/addons/sale_crm/sale_crm.py
index 739b70c8588..ca4fb5ca8eb 100644
--- a/addons/sale_crm/sale_crm.py
+++ b/addons/sale_crm/sale_crm.py
@@ -76,7 +76,7 @@ class crm_case_section(osv.osv):
         date_end = month_begin.replace(day=calendar.monthrange(month_begin.year, month_begin.month)[1]).strftime(tools.DEFAULT_SERVER_DATE_FORMAT)
         for id in ids:
             res[id] = dict()
-            created_domain = [('section_id', '=', id), ('state', '=', ['draft']), ('date_order', '>=', date_begin), ('date_order', '<=', date_end)]
+            created_domain = [('section_id', '=', id), ('state', '=', 'draft'), ('date_order', '>=', date_begin), ('date_order', '<=', date_end)]
             res[id]['monthly_quoted'] = self.__get_bar_values(cr, uid, obj, created_domain, ['amount_total', 'date_order'], 'amount_total', 'date_order', context=context)
             validated_domain = [('section_id', '=', id), ('state', 'not in', ['draft', 'sent', 'cancel']), ('date_order', '>=', date_begin), ('date_order', '<=', date_end)]
             res[id]['monthly_confirmed'] = self.__get_bar_values(cr, uid, obj, validated_domain, ['amount_total', 'date_order'], 'amount_total', 'date_order', context=context)
@@ -94,6 +94,7 @@ class crm_case_section(osv.osv):
         return res
 
     _columns = {
+        'use_quotations': fields.boolean('Opportunities', help="Check this box to manage quotations in this sales team."),
         'invoiced_forecast': fields.integer(string='Invoice Forecast',
             help="Forecast of the invoice revenue for the current month. This is the amount the sales \n"
                     "team should invoice this month. It is used to compute the progression ratio \n"
@@ -112,6 +113,10 @@ class crm_case_section(osv.osv):
             string='Rate of sent invoices per duration'),
     }
 
+    _defaults = {
+        'use_quotations': True,
+    }
+
     def action_forecast(self, cr, uid, id, value, context=None):
         return self.write(cr, uid, [id], {'invoiced_forecast': round(float(value))}, context=context)
 
diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index 88d7fe8be6c..50c2fe1bcb3 100644
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -244,6 +244,9 @@
             <field name="inherit_id" ref="crm.crm_case_section_view_form"/>
             <field name="arch" type="xml">
             <data>
+                <xpath expr="//div[@name='options_active']" position="inside">
+                    <field name="use_quotations" class="oe_inline"/><label for="use_quotations"/>
+                </xpath>
                 <xpath expr="//field[@name='code']" position="after">
                     <field name="invoiced_target"/>
                     <field name="invoiced_forecast"/>
@@ -259,6 +262,7 @@
             <field name="arch" type="xml">
             <data>
                 <xpath expr="//field[@name='name']" position="after">
+                    <field name="use_quotations"/>
                     <field name="monthly_quoted"/>
                     <field name="monthly_confirmed"/>
                     <field name="monthly_invoiced"/>
@@ -284,7 +288,7 @@
                             </field>
                         </a>
                     </div>
-                    <div class="oe_salesteams_quotations">
+                    <div class="oe_salesteams_quotations" t-if="record.use_quotations.raw_value">
                         <a name="%(action_quotations_salesteams)d" type="action" class="oe_sparkline_bar_link">Quotations</a>
                         <a name="%(action_order_report_quotation_salesteam)d" type="action" class="oe_sparkline_bar_link">
                             <field name="monthly_quoted" widget="sparkline_bar" options="{'delayIn': '3000'}">
diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index f1c70528c8b..7a3c37a1583 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -253,14 +253,14 @@ class website_sale(http.Controller):
     def checkout_redirection(self, order):
         cr, uid, context, registry = request.cr, request.uid, request.context, request.registry
 
-        # must have a shopping_cart state of sale order with lines at this point, otherwise reset
-        if not order or order.state != 'shopping_cart':
+        # must have a draft state of sale order with lines at this point, otherwise reset
+        if not order or order.state != 'draft':
             request.website_sale_reset(cr, uid, context=context)
             return request.redirect('/shop')
 
         # if transaction pending / done: redirect to confirmation
         tx = context.get('website_sale_transaction')
-        if tx and tx.state != 'shopping_cart':
+        if tx and tx.state != 'draft':
             return request.redirect('/shop/payment/confirmation/%s' % order.id)
 
     def checkout_values(self, data=None):
@@ -454,9 +454,9 @@ class website_sale(http.Controller):
         """ Payment step. This page proposes several payment means based on available
         payment.acquirer. State at this point :
 
-         - a shopping_cart state sale order with lines; otherwise, clean context / session and
+         - a draft state sale order with lines; otherwise, clean context / session and
            back to the shop
-         - no transaction in context / session, or only a shopping_cart one, if the customer
+         - no transaction in context / session, or only a draft one, if the customer
            did go to a payment.acquirer website but closed the tab without
            paying / canceling
         """
@@ -518,6 +518,7 @@ class website_sale(http.Controller):
         cr, uid, context = request.cr, request.uid, request.context
         payment_obj = request.registry.get('payment.acquirer')
         transaction_obj = request.registry.get('payment.transaction')
+        sale_order_obj = request.registry['sale.order']
         order = request.website.sale_get_order(context=context)
 
         if not order or not order.order_line or acquirer_id is None:
@@ -539,11 +540,20 @@ class website_sale(http.Controller):
                 'sale_order_id': order.id,
             }, context=context)
             request.session['sale_transaction_id'] = tx_id
-        elif tx and tx.state == 'shopping_cart':  # button cliked but no more info -> rewrite on tx or create a new one ?
+        elif tx and tx.state == 'draft':  # button cliked but no more info -> rewrite on tx or create a new one ?
             tx.write({
                 'acquirer_id': acquirer_id,
             })
 
+        # update quotation
+        sale_order_obj.write(
+            cr, SUPERUSER_ID, [order.id], {
+                'payment_acquirer_id': acquirer_id,
+                'payment_tx_id': request.session['sale_transaction_id']
+            }, context=context)
+        # confirm the quotation
+        sale_order_obj.action_button_confirm(cr, SUPERUSER_ID, [order.id], context=request.context)
+
         acquirer_form_post_url = payment_obj.get_form_action_url(cr, uid, acquirer_id, context=context)
         acquirer_total_url = '%s?%s' % (acquirer_form_post_url, werkzeug.url_encode(post))
         return request.redirect(acquirer_total_url)
@@ -622,9 +632,7 @@ class website_sale(http.Controller):
         if not tx or not order:
             return request.redirect('/shop')
 
-        if not order.amount_total or tx.state == 'done':
-            # confirm the quotation
-            sale_order_obj.action_button_confirm(cr, SUPERUSER_ID, [order.id], context=request.context)
+        if not order.amount_total or tx.state in ['pending', 'done']:
             # send by email
             email_act = sale_order_obj.action_quotation_send(cr, SUPERUSER_ID, [order.id], context=request.context)
         elif tx.state == 'cancel':
diff --git a/addons/website_sale/data/data.xml b/addons/website_sale/data/data.xml
index 0c591d9cabe..1ce96d4cbf0 100644
--- a/addons/website_sale/data/data.xml
+++ b/addons/website_sale/data/data.xml
@@ -32,10 +32,12 @@
             <field name="html_class">oe_image_full</field>
         </record>
 
-        <record model="crm.case.section" id="crm_case_section_shopping_cart">
-            <field name="name">Shopping Cart</field>
-            <field name="code">SPC</field>
+        <record model="crm.case.section" id="salesteam_website_sales">
+            <field name="name">Website Sales</field>
+            <field name="code">WS</field>
             <field name="member_ids" eval="[(4, ref('base.user_root'))]"/>
+            <field name="use_opportunities" eval="False"/>
+            <field name="use_quotations" eval="False"/>
         </record>
 
     </data>
diff --git a/addons/website_sale/data/demo.xml b/addons/website_sale/data/demo.xml
index eb2f2090207..8138f1a3274 100644
--- a/addons/website_sale/data/demo.xml
+++ b/addons/website_sale/data/demo.xml
@@ -548,7 +548,7 @@ Weight: 1.1 ounces</field>
             <field name="sequence">1</field>
         </record>
         
-        <record id="crm_case_section_shopping_cart" model="crm.case.section">
+        <record id="salesteam_website_sales" model="crm.case.section">
             <field name="member_ids" eval="[(4, ref('base.user_root'), ref('base.user_demo'))]"/>
         </record>
         
diff --git a/addons/website_sale/models/sale_order.py b/addons/website_sale/models/sale_order.py
index d5f821070ae..3fbe3329384 100644
--- a/addons/website_sale/models/sale_order.py
+++ b/addons/website_sale/models/sale_order.py
@@ -4,9 +4,7 @@ import random
 from openerp import SUPERUSER_ID
 from openerp.osv import osv, orm, fields
 from openerp.addons.web.http import request
-from openerp.addons.sale import sale
 
-sale.AVAILABLE_STATES.insert(1,('shopping_cart', 'Shopping Cart'))
 
 class payment_transaction(orm.Model):
     _inherit = 'payment.transaction'
@@ -20,7 +18,7 @@ class sale_order(osv.Model):
     _inherit = "sale.order"
 
     def _cart_qty(self, cr, uid, ids, field_name, arg, context=None):
-        res = dict();
+        res = dict()
         for order in self.browse(cr, uid, ids, context=context):
             res[order.id] = int(sum(l.product_uom_qty for l in (order.website_order_line or [])))
         return res
@@ -31,8 +29,9 @@ class sale_order(osv.Model):
             string='Order Lines displayed on Website', readonly=True,
             help='Order Lines to be displayed on the website. They should not be used for computation purpose.',
         ),
-        'cart_quantity': fields.function(_cart_qty, type='integer', string='Main Menu'),
-        'state': fields.selection(sale.AVAILABLE_STATES, 'Status'),
+        'cart_quantity': fields.function(_cart_qty, type='integer', string='Cart Quantity'),
+        'payment_acquirer_id': fields.many2one('payment.acquirer', 'Payment Provider', on_delete='set null'),
+        'payment_tx_id': fields.many2one('payment.transaction', 'Payment Tx', on_delete='set null'),
     }
 
     def _get_errors(self, cr, uid, order, context=None):
@@ -142,8 +141,7 @@ class website(orm.Model):
                     'user_id': w.user_id.id,
                     'partner_id': partner.id,
                     'pricelist_id': partner.property_product_pricelist.id,
-                    'state': 'shopping_cart',
-                    'section_id': self.pool.get('ir.model.data').get_object_reference(cr, uid, 'website_sale', 'crm_case_section_shopping_cart')[1],
+                    'section_id': self.pool.get('ir.model.data').get_object_reference(cr, uid, 'website_sale', 'salesteam_website_sales')[1],
                 }
                 sale_order_id = sale_order_obj.create(cr, SUPERUSER_ID, values, context=context)
                 values = sale_order_obj.onchange_partner_id(cr, SUPERUSER_ID, [], partner.id, context=context)['value']
diff --git a/addons/website_sale/views/views.xml b/addons/website_sale/views/views.xml
index 464e4349562..f85be0e4651 100644
--- a/addons/website_sale/views/views.xml
+++ b/addons/website_sale/views/views.xml
@@ -91,79 +91,5 @@
       </field>
     </record>
 
-    <record id="sale_order_form_state_button" model="ir.ui.view">
-        <field name="name">sale.order.form.state.button</field>
-        <field name="model">sale.order</field>
-        <field name="inherit_id" ref="sale.view_order_form"/>
-        <field name="arch" type="xml">
-            <field name='state' position="before">
-                <button class="oe_highlight" name="action_button_confirm" states="shopping_cart" string="Confirm Sale" type="object" groups="base.group_user"/>
-                <button name="cancel" states="shopping_cart" string="Cancel Quotation" groups="base.group_user"/>
-            </field>
-        </field>
-    </record>
-
-    <record id="sale.action_orders" model="ir.actions.act_window">
-        <field name="domain">[('state', 'not in', ('draft', 'shopping_cart', 'sent', 'cancel'))]</field>
-    </record>
-
-    <record id="view_shopping_cart_order_filter" model="ir.ui.view">
-        <field name="name">shopping.cart.order.filter</field>
-        <field name="model">sale.order</field>
-        <field name="arch" type="xml">
-            <search string="Search Sales Order">
-                <field name="name" string="Sales Order" filter_domain="['|',('name','ilike',self),('client_order_ref','ilike',self)]"/>
-                <filter icon="terp-mail-message-new" string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
-                <separator/>
-                <filter string="My" domain="[('user_id','=',uid)]" help="My Shopping Cart Orders" icon="terp-personal" name="my_sale_orders_filter"/>
-                <field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/>
-                <field name="user_id"/>
-                <group expand="0" string="Group By...">
-                    <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
-                    <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                    <filter string="Order Month" icon="terp-go-month" domain="[]" context="{'group_by':'date_order'}"/>
-                </group>
-           </search>
-        </field>
-    </record>
-
-    <record id="action_shopping_cart_orders" model="ir.actions.act_window">
-        <field name="name">Sales Orders</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">sale.order</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,form,calendar,graph</field>
-        <field name="search_view_id" ref="view_shopping_cart_order_filter"/>
-        <field name="context">{
-                'search_default_my_sale_orders_filter': 1
-            }
-        </field>
-        <field name="domain">[('state', 'not in', ('draft', 'shopping_cart', 'sent', 'cancel'))]</field>
-        <field name="help" type="html">
-            <p class="oe_view_nocontent_create">
-                Click to create a quotation that can be converted into a sales
-                order.
-            </p><p>
-                OpenERP will help you efficiently handle the complete sales flow:
-                quotation, sales order, delivery, invoicing and payment.
-            </p>
-        </field>
-    </record>
-
-    <record id="action_shopping_cart_quotations" model="ir.actions.act_window">
-        <field name="name">Shopping Cart</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">sale.order</field>
-        <field name="view_type">form</field>
-        <field name="view_id" ref="sale.view_quotation_tree"/>
-        <field name="view_mode">tree,form,calendar,graph</field>
-        <field name="domain">[('state','=','shopping_cart')]</field>
-        <field name="search_view_id" ref="view_shopping_cart_order_filter"/>
-    </record>
-
-    <menuitem id="menu_shopping_cart_quotations"
-            action="action_shopping_cart_quotations" parent="base.menu_sales"
-            sequence="5"/>
-
 </data>
 </openerp>
diff --git a/addons/website_sale_crm/__init__.py b/addons/website_sale_crm/__init__.py
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/addons/website_sale_crm/__openerp__.py b/addons/website_sale_crm/__openerp__.py
deleted file mode 100644
index e7e6393ab73..00000000000
--- a/addons/website_sale_crm/__openerp__.py
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    'name': 'eCommerce with CRM',
-    'version': '0.1',
-    'category': 'Hidden',
-    'description': """
-""",
-    'author': 'OpenERP SA',
-    'depends': ['website_sale', 'sale_crm'],
-    'data': [
-        'data/website_sale_crm.xml',
-    ],
-    'installable': True,
-    'auto_install': True
-}
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/website_sale_crm/data/website_sale_crm.xml b/addons/website_sale_crm/data/website_sale_crm.xml
deleted file mode 100644
index dad22228f01..00000000000
--- a/addons/website_sale_crm/data/website_sale_crm.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data noupdate="1">
-        
-        <record model="crm.case.section" id="website.section_sales_department">
-            <field name="name">Website</field>
-            <field name="code">Website</field>
-            <field name="alias_name">Website</field>
-            <field name="member_ids" eval="[(4, ref('base.user_root'))]"/>
-        </record>
-
-    </data>
-</openerp>
diff --git a/addons/website_sale_crm/models/__init__.py b/addons/website_sale_crm/models/__init__.py
deleted file mode 100644
index b8b239729b6..00000000000
--- a/addons/website_sale_crm/models/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-import website
\ No newline at end of file
diff --git a/addons/website_sale_crm/models/website.py b/addons/website_sale_crm/models/website.py
deleted file mode 100644
index 50cb70d7009..00000000000
--- a/addons/website_sale_crm/models/website.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- coding: utf-8 -*-
-from openerp.osv import orm
-from openerp import SUPERUSER_ID
-
-
-class Website(orm.Model):
-    _inherit = 'website'
-
-    def _ecommerce_create_quotation(self, cr, uid, context=None):
-        order_id = super(Website, self)._ecommerce_create_quotation(cr, uid, context=context)
-        section_ids = self.pool["crm.case.section"].search(cr, SUPERUSER_ID, [("code", "=", "Website")], context=context)
-        if section_ids:
-            self.pool["sale.order"].write(cr, SUPERUSER_ID, {'section_id': section_ids[0]}, context=context)
-        return order_id
diff --git a/addons/website_sale_delivery/models/__init__.py b/addons/website_sale_delivery/models/__init__.py
index d37550d1cbb..553da9fc56b 100644
--- a/addons/website_sale_delivery/models/__init__.py
+++ b/addons/website_sale_delivery/models/__init__.py
@@ -1,2 +1 @@
 import sale_order
-import website
diff --git a/addons/website_sale_delivery/models/website.py b/addons/website_sale_delivery/models/website.py
deleted file mode 100644
index 0de2506d3dc..00000000000
--- a/addons/website_sale_delivery/models/website.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-from openerp.osv import orm
-from openerp import SUPERUSER_ID
-
-
-class Website(orm.Model):
-    _inherit = 'website'
-
-    def _ecommerce_create_quotation(self, cr, uid, context=None):
-        order_id = super(Website, self)._ecommerce_create_quotation(cr, uid, context=context)
-        order = self.pool['sale.order'].browse(cr, SUPERUSER_ID, order_id, context=context)
-        self.pool['sale.order']._check_carrier_quotation(cr, uid, order, force_carrier_id=None, context=context)
-        return order_id
-
-    def _ecommerce_add_product_to_cart(self, cr, uid, product_id=0, order_line_id=0, number=1, set_number=-1, context=None):
-        quantity = super(Website, self)._ecommerce_add_product_to_cart(cr, uid,
-            product_id=product_id, order_line_id=order_line_id, number=number, set_number=set_number,
-            context=context)
-        order = self.ecommerce_get_current_order(cr, uid, context=context)
-        self.pool['sale.order']._check_carrier_quotation(cr, uid, order, force_carrier_id=None, context=context) and quantity or None
-        return quantity

From 7ef0d94d6ebc324cab88af8dc5c18c6a3e7062a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 12 May 2014 18:14:42 +0200
Subject: [PATCH 090/225] [IMP] website_sale: sale_order: add acquirer/tx data
 (to be improved)

---
 addons/website_sale/__openerp__.py       |  1 +
 addons/website_sale/views/sale_order.xml | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 addons/website_sale/views/sale_order.xml

diff --git a/addons/website_sale/__openerp__.py b/addons/website_sale/__openerp__.py
index d716dbb794a..acfdca4c32f 100644
--- a/addons/website_sale/__openerp__.py
+++ b/addons/website_sale/__openerp__.py
@@ -15,6 +15,7 @@ OpenERP E-Commerce
         'views/views.xml',
         'views/templates.xml',
         'views/payment.xml',
+        'views/sale_order.xml',
         'security/ir.model.access.csv',
         'security/website_sale.xml',
     ],
diff --git a/addons/website_sale/views/sale_order.xml b/addons/website_sale/views/sale_order.xml
new file mode 100644
index 00000000000..68151998137
--- /dev/null
+++ b/addons/website_sale/views/sale_order.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="view_order_form_acquirer" model="ir.ui.view">
+            <field name="name">sale.order.form.acquirer</field>
+            <field name="model">sale.order</field>
+            <field name="inherit_id" ref="sale.view_order_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='amount_total']" position="after">
+                    <field name="payment_acquirer_id"/>
+                    <field name="payment_tx_id"/>
+                </xpath>
+            </field>
+        </record>
+
+    </data>
+</openerp>

From 023aa7acdf6eb859ada2f8c616fedf9dbc060c80 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 12 May 2014 18:34:55 +0200
Subject: [PATCH 091/225] [FIX] website_forum links which should not be,
 post-install crawler

* move URLs of purely-JS-hook <a> to data-href so the crawler does not try to
  access them (they're JSON-RPC endpoints...)
* replace side-effecting links (...) by styled buttons
* fix crawler to not take fragments in account when deduplicating and
  navigating URLs
---
 addons/website/tests/test_requests.py         | 16 +++++++-
 .../static/src/css/website_forum.css          |  4 ++
 .../static/src/css/website_forum.sass         |  3 ++
 .../static/src/js/website_forum.js            |  8 ++--
 addons/website_forum/views/website_forum.xml  | 38 ++++++++++++++-----
 5 files changed, 54 insertions(+), 15 deletions(-)

diff --git a/addons/website/tests/test_requests.py b/addons/website/tests/test_requests.py
index 127aea274d5..e0309c9ab4b 100644
--- a/addons/website/tests/test_requests.py
+++ b/addons/website/tests/test_requests.py
@@ -41,6 +41,9 @@ class CrawlSuite(unittest2.TestSuite):
     starting the crawl
     """
 
+    at_install = False
+    post_install = True
+
     def __init__(self, user=None, password=None):
         super(CrawlSuite, self).__init__()
 
@@ -108,14 +111,23 @@ class CrawlSuite(unittest2.TestSuite):
                 for link in doc.xpath('//a[@href]'):
                     href = link.get('href')
 
+                    parts = urlparse.urlsplit(href)
+                    # href with any fragment removed
+                    href = urlparse.urlunsplit((
+                        parts.scheme,
+                        parts.netloc,
+                        parts.path,
+                        parts.query,
+                        ''
+                    ))
+
                     # avoid repeats, even for links we won't crawl no need to
                     # bother splitting them if we've already ignored them
                     # previously
                     if href in seen: continue
                     seen.add(href)
 
-                    parts = urlparse.urlsplit(href)
-
+                    # FIXME: handle relative link (not parts.path.startswith /)
                     if parts.netloc or \
                         not parts.path.startswith('/') or \
                         parts.path == '/web' or\
diff --git a/addons/website_forum/static/src/css/website_forum.css b/addons/website_forum/static/src/css/website_forum.css
index b90c1786e24..75befd62b1c 100644
--- a/addons/website_forum/static/src/css/website_forum.css
+++ b/addons/website_forum/static/src/css/website_forum.css
@@ -94,3 +94,7 @@ a.no-decoration {
   font: 1.2em "Helvetica Neue", Helvetica, Arial, sans-serif !important;
   height: 1.2em !important;
 }
+
+button.btn-link.text-muted {
+  color: #999999;
+}
diff --git a/addons/website_forum/static/src/css/website_forum.sass b/addons/website_forum/static/src/css/website_forum.sass
index f8e46f06b79..d800d293de8 100644
--- a/addons/website_forum/static/src/css/website_forum.sass
+++ b/addons/website_forum/static/src/css/website_forum.sass
@@ -74,3 +74,6 @@ a.no-decoration
   .text-tags .text-tag .text-button
     font: 1.2em "Helvetica Neue", Helvetica, Arial, sans-serif !important
     height: 1.2em !important
+
+button.btn-link.text-muted
+  color: #999
diff --git a/addons/website_forum/static/src/js/website_forum.js b/addons/website_forum/static/src/js/website_forum.js
index e84e76e14fa..0b45d4311c1 100644
--- a/addons/website_forum/static/src/js/website_forum.js
+++ b/addons/website_forum/static/src/js/website_forum.js
@@ -3,7 +3,7 @@ $(document).ready(function () {
     $('.vote_up ,.vote_down').on('click', function (ev) {
         ev.preventDefault();
         var $link = $(ev.currentTarget);
-        openerp.jsonRpc($link.attr('href'), 'call', {})
+        openerp.jsonRpc($link.data('href'), 'call', {})
             .then(function (data) {
                 if (data['error']){
                     if (data['error'] == 'own_post'){
@@ -47,7 +47,7 @@ $(document).ready(function () {
     $('.accept_answer').on('click', function (ev) {
         ev.preventDefault();
         var $link = $(ev.currentTarget);
-        openerp.jsonRpc($link.attr('href'), 'call', {}).then(function (data) {
+        openerp.jsonRpc($link.data('href'), 'call', {}).then(function (data) {
             if (data['error']) {
                 if (data['error'] == 'anonymous_user'){
                     var $warning = $('<div class="alert alert-danger alert-dismissable" id="correct_answer_alert" style="position:absolute; margin-top: -30px; margin-left: 90px;">'+
@@ -83,7 +83,7 @@ $(document).ready(function () {
     $('.favourite_question').on('click', function (ev) {
         ev.preventDefault();
         var $link = $(ev.currentTarget);
-        openerp.jsonRpc($link.attr('href'), 'call', {}).then(function (data) {
+        openerp.jsonRpc($link.data('href'), 'call', {}).then(function (data) {
             if (data) {
                 $link.addClass("forum_favourite_question")
             } else {
@@ -96,7 +96,7 @@ $(document).ready(function () {
     $('.comment_delete').on('click', function (ev) {
         ev.preventDefault();
         var $link = $(ev.currentTarget);
-        openerp.jsonRpc($link.attr('href'), 'call', {}).then(function (data) {
+        openerp.jsonRpc($link.data('href'), 'call', {}).then(function (data) {
             $link.parents('.comment').first().remove();
         });
         return true;
diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml
index c73486d7d39..fbda6a40532 100644
--- a/addons/website_forum/views/website_forum.xml
+++ b/addons/website_forum/views/website_forum.xml
@@ -20,6 +20,14 @@
     </xpath>
 </template>
 
+<!-- helper -->
+<template id="muted_button">
+    <form method="POST" t-att-action="url">
+        <button t-attf-class="text-muted fa btn-link #{classes}">
+            <t t-esc="label"/></button>
+    </form>
+</template>
+
 <!-- Page Index -->
 <template id="header" name="Forum Index">
     <t t-call="website.layout">
@@ -387,10 +395,10 @@
 <template id="vote">
     <div t-attf-class="box oe_grey">
         <a t-attf-class="vote_up fa fa-thumbs-up no-decoration #{post.user_vote == 1 and 'text-success' or ''}" 
-            t-attf-href="/forum/#{slug(post.forum_id)}/post/#{slug(post)}/upvote"/>
+            t-attf-data-href="/forum/#{slug(post.forum_id)}/post/#{slug(post)}/upvote"/>
         <span id="vote_count" t-esc="post.vote_count"/>
         <a t-attf-class="vote_down fa fa-thumbs-down no-decoration #{post.user_vote == -1 and 'text-warning' or ''}" 
-            t-attf-href="/forum/#{slug(post.forum_id)}/post/#{slug(post)}/downvote"/>
+            t-attf-data-href="/forum/#{slug(post.forum_id)}/post/#{slug(post)}/downvote"/>
         <div t-if="vote_count &gt; 1" class="subtitle">
             votes
         </div>
@@ -412,7 +420,7 @@
                     <span t-field="question.views"/> Views
                 </div>
                 <div class="mt4">
-                    <a t-attf-href="/forum/#{slug(question.forum_id)}/question/#{slug(question)}/toggle_favourite"
+                    <a t-attf-data-href="/forum/#{slug(question.forum_id)}/question/#{slug(question)}/toggle_favourite"
                         t-attf-class="favourite_question no-decoration fa fa-2x fa-star #{question.user_favourite and 'forum_favourite_question' or ''}"/>
                 </div>
             </div>
@@ -495,7 +503,7 @@
                     </t>
                     <div class="text-muted mt8">
                         <a t-attf-class="accept_answer fa fa-2x fa-check-circle no-decoration #{answer.is_correct and 'oe_answer_true' or 'oe_answer_false'}"
-                            t-attf-href="/forum/#{slug(question.forum_id)}/post/#{slug(answer)}/toggle_correct"/>
+                            t-attf-data-href="/forum/#{slug(question.forum_id)}/post/#{slug(answer)}/toggle_correct"/>
                     </div>
                 </div>
                 <div style="margin-left: 95px;" class="clearfix">
@@ -511,10 +519,18 @@
                                 <a class="text-muted fa fa-edit" t-attf-href="/forum/#{slug(forum)}/post/#{slug(answer)}/edit"> Edit</a>
                             </li>
                             <li t-if="(user.id == answer.create_uid.id and can_unlink_own) or can_unlink_all">
-                                <a class="text-muted fa fa-trash-o" t-attf-href="/forum/#{slug(forum)}/post/#{slug(answer)}/delete"> Delete</a>
+                                <t t-call="website_forum.muted_button">
+                                    <t t-set="url"><t t-escf="/forum/#{slug(forum)}/post/#{slug(answer)}/delete"/></t>
+                                    <t t-set="label"> Delete</t>
+                                    <t t-set="classes">fa-trash-o</t>
+                                </t>
                             </li>
                             <li t-if="user.id == answer.create_uid.id">
-                                <a class="text-muted fa fa-magic" t-attf-href="/forum/#{slug(forum)}/post/#{slug(answer)}/convert_to_comment"> Convert as a comment</a>
+                                <t t-call="website_forum.muted_button">
+                                    <t t-set="url"><t t-escf="/forum/#{slug(forum)}/post/#{slug(answer)}/convert_to_comment"/></t>
+                                    <t t-set="label">Convert as a comment</t>
+                                    <t t-set="classes">fa-magic</t>
+                                </t>
                             </li>
                         </ul>
                         <span t-field="answer.create_uid.image" t-field-options='{"widget": "image", "class":"pull-left img img-circle img-avatar"}'/>
@@ -550,15 +566,19 @@
             <div t-foreach="reversed(object.website_message_ids)" t-as="message" class="comment oe_comment_grey">
                 <small class="text-muted">
                     <button type="button" t-if="user.partner_id.id == message.author_id.id and user.karma&gt;=750"
-                        t-attf-href="/forum/#{slug(forum)}/post/#{slug(object)}/comment/#{slug(message)}/delete" 
+                        t-attf-data-href="/forum/#{slug(forum)}/post/#{slug(object)}/comment/#{slug(message)}/delete"
                         class="close comment_delete">&amp;times;</button>
                     <span t-field="message.body"/>
                     <a t-attf-href="/forum/#{slug(forum)}/partner/#{message.author_id.id}"
                         t-field="message.author_id" t-field-options='{"widget": "contact", "country_image": true, "fields": ["name", "country_id"]}'
                         style="display: inline-block;"/>
                     on <span t-field="message.date" t-field-options='{"format":"short"}'/>
-                    <a class="fa fa-magic text-muted pull-right"
-                        t-attf-href="/forum/#{slug(forum)}/post/#{slug(object)}/comment/#{slug(message)}/convert_to_answer">Convert as an answer</a>
+
+                    <t t-call="website_forum.muted_button">
+                        <t t-set="url"><t t-escf="/forum/#{slug(forum)}/post/#{slug(object)}/comment/#{slug(message)}/convert_to_answer"/></t>
+                        <t t-set="label"> Convert as an answer</t>
+                        <t t-set="classes">fa-magic pull-right</t>
+                    </t>
                 </small>
             </div>
             <div class="css_editable_mode_hidden">

From 5cf2386e725f27a403129292b1ebfc7ce6317cc8 Mon Sep 17 00:00:00 2001
From: "Richard Mathot (OpenERP)" <rim@openerp.com>
Date: Tue, 13 May 2014 09:28:03 +0200
Subject: [PATCH 092/225] [FIX] website_event_track: display days in
 chronological order

---
 addons/website_event_track/views/website_event.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/website_event_track/views/website_event.xml b/addons/website_event_track/views/website_event.xml
index 55b876e29ca..3bfe4f0d742 100644
--- a/addons/website_event_track/views/website_event.xml
+++ b/addons/website_event_track/views/website_event.xml
@@ -53,7 +53,9 @@
                 <input type="text" class="form-control" placeholder="Filter Tracks..." id="event_track_search"/>
             </div>
         </section>
-        <section class="container" t-foreach="days.keys()" t-as="day">
+        <t t-set="dayslist" t-value="days.keys()"/>
+        <t t-set="dayslist2" t-value="dayslist.sort()"/> <!-- display days in the right order -->
+        <section class="container" t-foreach="dayslist" t-as="day">
             <t t-set="locations" t-value="days[day]['locations']"/>
             <t t-set="dates" t-value="days[day]['dates']"/>
             <h3 class="page-header mt0">

From cc9d05671135f90c1d5dfc0db9065a29c4113bc8 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 13 May 2014 09:56:28 +0200
Subject: [PATCH 093/225] [FIX] website_crm, website_event_sale: remove stray
 prints

also do some trivial cleanup/simplification of website_crm while at it:

* Initialize a dict directly via literal
* Use straightforward dict copy instead of whatever that convoluted crap was
* Use gencomp for set creation
* Lift a pair of keysets to the original dict creation
---
 addons/website_crm/controllers/main.py        | 35 +++++++------------
 addons/website_event_sale/controllers/main.py |  1 -
 2 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/addons/website_crm/controllers/main.py b/addons/website_crm/controllers/main.py
index 163e3ee9793..e3662ef40a0 100644
--- a/addons/website_crm/controllers/main.py
+++ b/addons/website_crm/controllers/main.py
@@ -23,38 +23,29 @@ class contactus(http.Controller):
             if kwargs.get(field):
                 values[field] = kwargs.pop(field)
         values.update(kwargs=kwargs.items())
-        print values
         return request.website.render("website.contactus", values)
 
     @http.route(['/crm/contactus'], type='http', auth="public", website=True, multilang=True)
     def contactus(self, description=None, partner_name=None, phone=None, contact_name=None, email_from=None, name=None, **kwargs):
-        post = {}
-        post['description'] = description
-        post['partner_name'] = partner_name
-        post['phone'] = phone
-        post['contact_name'] = contact_name
-        post['email_from'] = email_from
-        post['name'] = name
-
-        required_fields = ['contact_name', 'email_from', 'description']
-        error = set()
-        values = dict((key, post.get(key)) for key in post)
-        values['error'] = error
+        post = {
+            'description': description,
+            'partner_name': partner_name,
+            'phone': phone,
+            'contact_name': contact_name,
+            'email_from': email_from,
+            'name': name or contact_name,
+            'user_id': False,
+        }
 
         # fields validation
-        for field in required_fields:
-            if not post.get(field):
-                error.add(field)
+        error = set(field for field in ['contact_name', 'email_from', 'description']
+                    if not post.get(field))
+
+        values = dict(post, error=error)
         if error:
             values.update(kwargs=kwargs.items())
             return request.website.render("website.contactus", values)
 
-        # if not given: subject is contact name
-        if not post.get('name'):
-            post['name'] = post.get('contact_name')
-            
-        post['user_id'] = False
-
         try:
             post['channel_id'] = request.registry['ir.model.data'].get_object_reference(request.cr, SUPERUSER_ID, 'crm', 'crm_case_channel_website')[1]
         except ValueError:
diff --git a/addons/website_event_sale/controllers/main.py b/addons/website_event_sale/controllers/main.py
index 2db874cf5b7..0a677517646 100644
--- a/addons/website_event_sale/controllers/main.py
+++ b/addons/website_event_sale/controllers/main.py
@@ -83,7 +83,6 @@ class website_event(website_event):
 
     def _add_event(self, event_name="New Event", context={}, **kwargs):
         try:
-            print kwargs
             dummy, res_id = request.registry.get('ir.model.data').get_object_reference(request.cr, request.uid, 'event_sale', 'product_product_event')
             context['default_event_ticket_ids'] = [[0,0,{
                 'name': _('Subscription'),

From e863668bc37183831a05d950f3fe0237245cf3d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 13 May 2014 10:35:09 +0200
Subject: [PATCH 094/225] [IMP] email_template simplified form view: add link
 to website

---
 addons/mass_mailing/views/email_template.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/mass_mailing/views/email_template.xml b/addons/mass_mailing/views/email_template.xml
index cde5685abaf..84ac3925fcc 100644
--- a/addons/mass_mailing/views/email_template.xml
+++ b/addons/mass_mailing/views/email_template.xml
@@ -21,12 +21,11 @@
                             </group>
                             <group>
                                 <div class="oe_right oe_button_box" name="buttons">
+                                    <button string="Edit Template" name="action_edit_html" type="object"/>
                                     <button name="%(email_template.wizard_email_template_preview)d" string="Preview"
                                         type="action" target="new"
                                         context="{'template_id':active_id}"/>
                                     <br />
-                                    <!-- <field name="website_link" widget='html' radonly='1'
-                                    style='margin: 0px; padding: 0px;'/> -->
                                 </div>
                             </group>
                         </group>

From 36bb8acfab6d0d71f15401ecc8d4432b9b1de4d1 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 13 May 2014 10:49:24 +0200
Subject: [PATCH 095/225] [IMP] website_event_track: simplify event_agenda

---
 .../website_event_track/controllers/event.py  | 37 ++++++++-----------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/addons/website_event_track/controllers/event.py b/addons/website_event_track/controllers/event.py
index 60d4bbd390d..373ade03ad9 100644
--- a/addons/website_event_track/controllers/event.py
+++ b/addons/website_event_track/controllers/event.py
@@ -18,19 +18,17 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+import collections
+
+import datetime
+import re
+
+import pytz
+import werkzeug.utils
 
 import openerp
 from openerp.addons.web import http
 from openerp.addons.web.http import request
-from openerp.addons.website.controllers.main import Website as controllers
-import datetime
-
-import re
-import werkzeug.utils
-
-controllers = controllers()
-import pytz
-from pytz import timezone
 
 class website_event(http.Controller):
     @http.route(['/event/<model("event.event"):event>/track/<model("event.track"):track>'], type='http', auth="public", website=True, multilang=True)
@@ -79,24 +77,21 @@ class website_event(http.Controller):
     # TODO: not implemented
     @http.route(['/event/<model("event.event"):event>/agenda'], type='http', auth="public", website=True, multilang=True)
     def event_agenda(self, event, tag=None, **post):
-        comp = lambda x: (x.date, bool(x.location_id))
-        event.track_ids.sort(lambda x,y: cmp(comp(x), comp(y)))
+        days_tracks = collections.defaultdict(lambda: [])
+        for track in sorted(event.track_ids, key=lambda x: (x.date, bool(x.location_id))):
+            if not track.date: continue
+            days_tracks[track.date[:10]].append(track)
 
         days = {}
-        days_nbr = {}
-        for track in event.track_ids:
-            if not track.date: continue
-            days.setdefault(track.date[:10], [])
-            days[track.date[:10]].append(track)
-
-        for d in days:
-            days_nbr[d] = len(days[d])
-            days[d] = self._prepare_calendar(event, days[d])
+        days_tracks_count = {}
+        for day, tracks in days_tracks.iteritems():
+            days_tracks_count[day] = len(tracks)
+            days[day] = self._prepare_calendar(event, tracks)
 
         return request.website.render("website_event_track.agenda", {
             'event': event,
             'days': days,
-            'days_nbr': days_nbr,
+            'days_nbr': days_tracks_count,
             'tag': tag
         })
 

From eed75b620d0a28bac22ee5b3fd1ce4dbe1cb54bf Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 13 May 2014 12:15:23 +0200
Subject: [PATCH 096/225] [FIX] website_forum: replace deprecated country by
 country_id

---
 addons/website_forum/views/website_forum.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml
index fbda6a40532..75b9fcbd7e7 100644
--- a/addons/website_forum/views/website_forum.xml
+++ b/addons/website_forum/views/website_forum.xml
@@ -737,7 +737,7 @@
                     <select class="form-control" name="country">
                         <option value="">Country...</option>
                         <t t-foreach="countries or []" t-as="country">
-                            <option t-att-value="country.id" t-att-selected="country.id == user.partner_id.country.id"><t t-esc="country.name"/></option>
+                            <option t-att-value="country.id" t-att-selected="country.id == user.partner_id.country_id.id"><t t-esc="country.name"/></option>
                         </t>
                      </select>
                 </div>

From 00a4845bc724a60e990eaf542acaf9e76bf56f12 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 13 May 2014 12:31:57 +0200
Subject: [PATCH 097/225] [FIX] website_blog: fix broken change cover wizard

---
 .../static/src/js/website_blog.editor.js        | 17 +++++++++--------
 .../views/website_blog_templates.xml            |  1 +
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/addons/website_blog/static/src/js/website_blog.editor.js b/addons/website_blog/static/src/js/website_blog.editor.js
index 103b2bee1e7..4a18b5e406b 100644
--- a/addons/website_blog/static/src/js/website_blog.editor.js
+++ b/addons/website_blog/static/src/js/website_blog.editor.js
@@ -30,11 +30,12 @@
             },
         }),
         edit: function () {
+            var self = this;
             $('.popover').remove();
             this._super();
             var vHeight = $(window).height();
-            $('body').on('click','#change_cover',_.bind(this.change_bg,{},vHeight));
-            $('body').on('click', '#clear_cover',_.bind(this.clean_bg,{},vHeight));
+            $('body').on('click','#change_cover',_.bind(this.change_bg, self.rte.editor, vHeight));
+            $('body').on('click', '#clear_cover',_.bind(this.clean_bg, self.rte.editor, vHeight));
         },
         save : function() {
             var res = this._super();
@@ -51,12 +52,12 @@
         },
         change_bg : function(vHeight) {
             var self  = this;
-            var editor  = new  website.editor.ImageDialog();
-            editor.on('start', self, function (o) {
-                o.url = $('.js_fullheight').length ? $('.js_fullheight').css('background-image').replace(/url\(|\)|"|'/g,'') : ''; 
-            });
-            editor.on('save', self, function (o) {
-                $('.js_fullheight').css({"background-image": o.url && o.url !== "" ? 'url(' + o.url + ')' : "", 'min-height': vHeight})
+            var element = new CKEDITOR.dom.element(self.element.find('.cover-storage').$[0]);
+            var editor  = new website.editor.MediaDialog(self, element);
+            $(document.body).on('media-saved', self, function (o) {
+                var url = $('.cover-storage').attr('src');
+                $('.js_fullheight').css({"background-image": !_.isUndefined(url) ? 'url(' + url + ')' : "", 'min-height': vHeight});
+                $('.cover-storage').remove();
             });
             editor.appendTo('body');
         },
diff --git a/addons/website_blog/views/website_blog_templates.xml b/addons/website_blog/views/website_blog_templates.xml
index 7d7bdbf86a3..20d042830e7 100644
--- a/addons/website_blog/views/website_blog_templates.xml
+++ b/addons/website_blog/views/website_blog_templates.xml
@@ -187,6 +187,7 @@
                     <span class="fa fa-times"/>
                 </a>
             </div>
+            <div class="cover-storage oe_hidden"></div> 
             <t t-call="website.publish_management">
                 <t t-set="object" t-value="blog_post"/>
                 <t t-set="publish_edit" t-value="True"/>

From 4922c5363ea94999e00cc52b8516c86ae64fe4c3 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Mon, 12 May 2014 19:51:21 +0200
Subject: [PATCH 098/225] [FIX] website_{customer,partner,crm_partner_assign}:
 correct views and controllers

---
 .../website_crm_partner_assign/__openerp__.py |   1 +
 .../controllers/main.py                       |  42 +++----
 .../models/__init__.py                        |   1 -
 .../models/res_partner.py                     |   3 +-
 .../models/website.py                         |  11 --
 .../views/partner_grade.xml                   |  18 +++
 .../views/website_crm_partner_assign.xml      |  34 +++---
 addons/website_customer/controllers/main.py   |  44 +++----
 .../views/website_customer.xml                | 109 +++++++++---------
 addons/website_partner/controllers/main.py    |  40 ++-----
 addons/website_partner/data/website_data.xml  |   4 +-
 addons/website_partner/models/__init__.py     |   2 -
 addons/website_partner/models/res_company.py  |  10 --
 addons/website_partner/models/res_partner.py  |  11 +-
 addons/website_partner/models/website.py      |  10 --
 .../views/website_partner_view.xml            |  74 ++++--------
 16 files changed, 173 insertions(+), 241 deletions(-)
 delete mode 100644 addons/website_crm_partner_assign/models/website.py
 create mode 100644 addons/website_crm_partner_assign/views/partner_grade.xml
 delete mode 100644 addons/website_partner/models/res_company.py
 delete mode 100644 addons/website_partner/models/website.py

diff --git a/addons/website_crm_partner_assign/__openerp__.py b/addons/website_crm_partner_assign/__openerp__.py
index 82b16173666..06b6dc9410e 100644
--- a/addons/website_crm_partner_assign/__openerp__.py
+++ b/addons/website_crm_partner_assign/__openerp__.py
@@ -10,6 +10,7 @@ Publish and Assign Partner
     'author': 'OpenERP SA',
     'depends': ['crm_partner_assign','website_partner', 'website_google_map'],
     'data': [
+        'views/partner_grade.xml',
         'views/website_crm_partner_assign.xml',
     ],
     'qweb': ['static/src/xml/*.xml'],
diff --git a/addons/website_crm_partner_assign/controllers/main.py b/addons/website_crm_partner_assign/controllers/main.py
index 6d6dda59a99..0581c44ba57 100644
--- a/addons/website_crm_partner_assign/controllers/main.py
+++ b/addons/website_crm_partner_assign/controllers/main.py
@@ -3,7 +3,6 @@
 import werkzeug
 
 import openerp
-from openerp import SUPERUSER_ID
 from openerp.addons.web import http
 from openerp.tools.translate import _
 from openerp.addons.web.http import request
@@ -23,21 +22,21 @@ class WebsiteCrmPartnerAssign(http.Controller):
         '/partners/country/<country_name>-<int:country_id>',
         '/partners/country/<int:country_id>/page/<int:page>',
         '/partners/country/<country_name>-<int:country_id>/page/<int:page>',
-        
+
         '/partners/grade/<int:grade_id>/country/<int:country_id>',
         '/partners/grade/<int:grade_id>/country/<country_name>-<int:country_id>',
         '/partners/grade/<int:grade_id>/country/<int:country_id>/page/<int:page>',
         '/partners/grade/<int:grade_id>/country/<country_name>-<int:country_id>/page/<int:page>',
-        
+
     ], type='http', auth="public", website=True, multilang=True)
-    def partners(self, country_id=0, grade_id=0, page=0, **post):
+    def partners(self, country_id=0, grade_id=0, page=0, country_name='', **post):
         country_obj = request.registry['res.country']
         partner_obj = request.registry['res.partner']
         post_name = post.get('search', '')
         country = None
 
         # format displayed membership lines domain
-        base_partner_domain = [('is_company', '=', True), ('grade_id', '!=', False), ('website_published', '=', True)]
+        base_partner_domain = [('is_company', '=', True), ('grade_id.website_published', '=', True), ('website_published', '=', True)]
         partner_domain = list(base_partner_domain)
         if post_name:
             partner_domain += ['|', ('name', 'ilike', post_name), ('website_description', 'ilike', post_name)]
@@ -51,7 +50,7 @@ class WebsiteCrmPartnerAssign(http.Controller):
         countries_partners = partner_obj.search(
             request.cr, openerp.SUPERUSER_ID, partner_domain,
             context=request.context, count=True)
-        
+
         if country_id:
             country = country_obj.browse(request.cr, request.uid, country_id, request.context)
             partner_domain += [('country_id', '=', country_id)]
@@ -61,33 +60,29 @@ class WebsiteCrmPartnerAssign(http.Controller):
                     'country_id': (country_id, country.name)
                 })
                 countries.sort(key=lambda d: d['country_id'][1])
-        
+
         countries.insert(0, {
             'country_id_count': countries_partners,
             'country_id': (0, _("All Countries"))
         })
-        
 
         # format pager
-        partner_ids = partner_obj.search(
+        partner_count = partner_obj.search_count(
             request.cr, openerp.SUPERUSER_ID, partner_domain,
             context=request.context)
-        pager = request.website.pager(url="/partners", total=len(partner_ids), page=page, step=self._references_per_page, scope=7, url_args=post)
+        pager = request.website.pager(url="/partners", total=partner_count, page=page, step=self._references_per_page, scope=7, url_args=post)
 
-        # search for partners to display
-        partners_data = partner_obj.search_read(request.cr, openerp.SUPERUSER_ID,
-            domain=partner_domain,
-            fields=request.website.get_partner_white_list_fields(),
-            offset=pager['offset'],
-            limit=self._references_per_page,
-            order="grade_id DESC,partner_weight DESC",
-            context=request.context)
-        google_map_partner_ids = ",".join([str(p['id']) for p in partners_data])
+        partner_ids = partner_obj.search(request.cr, openerp.SUPERUSER_ID, partner_domain,
+                                         offset=pager['offset'], limit=self._references_per_page,
+                                         order="grade_id DESC, partner_weight DESC",
+                                         context=request.context)
+        google_map_partner_ids = ','.join(map(str, partner_ids))
+        partners = partner_obj.browse(request.cr, openerp.SUPERUSER_ID, partner_ids, request.context)
 
         # group by grade
         grades = partner_obj.read_group(
             request.cr, openerp.SUPERUSER_ID, base_partner_domain, ["id", "grade_id"],
-            groupby="grade_id", orderby="grade_id", context=request.context)
+            groupby="grade_id", orderby="grade_id DESC", context=request.context)
         grades_partners = partner_obj.search(
             request.cr, openerp.SUPERUSER_ID, base_partner_domain,
             context=request.context, count=True)
@@ -102,7 +97,7 @@ class WebsiteCrmPartnerAssign(http.Controller):
             'current_country': country,
             'grades': grades,
             'grade_id': grade_id,
-            'partners_data': partners_data,
+            'partners': partners,
             'google_map_partner_ids': google_map_partner_ids,
             'pager': pager,
             'searches': post,
@@ -111,9 +106,8 @@ class WebsiteCrmPartnerAssign(http.Controller):
         return request.website.render("website_crm_partner_assign.index", values)
 
     @http.route(['/partners/<int:partner_id>', '/partners/<partner_name>-<int:partner_id>'], type='http', auth="public", website=True, multilang=True)
-    def partners_ref(self, partner_id, **post):
-        partner = request.registry['res.partner'].browse(request.cr, SUPERUSER_ID, partner_id, context=request.context)
-        values = website_partner.get_partner_template_value(partner)
+    def partners_ref(self, partner_id, partner_name='', **post):
+        values = website_partner.get_partner_template_value(partner_id)
         if not values:
             return self.partners(**post)
         values['main_object'] = values['partner']
diff --git a/addons/website_crm_partner_assign/models/__init__.py b/addons/website_crm_partner_assign/models/__init__.py
index 20036e92f6c..4e5bc1614d1 100644
--- a/addons/website_crm_partner_assign/models/__init__.py
+++ b/addons/website_crm_partner_assign/models/__init__.py
@@ -1,2 +1 @@
 import res_partner
-import website
diff --git a/addons/website_crm_partner_assign/models/res_partner.py b/addons/website_crm_partner_assign/models/res_partner.py
index e295c7ab0b1..cc00f8bd6e1 100644
--- a/addons/website_crm_partner_assign/models/res_partner.py
+++ b/addons/website_crm_partner_assign/models/res_partner.py
@@ -1,9 +1,8 @@
 # -*- coding: utf-8 -*-
-
 from openerp.osv import osv, fields
 
 class res_partner_grade(osv.osv):
     _inherit = 'res.partner.grade'
     _columns = {
-        'website_description': fields.html('Description for the website'),
+        'website_published': fields.boolean('Published On Website'),
     }
diff --git a/addons/website_crm_partner_assign/models/website.py b/addons/website_crm_partner_assign/models/website.py
deleted file mode 100644
index f0d428ae5fa..00000000000
--- a/addons/website_crm_partner_assign/models/website.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# -*- coding: utf-8 -*-
-from openerp.osv import orm
-
-
-class Website(orm.Model):
-    _inherit = 'website'
-
-    def get_partner_white_list_fields(self, cr, uid, ids, context=None):
-        fields = super(Website, self).get_partner_white_list_fields(cr, uid, ids, context=context)
-        fields += ["grade_id"]
-        return fields
diff --git a/addons/website_crm_partner_assign/views/partner_grade.xml b/addons/website_crm_partner_assign/views/partner_grade.xml
new file mode 100644
index 00000000000..2acf8e1eb24
--- /dev/null
+++ b/addons/website_crm_partner_assign/views/partner_grade.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+
+  <record model="ir.ui.view" id="partner_grade_view">
+    <field name="name">res.partner.grade.website</field>
+    <field name="model">res.partner.grade</field>
+    <field name="inherit_id" ref="crm_partner_assign.view_partner_grade_form"/>
+    <field name="arch" type="xml">
+      <field name="active" position="after">
+        <field name="website_published"/>
+      </field>
+    </field>
+  </record>
+
+</data>
+</openerp>
+
diff --git a/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
index 56ac22d1eee..3e96bc12443 100644
--- a/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
+++ b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
@@ -81,27 +81,28 @@
                     </div>
                 </div>
                 <div>
-                    <t t-if="not partners_data">
-                        <p>No result found.</p>
-                    </t>
-                    <t t-foreach="partners_data" t-as="partner_data">
-                        <t t-if="internal_gid != partner_data['grade_id'][1]">
+                    <p t-if="not partners">No result found</p>
+                    <t t-foreach="partners" t-as="partner">
+                        <t t-if="last_grade != partner.grade_id.id">
                             <h3 class="text-center">
-                                <span t-esc="partner_data['grade_id'][1]"/> Partners
-                                <t t-if="current_country"> in <t t-esc="current_country.name"/></t>
+                                <span t-field="partner.grade_id"/> Partners
                             </h3>
-                            <t t-set="internal_gid" t-value="partner_data['grade_id'][1]"/>
+                            <t t-set="last_grade" t-value="partner.grade_id.id"/>
                         </t>
                         <div class="media">
-                            <a class="pull-left" t-attf-href="/partners/#{ slug([partner_data.get('id'), partner_data.get('name')]) }">
-                                <img class="media-object" t-attf-src="data:image/png;base64,#{partner_data['image_small']}"/>
-                            </a>
+                            <a class="pull-left" t-attf-href="/partners/#{slug(partner)}"
+                               t-field="partner.image_small"
+                               t-field-options='{"widget": "image", "class": "media-object"}'
+                            ></a>
                             <div class="media-body" style="min-height: 64px;">
-                                <a class="media-heading" t-attf-href="/partners/#{ slug([partner_data.get('id'), partner_data.get('name')]) }"><t t-if="partner_data['parent_id']"><span t-esc="partner_data['parent_id'][1]"/></t> <span t-esc="partner_data['name']"/></a> - <span t-esc="partner_data['grade_id'][1]"/>
-                                <div t-esc="partner_data['website_short_description']"/>
+                                <a class="media-heading" t-attf-href="/partners/#{slug(partner)}">
+                                    <span t-field="partner.display_name"/>
+                                </a>
+                                <div t-field="partner.website_short_description"/>
                             </div>
                         </div>
                     </t>
+
                 </div>
             </div>
         </t>
@@ -126,5 +127,12 @@
     </t>
 </template>
 
+<template id="grade_in_detail" inherit_id="website_partner.partner_detail">
+  <xpath expr="//*[@id='partner_name']" position="after">
+    <h3 class="col-md-12 text-center text-muted" t-if="partner.grade_id and partner.grade_id.website_published">
+      <span t-field="partner.grade_id"/> Partner</h3>
+  </xpath>
+</template>
+
 </data>
 </openerp>
diff --git a/addons/website_customer/controllers/main.py b/addons/website_customer/controllers/main.py
index 5f0825e132c..2caf8c74373 100644
--- a/addons/website_customer/controllers/main.py
+++ b/addons/website_customer/controllers/main.py
@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 
 import openerp
-from openerp import SUPERUSER_ID
 from openerp.addons.web import http
 from openerp.tools.translate import _
 from openerp.addons.web.http import request
@@ -19,14 +18,13 @@ class WebsiteCustomer(http.Controller):
         '/customers/country/<int:country_id>/page/<int:page>',
         '/customers/country/<country_name>-<int:country_id>/page/<int:page>',
     ], type='http', auth="public", website=True, multilang=True)
-    def customers(self, country_id=0, page=0, **post):
+    def customers(self, country_id=0, page=0, country_name='', **post):
         cr, uid, context = request.cr, request.uid, request.context
         country_obj = request.registry['res.country']
         partner_obj = request.registry['res.partner']
         partner_name = post.get('search', '')
 
-        base_domain = [('website_published','=',True)]
-        domain = list(base_domain)
+        domain = [('website_published', '=', True), ('assigned_partner_id', '!=', False)]
         if partner_name:
             domain += [
                 '|',
@@ -57,25 +55,24 @@ class WebsiteCustomer(http.Controller):
         })
 
         # search customers to display
-        partner_ids = partner_obj.search(cr, openerp.SUPERUSER_ID, domain, context=request.context)
-        google_map_partner_ids = ",".join([str(p) for p in partner_ids])
+        partner_count = partner_obj.search_count(cr, openerp.SUPERUSER_ID, domain, context=request.context)
 
         # pager
         pager = request.website.pager(
-            url="/customers", total=len(partner_ids), page=page, step=self._references_per_page,
+            url="/customers", total=partner_count, page=page, step=self._references_per_page,
             scope=7, url_args=post
         )
 
-        # browse page of customers to display
-        partner_ids = partner_obj.search(
-            cr, openerp.SUPERUSER_ID, domain,
-            limit=self._references_per_page, offset=pager['offset'], context=context)
-        partners_data = partner_obj.read(
-            request.cr, openerp.SUPERUSER_ID, partner_ids, request.website.get_partner_white_list_fields(), context=request.context)
+        partner_ids = partner_obj.search(request.cr, openerp.SUPERUSER_ID, domain,
+                                         offset=pager['offset'], limit=self._references_per_page,
+                                         context=request.context)
+        google_map_partner_ids = ','.join(map(str, partner_ids))
+        partners = partner_obj.browse(request.cr, openerp.SUPERUSER_ID, partner_ids, request.context)
+
         values = {
             'countries': countries,
             'current_country_id': country_id or 0,
-            'partners_data': partners_data,
+            'partners': partners,
             'google_map_partner_ids': google_map_partner_ids,
             'pager': pager,
             'post': post,
@@ -84,25 +81,10 @@ class WebsiteCustomer(http.Controller):
         return request.website.render("website_customer.index", values)
 
     @http.route(['/customers/<int:partner_id>', '/customers/<partner_name>-<int:partner_id>'], type='http', auth="public", website=True, multilang=True)
-    def customer(self, partner_id, **post):
-        partner = request.registry['res.partner'].browse(request.cr, SUPERUSER_ID, partner_id, context=request.context)
-        values = website_partner.get_partner_template_value(partner)
+    def customer(self, partner_id, partner_name='', **post):
+        values = website_partner.get_partner_template_value(partner_id)
         if not values:
             return self.customers(**post)
 
-        partner_obj = request.registry['res.partner']
-        if values['partner_data'].get('assigned_partner_id', None):
-            values['assigned_partner_data'] = partner_obj.read(
-                request.cr, openerp.SUPERUSER_ID, [values['partner_data']['assigned_partner_id'][0]],
-                request.website.get_partner_white_list_fields(), context=request.context)[0]
-        if values['partner_data'].get('implemented_partner_ids', None):
-            implemented_partners_data = partner_obj.read(
-                request.cr, openerp.SUPERUSER_ID, values['partner_data']['implemented_partner_ids'],
-                request.website.get_partner_white_list_fields(), context=request.context)
-            values['implemented_partners_data'] = []
-            for data in implemented_partners_data:
-                if data.get('website_published'):
-                    values['implemented_partners_data'].append(data)
-
         values['main_object'] = values['partner']
         return request.website.render("website_customer.details", values)
diff --git a/addons/website_customer/views/website_customer.xml b/addons/website_customer/views/website_customer.xml
index ba89f456e23..a2a5fc99c16 100644
--- a/addons/website_customer/views/website_customer.xml
+++ b/addons/website_customer/views/website_customer.xml
@@ -39,21 +39,22 @@
                         </div>
 
                         <div class="row">
-                            <t t-if="not partners_data">
-                                <p>No result found.</p>
-                            </t>
-                            <t t-foreach="partners_data" t-as="partner_data" class="media">
-                                <div class="media">
-                                    <a class="pull-left" t-attf-href="/customers/#{ slug([partner_data.get('id'), partner_data.get('name')]) }">
-                                        <img class="media-object" t-attf-src="data:image/png;base64,#{partner_data.get('image_small')}"/>
-                                    </a>
-                                    <div class="media-body" style="min-height: 64px;">
-                                        <a t-attf-href="/customers/#{ slug([partner_data.get('id'), partner_data.get('name')]) }" t-esc="partner_data.get('name')"/>
-                                        <div t-raw="partner_data.get('website_short_description') or ''"/>
-                                    </div>
-                                </div>
-                                <div class="clearfix mb8"/>
-                            </t>
+
+                    <p t-if="not partners">No result found</p>
+                    <t t-foreach="partners" t-as="partner">
+                        <div class="media">
+                            <a class="pull-left" t-attf-href="/customers/#{slug(partner)}"
+                               t-field="partner.image_small"
+                               t-field-options='{"widget": "image", "class": "media-object"}'
+                            ></a>
+                            <div class="media-body" style="min-height: 64px;">
+                                <a class="media-heading" t-attf-href="/customers/#{slug(partner)}">
+                                    <span t-field="partner.display_name"/>
+                                </a>
+                                <div t-field="partner.website_short_description"/>
+                            </div>
+                        </div>
+                    </t>
                         </div>
                     </div>
 
@@ -101,15 +102,15 @@
                 <div class="col-md-5">
                     <ol class="breadcrumb">
                         <li><a href="/customers">Our References</a></li>
-                        <li class="active"><span t-esc="partner_data.get('name')"/></li>
+                        <li class="active"><span t-field="partner.display_name"/></li>
                     </ol>
                 </div>
                 <t t-call="website_partner.partner_detail">
                     <t t-set="left_column">
-                        <div id="left_column"></div>
+                        <div id="left_column"><t t-call="website_customer.implemented_by_block"/></div>
                     </t>
                     <t t-set="right_column">
-                        <div id="right_column"></div>
+                        <div id="right_column"><t t-call="website_customer.references_block"/></div>
                     </t>
                 </t>
             </div>
@@ -119,57 +120,59 @@
   </t>
 </template>
 
-<template id="partner_assign" inherit_option_id="website_customer.details" inherit_id="website_customer.details" name="Implemented By">
-    <xpath expr="//div[@id='left_column']" position="inside">
-        <t t-if="assigned_partner_data">
+<template id="partner_details" inherit_id="website_partner.partner_page" name="Partner Detail Columns">
+ <xpath expr="//t[@t-call='website_partner.partner_detail']" position="inside">
+    <t t-set="left_column"><div id="left_column"><t t-call="website_customer.implemented_by_block"/></div></t>
+    <t t-set="right_column"><div id="right_column"><t t-call="website_customer.references_block"/></div></t>
+ </xpath>
+</template>
+
+<template id="implemented_by_block" name="Partner Implemented By Block">
+        <t t-if="partner.assigned_partner_id and partner.assigned_partner_id.website_published">
             <div class="panel panel-default">
                 <div class="panel-heading">
                     <h4>Implemented By</h4>
                 </div>
-                <div class="panel-body">
-                    <div class="text-center">
-                    <img class="img img-shadow" t-attf-src="data:image/png;base64,#{assigned_partner_data.get('image_medium')}"/>
-                    </div>
-                    <address class="mt16 mb8">
-                        <strong t-esc="assigned_partner_data.get('name')"/>
-                        <div t-if="assigned_partner_data.get('phone')">
-                            <span class="fa fa-phone"/> <span t-esc="assigned_partner_data.get('phone')"/>
-                        </div>
-                        <div t-if="assigned_partner_data.get('email')">
-                            <span class="fa fa-envelope"/>
-                            <a t-att-href="'mailto:'+assigned_partner_data.get('email')">
-                              <span t-esc="assigned_partner_data.get('email')"/>
-                            </a>
-                        </div>
-                    </address>
-                    <div>
-                        <a t-attf-href="/customers/#{ slug([partner_data.get('id'), partner_data.get('name')]) }/#references" t-if="implemented_partner_ids">
-                            <t t-esc="len(implemented_partner_ids)"/> references
-                        </a>
-                    </div>
+                <div class="panel-body text-center">
+        <h4>
+            <a t-attf-href="/partners/#{slug(partner.assigned_partner_id)}">
+              <span t-field="partner.assigned_partner_id"/>
+              <span class="small"> (<t t-esc="len([p for p in partner.assigned_partner_id.implemented_partner_ids if p.website_published])"/> reference(s))</span>
+            </a>
+        </h4>
+        <div><a t-attf-href="/partners/#{slug(partner.assigned_partner_id)}"
+                t-field="partner.assigned_partner_id.image_medium"
+                t-field-options='{"widget": "image", "class": "center-block"}'
+             />
+        </div>
+        <address class="well text-left">
+             <div t-field="partner.assigned_partner_id" t-field-options='{
+                 "widget": "contact",
+                 "fields": ["address", "website", "phone", "fax", "email"]
+             }'/>
+        </address>
                 </div>
             </div>
         </t>
-    </xpath>
 </template>
 
-<template id="references" inherit_id="website_customer.details" name="Partner References">
-    <xpath expr="//div[@id='right_column']" position="inside">
-        <t t-if="implemented_partners_data">
+<template id="references_block" name="Partner References Block">
+        <t t-if="any([p.website_published for p in partner.implemented_partner_ids])">
             <h3 id="references">References</h3>
-            <div t-foreach="implemented_partners_data" t-as="partner_data" class="media">
-                <a class="pull-left" t-attf-href="/customers/#{ slug([partner_data.get('id'), partner_data.get('name')]) }">
-                    <img class="media-object" t-attf-src="data:image/png;base64,#{partner_data.get('image_small')}"/>
+            <div t-foreach="partner.implemented_partner_ids" t-as="reference" class="media">
+              <t t-if="reference.website_published">
+                <a class="pull-left" t-attf-href="/customers/#{slug(reference)}">
+                    <span t-field="reference.image_small" t-field-options='{"widget": "image", "class": "center-block"}'/>
                 </a>
                 <div class="media-body" style="min-height: 64px;">
-                    <a class="media-heading" t-attf-href="/customers/#{ slug([partner_data.get('id'), partner_data.get('name')]) }">
-                        <t t-if="partner_data.get('parent_id')"><span t-esc="partner_data.get('parent_id')[1]"/></t> <span t-esc="partner_data.get('name')"/>
+                    <a class="media-heading" t-attf-href="/customers/#{slug(reference)}">
+                        <span t-field="reference.self"/>
                     </a>
-                    <div t-if="partner_data.get('website_short_description')" t-raw="partner_data.get('website_short_description')"/>
+                    <div t-field='reference.website_short_description'/>
                 </div>
+              </t>
             </div>
         </t>
-    </xpath>
 </template>
 
 </data>
diff --git a/addons/website_partner/controllers/main.py b/addons/website_partner/controllers/main.py
index 1e6cb9afb61..c92ddac8189 100644
--- a/addons/website_partner/controllers/main.py
+++ b/addons/website_partner/controllers/main.py
@@ -1,43 +1,25 @@
 # -*- coding: utf-8 -*-
 
-import openerp
+import werkzeug
+
 from openerp import SUPERUSER_ID
 from openerp.addons.web import http
 from openerp.addons.web.http import request
-import werkzeug
 
-
-def get_partner_template_value(partner):
-    ctx = dict(request.context, show_address=True)
-    partner_obj = request.registry['res.partner']
-    partner_id = partner.id
-    partner_ids = partner_obj.search(request.cr, request.uid, [('id', '=', partner_id)], context=request.context)
-    if not partner.exists() or not partner_ids:
-        partner = None
-
-    partner_data = partner_obj.read(
-            request.cr, openerp.SUPERUSER_ID, [partner_id], request.website.get_partner_white_list_fields(), context=ctx)[0]
-
-    if not partner_data["website_published"]:
+def get_partner_template_value(partner_id):
+    partner = request.registry['res.partner'].browse(request.cr, SUPERUSER_ID, partner_id, context=request.context)
+    if not partner.exists() or not partner.website_published:
         return None
-
-    partner_data['name_get'] = partner_obj.name_get(request.cr, openerp.SUPERUSER_ID, [partner_id],context=request.context)[0]
-
-    partner_data['address'] = '<br/>'.join(partner_obj.name_get(
-            request.cr, openerp.SUPERUSER_ID, [partner_id],context=ctx)[0][1].split('\n')[1:])
-
-    values = {
+    return {
         'partner': partner,
-        'partner_data': partner_data,
     }
-    return values
 
 class WebsitePartner(http.Controller):
     @http.route(['/partners/<int:partner_id>', '/partners/<partner_name>-<int:partner_id>'], type='http', auth="public", website=True, multilang=True)
-    def partner(self, partner_id, **post):
+    def partner(self, partner_id, partner_name='', **post):
         """ Route for displaying a single partner / customer. """
-        partner = request.registry['res.partner'].browse(request.cr, SUPERUSER_ID, partner_id, context=request.context)
-        values = get_partner_template_value(partner)
+        values = get_partner_template_value(partner_id)
         if not values:
-            raise werkzeug.exceptions.NotFound
-        return request.website.render("website_partner.partner_detail", values)
+            raise werkzeug.exceptions.NotFound()
+
+        return request.website.render("website_partner.partner_page", values)
diff --git a/addons/website_partner/data/website_data.xml b/addons/website_partner/data/website_data.xml
index dbb20996241..0aebb741fe6 100644
--- a/addons/website_partner/data/website_data.xml
+++ b/addons/website_partner/data/website_data.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <record id="base.main_company" model="res.company">
+        <record id="base.main_partner" model="res.partner">
             <field name="website_published">True</field>
         </record>
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/website_partner/models/__init__.py b/addons/website_partner/models/__init__.py
index 8c589da4c10..4e5bc1614d1 100644
--- a/addons/website_partner/models/__init__.py
+++ b/addons/website_partner/models/__init__.py
@@ -1,3 +1 @@
 import res_partner
-import res_company
-import website
\ No newline at end of file
diff --git a/addons/website_partner/models/res_company.py b/addons/website_partner/models/res_company.py
deleted file mode 100644
index b03232020e9..00000000000
--- a/addons/website_partner/models/res_company.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from openerp.osv import osv, fields
-
-
-class WebsiteResCompany(osv.Model):
-    _inherit = 'res.company'
-    _columns = {
-        'website_published': fields.related('partner_id', 'website_published', string='Publish', help="Publish on the website"),
-    }
diff --git a/addons/website_partner/models/res_partner.py b/addons/website_partner/models/res_partner.py
index aa9a7cc02a3..e762455debe 100644
--- a/addons/website_partner/models/res_partner.py
+++ b/addons/website_partner/models/res_partner.py
@@ -5,7 +5,10 @@ from openerp.osv import osv, fields
 
 class WebsiteResPartner(osv.Model):
     _name = 'res.partner'
-    _inherit = ['res.partner','website.seo.metadata']
+    _inherit = ['res.partner', 'website.seo.metadata']
+
+    def _get_ids(self, cr, uid, ids, flds, args, context=None):
+        return {i: i for i in ids}
 
     _columns = {
         'website_published': fields.boolean(
@@ -16,10 +19,10 @@ class WebsiteResPartner(osv.Model):
         'website_short_description': fields.text(
             'Website artner Short Description'
         ),
+        # hack to allow using plain browse record in qweb views
+        'self': fields.function(_get_ids, type='many2one', relation=_name),
     }
+
     _defaults = {
         'website_published': False
     }
-
-    def img(self, cr, uid, ids, field='image_small', context=None):
-        return "/website/image?model=%s&field=%s&id=%s" % (self._name, field, ids[0])
diff --git a/addons/website_partner/models/website.py b/addons/website_partner/models/website.py
deleted file mode 100644
index b957c5c2f52..00000000000
--- a/addons/website_partner/models/website.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- coding: utf-8 -*-
-from openerp.osv import orm
-
-
-class Website(orm.Model):
-    _inherit = 'website'
-
-    def get_partner_white_list_fields(self, cr, uid, ids, context=None):
-        return ["name", "parent_id", 'website_short_description', "website_published", 
-            "website_description", "tel", "fax", "image", "image_small", "image_medium"]
\ No newline at end of file
diff --git a/addons/website_partner/views/website_partner_view.xml b/addons/website_partner/views/website_partner_view.xml
index 51ff8d1aeed..3a2466fb00b 100644
--- a/addons/website_partner/views/website_partner_view.xml
+++ b/addons/website_partner/views/website_partner_view.xml
@@ -2,54 +2,33 @@
 <openerp>
 <data>
 
-<template id="partner_detail" name="Partner Details (Complex Template for Access Right)">
-    <t t-if="partner" >
-        <t t-call="website.publish_management">
-            <t t-set="object" t-value="partner"/>
-            <t t-set="publish_edit" t-value="True"/>
-        </t>
-    </t>
-    <t t-if="partner"><h1 class="col-md-12 text-center" t-field="partner.name"/></t>
-    <t t-if="not partner"><h1 class="col-md-12 text-center" t-esc="partner_data.get('name_get')[1]"/></t>
-    <div class="col-md-4">
-        <div class="text-center">
-            <t t-if="partner"><img t-att-src="partner.img('image')"/></t>
-            <t t-if="not partner"><img t-attf-src="data:image/png;base64,#{partner_data.get('image')}"/></t>
+<template id="partner_page" name="Partner Page">
+  <t t-call="website.layout">
+    <div id="wrap">
+      <div class="oe_structure"/>
+      <div class="container">
+        <div class="row">
+          <t t-call="website_partner.partner_detail"></t>
         </div>
-        <address>
-            <table style="margin: auto;" class="well">
-                <colgroup>
-                    <col width="100"/>
-                    <col/>
-                </colgroup>
-                <tbody>
-                    <t t-if="partner">
-                        <t t-set="address" t-value="'&lt;br/&gt;'.join(partner.name_get()[0][1].split('\n')[1:])"/>
-                        <tr t-if="address or editable"><th class="texttop">Address</th><td class="span2" t-raw="address"/></tr>
-                    </t>
-                    <tr t-if="not partner and partner_data.get('address')"><th class="texttop">Address</th><td class="span2" t-raw="partner_data.get('address')"/></tr>
+      </div>
+      <div class="oe_structure"/>
+    </div>
+  </t>
+</template> 
 
-                    <tr t-if="partner and (partner.website or editable)"><th>Website</th><td class="span2">
-                        <t t-if="partner.website"><span t-field="partner.website"/></t></td></tr>
-                    <tr t-if="partner_data.get('website')"><th>Website</th><td class="span2"><span t-esc="partner_data.get('website')"/></td></tr>
-
-                    <tr t-if="partner and (partner.phone or editable)"><th>Phone</th><td class="span2">
-                        <t t-if="partner.phone"><span t-field="partner.phone"/></t></td></tr>
-                    <tr t-if="partner_data.get('phone')"><th>Phone</th><td class="span2"><span t-esc="partner_data.get('phone')"/></td></tr>
-
-                    <tr t-if="partner and (partner.mobile or editable)"><th>Tel</th><td class="span2">
-                        <t t-if="partner.mobile"><span t-field="partner.mobile"/></t></td></tr>
-                    <tr t-if="partner_data.get('mobile')"><th>Tel</th><td class="span2"><span t-esc="partner_data.get('mobile')"/></td></tr>
-
-                    <tr t-if="partner and (partner.fax or editable)"><th>Fax</th><td class="span2">
-                        <t t-if="partner.fax"><span t-field="partner.fax"/></t></td></tr>
-                    <tr t-if="partner_data.get('fax')"><th>Fax</th><td class="span2"><span t-esc="partner_data.get('fax')"/></td></tr>
-
-                    <tr t-if="partner and (partner.email or editable)"><th>Email</th><td class="span2">
-                        <t t-if="partner.email"><span t-field="partner.email"/></t></td></tr>
-                    <tr t-if="partner_data.get('email')"><th>Email</th><td class="span2"><span t-esc="partner_data.get('email')"/></td></tr>
-                </tbody>
-            </table>
+<template id="partner_detail" name="Partner Details">
+    <t t-call="website.publish_management">
+        <t t-set="object" t-value="partner"/>
+        <t t-set="publish_edit" t-value="True"/>
+    </t>
+    <h1 class="col-md-12 text-center" id="partner_name" t-field="partner.display_name"/>
+    <div class="col-md-4">
+        <div t-field="partner.image" t-field-options='{"widget": "image", "class": "center-block"}'/>
+        <address class="well">
+             <div t-field="partner.self" t-field-options='{
+                 "widget": "contact",
+                 "fields": ["address", "website", "phone", "fax", "email"]
+             }'/>
         </address>
         <t t-raw="left_column or ''"/>
     </div>
@@ -61,9 +40,6 @@
                 <div class="css_non_editable_mode_hidden" t-field="partner.website_short_description"/>
             </t>
         </t>
-        <t t-if="not partner">
-            <div class="col-md-8 mt32" t-raw="partner_data.get('website_description')"/>
-        </t>
         <t t-raw="right_column or ''"/>
     </div>
 </template>

From 65736e064431b9c4e7fd6bbb143f8569335bf593 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Tue, 13 May 2014 05:59:29 +0000
Subject: [PATCH 099/225] Launchpad automatic translations update.

---
 addons/sale/i18n/fr_CA.po | 2288 +++++++++++++++++++++++++++++++++++++
 1 file changed, 2288 insertions(+)
 create mode 100644 addons/sale/i18n/fr_CA.po

diff --git a/addons/sale/i18n/fr_CA.po b/addons/sale/i18n/fr_CA.po
new file mode 100644
index 00000000000..56acd05eb3f
--- /dev/null
+++ b/addons/sale/i18n/fr_CA.po
@@ -0,0 +1,2288 @@
+# French (Canada) translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2014-05-13 02:46+0000\n"
+"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
+"<maxime.chambreuil@savoirfairelinux.com>\n"
+"Language-Team: French (Canada) <fr_CA@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: 2014-05-13 05:59+0000\n"
+"X-Generator: Launchpad (build 17002)\n"
+
+#. module: sale
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Confirmer la soumission"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
+msgstr ""
+
+#. module: sale
+#: model:email.template,report_name:sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Use multiple analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:565
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation Number"
+msgstr "Numéro de soumission"
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr ""
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_confirmed
+msgid "Quotation confirmed"
+msgstr "Soumission confirmée"
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation "
+msgstr "Soumission "
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr "Soumission en brouillon"
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Delivery Address"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
+#: view:sale.order:0
+msgid "Cancel Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:101
+#, python-format
+msgid "Incorrect Data"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:102
+#, python-format
+msgid "The value of Advance Amount must be positive."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sales order line."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order Status"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:185
+#: code:addons/sale/sale.py:363
+#: code:addons/sale/sale.py:504
+#: code:addons/sale/sale.py:598
+#: code:addons/sale/sale.py:763
+#: code:addons/sale/sale.py:780
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"From stock: When needed, the product is taken from the stock or we wait for "
+"replenishment.\n"
+"On order: When needed, the product is purchased or produced."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr "Soumission envoyée"
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Shipping Exception"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_exception
+msgid "Sales in Exception"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr ""
+
+#. module: sale
+#: view:res.partner:0
+msgid "False"
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sales "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tax"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:277
+#: code:addons/sale/sale.py:820
+#: code:addons/sale/sale.py:983
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Gives the status of the quotation or sales order.              \n"
+"The exception status is automatically set when a cancel operation occurs     "
+"          in the invoice validation (Invoice Exception) or in the picking "
+"list process (Shipping Exception).\n"
+"The 'Waiting Schedule' status is set when the invoice is confirmed           "
+"    but waiting for the scheduler to run on the order date."
+msgstr ""
+"Donne le statut d'une soumission ou d'une commande de vente.\n"
+"Le statut 'Exception' est automatiquement défini quand une opération "
+"d'annulation est effectuée dans la validation de la facture (Exception de "
+"facturation) ou dans le processus de colisage (Exception de colisage).\n"
+"Le statut 'En attente' est défini quand une facture est confirmée mais on "
+"attend le lancement du planificateur à la date de la commande."
+
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,product_uom_qty:0
+msgid "# of Qty"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Fax :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:277
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Features"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:287
+#: code:addons/sale/sale.py:584
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#, python-format
+msgid "Sales Order"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sales order has at least one invoice."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_pricelist:0
+msgid ""
+"Allows to manage different prices based on rules per category of customers.\n"
+"Example: 10% for retailers, promotion of 5 EUR on this product, etc."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,payment_default_id:0
+msgid "Default Payment Term"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:820
+#, python-format
+msgid "You cannot cancel a sales order line that has already been invoiced."
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Shipped Quantities"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_uom:0
+msgid "Allow using different units of measures"
+msgstr ""
+
+#. module: sale
+#: model:mail.message.subtype,name:sale.mt_order_confirmed
+msgid "Sales Order Confirmed"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:764
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr ""
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sales orders."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_sale_journal:0
+msgid ""
+"Allows you to categorize your sales and deliveries (picking lists) between "
+"different journals,\n"
+"                and perform batch operations on journals.\n"
+"                This installs the module sale_journal."
+msgstr ""
+
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr ""
+
+#. module: sale
+#: 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 ""
+
+#. module: sale
+#: code:addons/sale/res_config.py:97
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sales Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Total :"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "My Sales"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,state:0
+msgid ""
+"* The 'Draft' status is set when the related sales order in draft status.    "
+"                 \n"
+"* The 'Confirmed' status is set when the related sales order is confirmed.   "
+"                  \n"
+"* The 'Exception' status is set when the related sales order is set as "
+"exception.                     \n"
+"* The 'Done' status is set when the sales order line has been picked.        "
+"             \n"
+"* The 'Cancelled' status is set when a user cancel the sales order related."
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:960
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:91
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:95
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Send by Email"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/edi/sale_order.py:140
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Delivery Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order Date"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:364
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr "Soumissions et ventes"
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Reference Unit of Measure"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Create and View Invoice"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales order lines done"
+msgstr ""
+
+#. module: sale
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:307
+#, python-format
+msgid "Pricelist Warning!"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:107
+#, python-format
+msgid ""
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid "Create & View Invoice"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Mes soumissions"
+
+#. module: sale
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,categ_id:0
+msgid "Category of Product"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:564
+#, python-format
+msgid "Cannot cancel this sales order!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sales Orders"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Taxes :"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
+#, python-format
+msgid "Advance Invoice"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sales order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:598
+#, python-format
+msgid "You cannot confirm a sales order which has no line."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:865
+#, python-format
+msgid "No Customer Defined !"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Trigger delivery orders automatically from sales orders"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,address_allotment_id:0
+msgid "A partner to whom the particular product needs to be allotted."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract / Analytic"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoiced_rate:0
+msgid "Invoiced Ratio"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Demand"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sales order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Cliquez pour définir un nouveau magasin.\n"
+"              </p><p>\n"
+"                Chaque soumission ou vente doit être liée à un magasin.\n"
+"                Le magasin définit également de quel entrepôt les produits "
+"seront\n"
+"                livrés pour chaque vente.\n"
+"              </p>\n"
+"            "
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sales Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: view:sale.order:0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Soumission"
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+"Vous permet de faire des soumissions, des commandes de vente en utilisant "
+"différentes politique de commande et de gérer les stock associés.\n"
+"                    Ceci installe le module 'sale_stock'."
+
+#. module: sale
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'.\n"
+"                You may have to create it and set it as a default value on "
+"this field."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_in_progress
+msgid "Sales Order in Progress"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid ""
+"All items in these order lines will be invoiced. You can also invoice a "
+"percentage of the sales order\n"
+"                    or a fixed price (for advances) directly from the sales "
+"order form if you prefer."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_warning:0
+msgid ""
+"Allow to configure notification on products and trigger them when a user "
+"wants to sale a given product or a given customer.\n"
+"Example: Product: this product is deprecated, do not purchase more than 5.\n"
+"                Supplier: don't forget to ask for an express delivery."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+"Le vendeur confirme la soumission. L'état du bon de commande devient \"En "
+"cours\" ou \"Manuel, en cours\""
+
+#. module: sale
+#: code:addons/sale/sale.py:942
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:955
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_quotations
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Soumissions"
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Delivery address for current sales order."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_sale_margin:0
+msgid "Display margins on sales orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_ids:0
+msgid ""
+"This is the list of invoices that have been generated for this sales order. "
+"The same sales order may have been invoiced in several times (by line for "
+"example)."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Your Reference"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:444
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:308
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "Date de soumission"
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:121
+#: model:ir.model,name:sale.model_account_invoice
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+#, python-format
+msgid "Invoice"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Cancel"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:944
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order "
+msgstr ""
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_sent
+#: model:mail.message.subtype,name:sale.mt_order_sent
+msgid "Quotation send"
+msgstr "Envoi de la soumission"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
+#. module: sale
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:505
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sales order will automatically create the invoice proposition (draft "
+"invoice).                                              You have to choose  "
+"if you want your invoice based on ordered "
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:952
+#, python-format
+msgid ""
+"Cannot find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#: field:sale.order,order_policy:0
+#: view:sale.order.line:0
+msgid "Create Invoice"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Percentage"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr ""
+
+#. module: sale
+#: model:email.template,body_html:sale.email_template_edi_sale
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Bonjour ${object.partner_id.name},</p>\n"
+"    \n"
+"    <p>Veuillez trouver ci-joint votre ${object.state in ('draft', 'sent') "
+"and 'soumission' or 'confirmation de commande'} de la part de  "
+"${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>RÉFÉRENCES</strong><br />\n"
+"       &nbsp;&nbsp;Numéro: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Montant total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Référence: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Votre référence: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Votre contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>Il vous est possible de payer directement avec Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>Si vous avez des questions, n'hésitez pas à nous contacter.</p>\n"
+"    <p>Merci d'avoir choisi ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Tél:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.order.line,product_id:0
+#: view:sale.report:0
+#: field:sale.report,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Confirm Sale"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+msgstr ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Soumission' or 'Commande'} (Réf. ${object.name or 'n/a' })"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,order_policy:0
+msgid ""
+"On demand: A draft invoice can be created from the sales order when needed. "
+"\n"
+"On delivery order: A draft invoice can be created from the delivery order "
+"when the products have been delivered. \n"
+"Before delivery: A draft invoice is created from the sales order and must be "
+"paid before the products can be delivered."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
+msgstr ""
+"Ce rapport analyse vos soumissions et commandes clients. Il vérifie les "
+"revenus liés aux ventes et les classifie selon différents critères (vendeur, "
+"partenaire, article, etc.). Vous pouvez utiliser ce rapport pour analyser "
+"vos ventes non encore facturées. Si vous souhaitez analyser votre chiffre "
+"d'affaires, vous devriez utiliser le rapport \"Analyse des factures "
+"clients\" dans l'application comptabilité."
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Soumission / Commande"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tel. :"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_quotations
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation, the first step of a new sale.\n"
+"              </p><p>\n"
+"                OpenERP will help you handle efficiently the complete sale "
+"flow:\n"
+"                from the quotation to the sales order, the\n"
+"                delivery, the invoicing and the payment collection.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sales\n"
+"                order, and allow your customers to keep track of the "
+"evolution\n"
+"                of the sales order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Cliquez pour créer une soumission, la première étape d'une "
+"commande de vente.\n"
+"              </p><p>\n"
+"                OpenERP vous aidera à compléter efficacement le flux de "
+"vente :\n"
+"                de la soumission à la commande de vente, la \n"
+"                livraison, la facturation et les paiements.\n"
+"              </p><p>\n"
+"                La fonctionnalité sociale vous aide à organiser les "
+"discussions sur chaque\n"
+"                commande de vente, et permet à vos clients de garder une "
+"trace de \n"
+"                l'évolution des commandes de vente.\n"
+"              </p>\n"
+"            "
+
+#. module: sale
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:781
+#, python-format
+msgid ""
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order Number"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,partner_id:0
+#: field:sale.order.line,order_partner_id:0
+msgid "Customer"
+msgstr ""
+
+#. module: sale
+#: model:product.template,name:sale.advance_product_0_product_template
+msgid "Advance"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_orders
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sales\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Cliquez pour créer une soumission qui pourra être convertie "
+"en commande\n"
+"                de vente.\n"
+"              </p><p>\n"
+"                OpenERP vous aidera à compléter efficacement le flux de "
+"vente :\n"
+"                soumission, commande, livraison, facturation et paiement.\n"
+"              </p>\n"
+"            "
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Before Delivery"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:107
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#: code:addons/sale/wizard/sale_make_invoice.py:55
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Anciennes soumissions"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sales order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sales\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sales order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Cliquez pour créer une soumission ou une commande de vente "
+"pour votre client.\n"
+"              </p><p>\n"
+"                OpenERP vous aidera à compléter efficacement le flux de "
+"vente :\n"
+"                soumission, commande, livraison, facturation et paiement.\n"
+"              </p><p>\n"
+"                La fonctionnalité sociale vous aide à organiser les "
+"discussions sur chaque\n"
+"                commande de vente, et permet à vos clients de garder une "
+"trace de \n"
+"                l'évolution des commandes de vente.\n"
+"\n"
+"              </p>\n"
+"            "
+
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,name:0
+msgid "Description"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid ""
+"Use contract to be able to manage your services with\n"
+"                        multiple invoicing as part of the same contract "
+"with\n"
+"                        your customer."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Confirmed sales order lines, not yet delivered"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:983
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order,payment_term:0
+msgid "Payment Term"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sales order lines"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation N°"
+msgstr "Soumission N°"
+
+#. module: sale
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Picked"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:865
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "New Copy of Quotation"
+msgstr "Nouvelle copie de soumission"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr ""

From 0e41af84a98a3e2a29bbc6a813c7e84445805640 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Tue, 13 May 2014 06:28:18 +0000
Subject: [PATCH 100/225] Launchpad automatic translations update.

---
 openerp/addons/base/i18n/es.po |  8 +++---
 openerp/addons/base/i18n/nb.po | 47 +++++++++++++++++++---------------
 2 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/openerp/addons/base/i18n/es.po b/openerp/addons/base/i18n/es.po
index 3e2e43cf878..07f23939afb 100644
--- a/openerp/addons/base/i18n/es.po
+++ b/openerp/addons/base/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:35+0000\n"
-"PO-Revision-Date: 2014-01-03 14:00+0000\n"
+"PO-Revision-Date: 2014-05-13 01:13+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@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: 2014-04-30 06:55+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-05-13 06:28+0000\n"
+"X-Generator: Launchpad (build 17002)\n"
 
 #. module: base
 #: help:ir.actions.act_window,res_id:0
@@ -1370,7 +1370,7 @@ msgid ""
 msgstr ""
 "\n"
 "El genérico de OpenERP para la gestión de relaciones con el cliente (CRM)\n"
-"==========================================================\n"
+"=========================================================================\n"
 "\n"
 "Esta aplicación permite que grupo de personas gestione iniciativas de forma "
 "inteligente y eficaz, oportunidades, reuniones y llamadas.\n"
diff --git a/openerp/addons/base/i18n/nb.po b/openerp/addons/base/i18n/nb.po
index fc3eac424c4..8f4cfa5853b 100644
--- a/openerp/addons/base/i18n/nb.po
+++ b/openerp/addons/base/i18n/nb.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:35+0000\n"
-"PO-Revision-Date: 2014-05-11 21:08+0000\n"
+"PO-Revision-Date: 2014-05-12 17:21+0000\n"
 "Last-Translator: Kenneth Aalberg <kenneaal@gmail.com>\n"
 "Language-Team: Norwegian Bokmal <nb@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: 2014-05-12 06:38+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-13 06:27+0000\n"
+"X-Generator: Launchpad (build 17002)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -8695,7 +8695,7 @@ msgstr "Canada"
 #. module: base
 #: view:base.language.export:0
 msgid "Launchpad"
-msgstr ""
+msgstr "Launchpad"
 
 #. module: base
 #: help:res.currency.rate,currency_rate_type_id:0
@@ -8703,11 +8703,13 @@ msgid ""
 "Allow you to define your own currency rate types, like 'Average' or 'Year to "
 "Date'. Leave empty if you simply want to use the normal 'spot' rate type"
 msgstr ""
+"Lar deg definere dine egne valutaratetyper, slik som gjennomsnittlig, eller "
+"'årsvis til dags dato'. La stå tomt hvis du vil bruke den vanlige spotraten."
 
 #. module: base
 #: selection:ir.module.module.dependency,state:0
 msgid "Unknown"
-msgstr "Unknown"
+msgstr "Ukjent"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_res_users_my
@@ -8718,7 +8720,7 @@ msgstr "Endre mine preferanser"
 #: code:addons/base/ir/ir_actions.py:171
 #, python-format
 msgid "Invalid model name in the action definition."
-msgstr "Ugyldig navn på modell i handlingsdefinisjonen."
+msgstr "Ugyldig modellnavn i handlingsdefinisjonen"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_ro
@@ -8751,12 +8753,12 @@ msgstr "Tilpasset felt"
 #. module: base
 #: model:ir.module.module,summary:base.module_account_accountant
 msgid "Financial and Analytic Accounting"
-msgstr ""
+msgstr "Finans og analytisk regnskap"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_portal_project
 msgid "Portal Project"
-msgstr ""
+msgstr "Portalprosjekt"
 
 #. module: base
 #: model:res.country,name:base.cc
@@ -8768,18 +8770,18 @@ msgstr "Cocos (Keeling) øyene"
 #: selection:base.module.import,state:0
 #: selection:base.module.update,state:0
 msgid "init"
-msgstr ""
+msgstr "init"
 
 #. module: base
 #: view:res.partner:0
 #: field:res.partner,user_id:0
 msgid "Salesperson"
-msgstr ""
+msgstr "Selger"
 
 #. module: base
 #: view:res.lang:0
 msgid "11. %U or %W       ==> 48 (49th week)"
-msgstr "11. %U eler %W       ==> 48 (49. uke)"
+msgstr "11. %U eller %W       ==> 48 (49. uke)"
 
 #. module: base
 #: model:ir.model,name:base.model_res_partner_bank_type_field
@@ -8789,13 +8791,13 @@ msgstr "Banktypefelter"
 #. module: base
 #: constraint:ir.rule:0
 msgid "Rules can not be applied on Transient models."
-msgstr ""
+msgstr "Regler kan ikke bli lagt til på transiente modeller."
 
 #. module: base
 #: code:addons/base/ir/ir_mail_server.py:215
 #, python-format
 msgid "Connection Test Failed!"
-msgstr ""
+msgstr "Tilkoblingstest feilet!"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -8805,7 +8807,7 @@ msgstr "Nederlandsk / Nederlands"
 #. module: base
 #: selection:res.company,paper_format:0
 msgid "US Letter"
-msgstr ""
+msgstr "US Letter"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_partner_customer_form
@@ -8823,24 +8825,24 @@ msgstr ""
 #. module: base
 #: model:ir.actions.act_window,name:base.bank_account_update
 msgid "Company Bank Accounts"
-msgstr ""
+msgstr "Firmaets bankkontoer"
 
 #. module: base
 #: code:addons/base/res/res_users.py:473
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
-msgstr "Tomme passord er ikke tillat!"
+msgstr "Tomme passord er ikke tillatt!"
 
 #. module: base
 #: help:ir.mail_server,smtp_pass:0
 msgid "Optional password for SMTP authentication"
-msgstr ""
+msgstr "Opsjonelt passord for SMTP autentisering"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:727
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
-msgstr ""
+msgstr "Beklager, du har ikke tillatelse til å modifisere dette dokumentet."
 
 #. module: base
 #: code:addons/base/res/res_config.py:380
@@ -8850,16 +8852,19 @@ msgid ""
 "\n"
 "This addon is already installed on your system"
 msgstr ""
+"\n"
+"\n"
+"Dette tillegget er allerede installert på ditt system"
 
 #. module: base
 #: help:ir.cron,interval_number:0
 msgid "Repeat every x."
-msgstr "Gjennta hvert x."
+msgstr "Gjenta hvert x."
 
 #. module: base
 #: model:res.partner.bank.type,name:base.bank_normal
 msgid "Normal Bank Account"
-msgstr ""
+msgstr "Normal bankkonto"
 
 #. module: base
 #: field:change.password.user,wizard_id:0
@@ -8871,7 +8876,7 @@ msgstr "Veiviser"
 #: code:addons/base/ir/ir_fields.py:303
 #, python-format
 msgid "database id"
-msgstr ""
+msgstr "database id"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_base_import

From f173d926c83eb9c03ed83eb432690cd11307c4ad Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Tue, 13 May 2014 06:28:52 +0000
Subject: [PATCH 101/225] Launchpad automatic translations update.

---
 addons/account/i18n/zh_TW.po     |    8 +-
 addons/delivery/i18n/tr.po       |   16 +-
 addons/mrp/i18n/tr.po            |  130 +-
 addons/mrp_byproduct/i18n/tr.po  |   14 +-
 addons/mrp_operations/i18n/tr.po |   34 +-
 addons/mrp_repair/i18n/tr.po     |   46 +-
 addons/sale/i18n/fr_CA.po        | 2323 ++++++++++++++++++++++++++++++
 7 files changed, 2448 insertions(+), 123 deletions(-)
 create mode 100644 addons/sale/i18n/fr_CA.po

diff --git a/addons/account/i18n/zh_TW.po b/addons/account/i18n/zh_TW.po
index ffe735e0196..50641d372c8 100644
--- a/addons/account/i18n/zh_TW.po
+++ b/addons/account/i18n/zh_TW.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-14 22:29+0000\n"
-"PO-Revision-Date: 2014-04-28 06:10+0000\n"
+"PO-Revision-Date: 2014-05-12 08:16+0000\n"
 "Last-Translator: Andy Cheng <andy@dobtor.com>\n"
 "Language-Team: Chinese (Traditional) <zh_TW@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: 2014-04-29 06:41+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-05-13 06:28+0000\n"
+"X-Generator: Launchpad (build 17002)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -276,6 +276,8 @@ msgid ""
 "sales, purchase, expense, contra, etc.\n"
 "                This installs the module account_voucher."
 msgstr ""
+"此模組包含銀行帳、現今、銷售、費用等分錄所需要的基本功能。\n"
+"                將安裝「account_voucher」模組"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_use_model_create_entry
diff --git a/addons/delivery/i18n/tr.po b/addons/delivery/i18n/tr.po
index 214f49cdad7..8e439937508 100644
--- a/addons/delivery/i18n/tr.po
+++ b/addons/delivery/i18n/tr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-07-03 11:40+0000\n"
-"Last-Translator: Ayhan KIZILTAN <Unknown>\n"
+"PO-Revision-Date: 2014-05-12 09:30+0000\n"
+"Last-Translator: Ediz Duman <neps1192@gmail.com>\n"
 "Language-Team: Turkish <tr@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: 2013-11-21 06:07+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-05-13 06:28+0000\n"
+"X-Generator: Launchpad (build 17002)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -36,12 +36,12 @@ msgstr " bu İşlevde "
 #: view:delivery.carrier:0
 #: view:delivery.grid:0
 msgid "Destination"
-msgstr "Varış yeri"
+msgstr "İstikamet"
 
 #. module: delivery
 #: field:stock.move,weight_net:0
 msgid "Net weight"
-msgstr "Net ağırlık"
+msgstr "Net Ağırlık"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_grid_line
@@ -155,7 +155,7 @@ msgstr "Teslim Emri:"
 #. module: delivery
 #: field:delivery.grid.line,variable_factor:0
 msgid "Variable Factor"
-msgstr "Değişken Faktör"
+msgstr "Değişken Faktörü"
 
 #. module: delivery
 #: field:delivery.carrier,amount:0
@@ -472,7 +472,7 @@ msgstr ""
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
 msgid "Maximum Value"
-msgstr "Ençok Değer"
+msgstr "En Çok Değer"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/mrp/i18n/tr.po b/addons/mrp/i18n/tr.po
index 61867b69c2b..ef253022b87 100644
--- a/addons/mrp/i18n/tr.po
+++ b/addons/mrp/i18n/tr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-11-28 21:23+0000\n"
+"PO-Revision-Date: 2014-05-12 09:31+0000\n"
 "Last-Translator: Ediz Duman <neps1192@gmail.com>\n"
 "Language-Team: Turkish <tr@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: 2013-11-29 05:30+0000\n"
-"X-Generator: Launchpad (build 16847)\n"
+"X-Launchpad-Export-Date: 2014-05-13 06:28+0000\n"
+"X-Generator: Launchpad (build 17002)\n"
 
 #. module: mrp
 #: help:mrp.config.settings,module_mrp_repair:0
@@ -56,7 +56,7 @@ msgstr "İş Merkezi Kullanımı"
 #. module: mrp
 #: view:mrp.routing.workcenter:0
 msgid "Routing Work Centers"
-msgstr "İş Merkezleri Yönlendirme"
+msgstr "İş Merkezlerine Yönlendirme"
 
 #. module: mrp
 #: field:mrp.production.workcenter.line,cycle:0
@@ -83,7 +83,7 @@ msgstr "Saat Maliyeti"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Scrap Products"
-msgstr "Hurda Ürünler"
+msgstr "Fire Ürünler"
 
 #. module: mrp
 #: view:mrp.workcenter:0
@@ -159,7 +159,7 @@ msgstr ""
 #: model:process.transition,name:mrp.process_transition_servicerfq0
 #: model:process.transition,name:mrp.process_transition_stockrfq0
 msgid "To Buy"
-msgstr "Satınalınır"
+msgstr "Satınalma"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_purchaseprocure0
@@ -236,7 +236,7 @@ msgstr "İş Maliyeti"
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_procureserviceproduct0
 msgid "Procurement of services"
-msgstr "Hizmet tedariki"
+msgstr "Hizmet alımları"
 
 #. module: mrp
 #: view:mrp.workcenter:0
@@ -498,7 +498,7 @@ msgstr ""
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_report_in_out_picking_tree
 msgid "Weekly Stock Value Variation"
-msgstr "Haftalık Stok Değeri Farkları"
+msgstr "Haftalık Stok Değer Farkları"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_property_action
@@ -568,12 +568,12 @@ msgstr ""
 #. module: mrp
 #: view:board.board:0
 msgid "Stock Value Variation"
-msgstr "Stok Değeri Çeşitliliği"
+msgstr "Stok Değer Çeşitliliği"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action2
 msgid "Bill of Materials Structure"
-msgstr "Ürün Ağacı Yapısı"
+msgstr "Ürün Ağac Yapısı"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct0
@@ -593,7 +593,7 @@ msgstr "Üretim ayrıştırma"
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct1
 msgid "For Services."
-msgstr "Hizmetler için."
+msgstr "Hizmetler İçin."
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_orderrfq0
@@ -638,7 +638,7 @@ msgstr "Üretim Konumu"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Force Reservation"
-msgstr "Rezerveye Zorla"
+msgstr "Rezerve Zorla"
 
 #. module: mrp
 #: field:report.mrp.inout,value:0
@@ -648,7 +648,7 @@ msgstr "Stok değeri"
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_product_bom_structure
 msgid "Product BoM Structure"
-msgstr "Ürünün Ürün Ağacı Yapısı"
+msgstr "Ürünün BoM Yapısı"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -664,12 +664,12 @@ msgstr "Rota İş Merkezlerinin listesini gösterirken sıra numarası verir"
 #. module: mrp
 #: field:mrp.bom,child_complete_ids:0
 msgid "BoM Hierarchy"
-msgstr "Ürün Ağacı Sıradüzeni"
+msgstr "BoM Sıradüzeni"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_stockproduction0
 msgid "To Produce"
-msgstr "Üretilir"
+msgstr "Üretiliyor"
 
 #. module: mrp
 #: help:mrp.config.settings,module_stock_no_autopicking:0
@@ -701,7 +701,7 @@ msgstr "Toplama İstisnası"
 #. module: mrp
 #: field:mrp.bom,bom_lines:0
 msgid "BoM Lines"
-msgstr "Ürün Ağacı Kalemleri"
+msgstr "BoM Satırları"
 
 #. module: mrp
 #: field:mrp.workcenter,time_start:0
@@ -727,7 +727,7 @@ msgstr "Malzeme Rotası"
 #: field:mrp.production,move_lines2:0
 #: report:mrp.production.order:0
 msgid "Consumed Products"
-msgstr "Tüketilen Ürünler"
+msgstr "Sarfedilen Ürünler"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_mrp_workcenter_load_wizard
@@ -740,7 +740,7 @@ msgstr "İş Merkezi Yükü"
 #: code:addons/mrp/procurement.py:55
 #, python-format
 msgid "No BoM defined for this product !"
-msgstr "Bu ürün için herhangi bir Ürün Ağacı tanımlanmadı !"
+msgstr "Bu ürün için herhangi bir BoM tanımlanmadı !"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_bom_form_action2
@@ -994,7 +994,7 @@ msgstr "Üretim Emri"
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_productionprocureproducts0
 msgid "Procurement of raw material"
-msgstr "Ham malzeme tedariki"
+msgstr "Hammade tedariği"
 
 #. module: mrp
 #: sql_constraint:mrp.bom:0
@@ -1063,7 +1063,7 @@ msgstr ""
 #. module: mrp
 #: field:mrp.bom,type:0
 msgid "BoM Type"
-msgstr "Ürün Ağacı Türü"
+msgstr "BoM Türü"
 
 #. module: mrp
 #: code:addons/mrp/procurement.py:57
@@ -1077,7 +1077,7 @@ msgstr ""
 #. module: mrp
 #: view:mrp.property:0
 msgid "Search"
-msgstr "Ara"
+msgstr "Arama"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_billofmaterial0
@@ -1087,7 +1087,7 @@ msgstr "Ürünün yapısı"
 #. module: mrp
 #: model:ir.model,name:mrp.model_res_company
 msgid "Companies"
-msgstr "Şirketler"
+msgstr "Firmalar"
 
 #. module: mrp
 #: code:addons/mrp/mrp.py:634
@@ -1102,7 +1102,7 @@ msgstr ""
 #: model:process.node,name:mrp.process_node_minimumstockrule0
 #: model:process.node,name:mrp.process_node_productminimumstockrule0
 msgid "Minimum Stock"
-msgstr "Enaz Stok"
+msgstr "En Az Stok"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:160
@@ -1153,7 +1153,7 @@ msgstr "Üretim Planı."
 #: view:mrp.routing:0
 #: view:mrp.workcenter:0
 msgid "Inactive"
-msgstr "Etkin Değil"
+msgstr "Pasif"
 
 #. module: mrp
 #: view:change.production.qty:0
@@ -1176,7 +1176,7 @@ msgstr ""
 #. module: mrp
 #: view:mrp.production:0
 msgid "Late"
-msgstr "Son"
+msgstr "Geçiken"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_servicemts0
@@ -1186,7 +1186,7 @@ msgstr "Stoğa Üretim"
 #. module: mrp
 #: report:bom.structure:0
 msgid "BOM Name"
-msgstr "Ürün Ağacı Adı"
+msgstr "BOM Adı"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_product_manufacturing_open
@@ -1200,7 +1200,7 @@ msgstr "Üretim Emirleri"
 #. module: mrp
 #: selection:mrp.production,state:0
 msgid "Awaiting Raw Materials"
-msgstr "Ham malzeme Bekliyor"
+msgstr "Hammade Bekliyor"
 
 #. module: mrp
 #: field:mrp.bom,position:0
@@ -1210,7 +1210,7 @@ msgstr "İç Referans"
 #. module: mrp
 #: field:mrp.production,product_uos_qty:0
 msgid "Product UoS Quantity"
-msgstr "Ürün Hizmet Birimi Miktarı"
+msgstr "Ürün UOS Miktarı"
 
 #. module: mrp
 #: field:mrp.bom,name:0
@@ -1276,7 +1276,7 @@ msgstr ""
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action3
 msgid "Manufacturing Orders in Progress"
-msgstr "Süren Üretim Emirleri"
+msgstr "Devam eden Üretim Emirleri"
 
 #. module: mrp
 #: model:ir.actions.client,name:mrp.action_client_mrp_menu
@@ -1336,7 +1336,7 @@ msgstr ""
 #. module: mrp
 #: field:mrp.workcenter,costs_journal_id:0
 msgid "Analytic Journal"
-msgstr "Analitik Günlük"
+msgstr "Analitik Yevmiye"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:139
@@ -1426,7 +1426,7 @@ msgstr ""
 #: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Invalid Action!"
-msgstr "Geçersiz Eylem!"
+msgstr "Geçersiz İşlem!"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_producttostockrules0
@@ -1541,12 +1541,12 @@ msgstr "Üretimi İş Merkezi"
 #. module: mrp
 #: view:mrp.workcenter:0
 msgid "Search for mrp workcenter"
-msgstr "mrp iş merkezini ara"
+msgstr "Mrp iş merkezini ara"
 
 #. module: mrp
 #: view:mrp.bom:0
 msgid "BoM Structure"
-msgstr "Ürün Ağacı Yapısı"
+msgstr "BoM Yapısı"
 
 #. module: mrp
 #: field:mrp.production,date_start:0
@@ -1568,7 +1568,7 @@ msgstr "Ürün Ölçü Birimi"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Destination Loc."
-msgstr "Hedef Kon."
+msgstr "Hedef Konum"
 
 #. module: mrp
 #: field:mrp.bom,method:0
@@ -1625,12 +1625,12 @@ msgstr "Bu üretim emri isteğinde oluşturulan belge referansı."
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_minimumstockprocure0
 msgid "'Minimum stock rule' material"
-msgstr "'Minimum stok kuralı' malzemesi"
+msgstr "'Minimum stok kuralı' malzemede"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Extra Information"
-msgstr "Ek Bilgi"
+msgstr "Ek Bilgisi"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_change_production_qty
@@ -1640,12 +1640,12 @@ msgstr "Ürün Miktarını Değiştir"
 #. module: mrp
 #: model:process.node,note:mrp.process_node_productionorder0
 msgid "Drives the procurement orders for raw material."
-msgstr "Ham malzeme için satınalma emirlerini yürütür."
+msgstr "Hammade için satınalma emirlerini yürütür."
 
 #. module: mrp
 #: field:mrp.production.product.line,product_uos_qty:0
 msgid "Product UOS Quantity"
-msgstr "Ürün Hizmet Birimi Miktarı"
+msgstr "Ürün UOS Miktarı"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_general_account_id:0
@@ -1655,7 +1655,7 @@ msgstr "Genel Hesap"
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "SO Number"
-msgstr "Satış Sipariş No"
+msgstr "SS Numarası"
 
 #. module: mrp
 #: code:addons/mrp/mrp.py:505
@@ -1666,7 +1666,7 @@ msgstr "'%s' durumundaki bir üretim emri silinemez."
 #. module: mrp
 #: selection:mrp.production,state:0
 msgid "Done"
-msgstr "Yapıldı"
+msgstr "Biten"
 
 #. module: mrp
 #: view:product.product:0
@@ -1775,7 +1775,7 @@ msgstr "Toplam Saat"
 #. module: mrp
 #: field:mrp.production,location_src_id:0
 msgid "Raw Materials Location"
-msgstr "Ham malzeme Konumu"
+msgstr "Hammade Konumu"
 
 #. module: mrp
 #: view:mrp.product_price:0
@@ -1786,12 +1786,12 @@ msgstr "Ürünün Maliyet Yapısını Yazdır."
 #: field:mrp.bom,product_uos:0
 #: field:mrp.production.product.line,product_uos:0
 msgid "Product UOS"
-msgstr "Ürün Hizmet Birimi"
+msgstr "Ürün UOS"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Consume Products"
-msgstr "Ürünleri Tüket"
+msgstr "Sarf Ürünler"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_mrp_product_produce
@@ -1837,7 +1837,7 @@ msgstr ""
 #. module: mrp
 #: field:mrp.production,product_uos:0
 msgid "Product UoS"
-msgstr "Ürün Hizmet Birimi"
+msgstr "Ürün UoS"
 
 #. module: mrp
 #: selection:mrp.production,priority:0
@@ -1926,7 +1926,7 @@ msgstr "Hizmet"
 #. module: mrp
 #: selection:mrp.production,state:0
 msgid "Cancelled"
-msgstr "İptal edildi"
+msgstr "İptal Edildi"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -1971,12 +1971,12 @@ msgstr ""
 #: field:mrp.routing.workcenter,company_id:0
 #: view:mrp.workcenter:0
 msgid "Company"
-msgstr "Şirket"
+msgstr "Firma"
 
 #. module: mrp
 #: view:mrp.bom:0
 msgid "Default Unit of Measure"
-msgstr "Varsayılan Ölçü Birimi"
+msgstr "Öntanımlı Ölçü Birimi"
 
 #. module: mrp
 #: field:mrp.workcenter,time_cycle:0
@@ -1986,7 +1986,7 @@ msgstr "1 Çevrim Süresi (saat)"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Cancel Production"
-msgstr "Üretim İptal et"
+msgstr "Üretimi İptal Et"
 
 #. module: mrp
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
@@ -2032,7 +2032,7 @@ msgstr "Bileşenler"
 #: report:bom.structure:0
 #: model:ir.actions.report.xml,name:mrp.report_bom_structure
 msgid "BOM Structure"
-msgstr "Ürün Ağacı Yapısı"
+msgstr "BOM Yapısı"
 
 #. module: mrp
 #: field:mrp.config.settings,module_mrp_jit:0
@@ -2042,22 +2042,22 @@ msgstr "Gerçek zamanlı tedarik oluştur"
 #. module: mrp
 #: field:mrp.bom,date_stop:0
 msgid "Valid Until"
-msgstr "Geçerlilik sonu"
+msgstr "Geçerlilik Bitiş"
 
 #. module: mrp
 #: field:mrp.bom,date_start:0
 msgid "Valid From"
-msgstr "Geçerlilik Başlangıcı"
+msgstr "Geçerlilik Başlama"
 
 #. module: mrp
 #: selection:mrp.bom,type:0
 msgid "Normal BoM"
-msgstr "Normal Ürün Ağacı"
+msgstr "Normal BoM"
 
 #. module: mrp
 #: field:res.company,manufacturing_lead:0
 msgid "Manufacturing Lead Time"
-msgstr "Üretim Teslimat Süresi"
+msgstr "Üretim Teslim Süresi"
 
 #. module: mrp
 #: code:addons/mrp/mrp.py:285
@@ -2068,7 +2068,7 @@ msgstr "Uyarı"
 #. module: mrp
 #: field:mrp.bom,product_uos_qty:0
 msgid "Product UOS Qty"
-msgstr "Ürün Hizmet Birimi Mik"
+msgstr "Ürün UOS Mik"
 
 #. module: mrp
 #: field:mrp.production,move_prod_id:0
@@ -2124,7 +2124,7 @@ msgstr "Yeni"
 #. module: mrp
 #: selection:mrp.product.produce,mode:0
 msgid "Consume Only"
-msgstr "Yalnızca Tüket"
+msgstr "Sadece Sarf"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -2134,7 +2134,7 @@ msgstr "Toplamayı Yeniden Oluştur"
 #. module: mrp
 #: selection:mrp.bom,method:0
 msgid "On Order"
-msgstr "Sipariş üzerine"
+msgstr "Sipariş Den"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_configuration
@@ -2250,7 +2250,7 @@ msgstr ""
 #. module: mrp
 #: field:procurement.order,bom_id:0
 msgid "BoM"
-msgstr "Ürün Ağacı"
+msgstr "BoM"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
@@ -2307,17 +2307,17 @@ msgstr "Kullanıcı"
 #. module: mrp
 #: selection:mrp.product.produce,mode:0
 msgid "Consume & Produce"
-msgstr "Tüket & Üret"
+msgstr "Sarf & Üretme"
 
 #. module: mrp
 #: field:mrp.bom,bom_id:0
 msgid "Parent BoM"
-msgstr "Ana Ürün Ağacı"
+msgstr "Üst BoM"
 
 #. module: mrp
 #: report:bom.structure:0
 msgid "BOM Ref"
-msgstr "Ürün Ağacı Ref"
+msgstr "BOM Ref"
 
 #. module: mrp
 #: code:addons/mrp/mrp.py:765
@@ -2332,7 +2332,7 @@ msgstr ""
 #. module: mrp
 #: model:process.node,note:mrp.process_node_stockproduct0
 msgid "Product type is Stockable or Consumable."
-msgstr "Ürün tipi Stoklanabilir veya Tüketilebilirdir."
+msgstr "Ürün tipi Stoklanabilir veya Sarfedilebilir."
 
 #. module: mrp
 #: selection:mrp.production,state:0
@@ -2384,7 +2384,7 @@ msgstr "Üretim emirlerini tamamlamak için elle toplamaya izinverme "
 #: view:mrp.routing.workcenter:0
 #: view:mrp.workcenter:0
 msgid "General Information"
-msgstr "Genel Bilgi"
+msgstr "Genel Bilgisi"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -2395,7 +2395,7 @@ msgstr "Üretimler"
 #: model:ir.model,name:mrp.model_stock_move_split
 #: view:mrp.production:0
 msgid "Split in Serial Numbers"
-msgstr "Seri Numaralarına göre ayır"
+msgstr "Seri Numaralarına Göre Ayır"
 
 #. module: mrp
 #: help:mrp.bom,product_uos:0
@@ -2578,7 +2578,7 @@ msgstr ""
 #. module: mrp
 #: selection:mrp.bom,method:0
 msgid "On Stock"
-msgstr "Stoğa"
+msgstr "Stoktan"
 
 #. module: mrp
 #: field:mrp.bom,sequence:0
@@ -2608,4 +2608,4 @@ msgstr "mrp.config.settings"
 #: field:mrp.production,move_lines:0
 #: report:mrp.production.order:0
 msgid "Products to Consume"
-msgstr "Tüketilecek Ürünler"
+msgstr "Sarfedilecek Ürünler"
diff --git a/addons/mrp_byproduct/i18n/tr.po b/addons/mrp_byproduct/i18n/tr.po
index cd491a9151d..81c9f702621 100644
--- a/addons/mrp_byproduct/i18n/tr.po
+++ b/addons/mrp_byproduct/i18n/tr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2013-03-03 01:56+0000\n"
-"Last-Translator: Ayhan KIZILTAN <Unknown>\n"
+"PO-Revision-Date: 2014-05-12 09:31+0000\n"
+"Last-Translator: Ediz Duman <neps1192@gmail.com>\n"
 "Language-Team: Turkish <tr@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: 2013-11-21 06:21+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-05-13 06:28+0000\n"
+"X-Generator: Launchpad (build 17002)\n"
 
 #. module: mrp_byproduct
 #: help:mrp.subproduct,subproduct_type:0
@@ -59,7 +59,7 @@ msgstr "Ürün Miktarını Değiştir"
 #: view:mrp.bom:0
 #: field:mrp.bom,sub_products:0
 msgid "Byproducts"
-msgstr "Yan ürünler"
+msgstr "Yan Ürünler"
 
 #. module: mrp_byproduct
 #: field:mrp.subproduct,subproduct_type:0
@@ -85,7 +85,7 @@ msgstr "Uyarı"
 #. module: mrp_byproduct
 #: field:mrp.subproduct,bom_id:0
 msgid "BoM"
-msgstr "Ürün Ağacı"
+msgstr "BoM"
 
 #. module: mrp_byproduct
 #: selection:mrp.subproduct,subproduct_type:0
@@ -110,4 +110,4 @@ msgstr ""
 #. module: mrp_byproduct
 #: model:ir.model,name:mrp_byproduct.model_mrp_subproduct
 msgid "Byproduct"
-msgstr "Yan ürün"
+msgstr "Yan Ürün"
diff --git a/addons/mrp_operations/i18n/tr.po b/addons/mrp_operations/i18n/tr.po
index d0358d7be02..81dcf142a54 100644
--- a/addons/mrp_operations/i18n/tr.po
+++ b/addons/mrp_operations/i18n/tr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2013-04-14 16:55+0000\n"
-"Last-Translator: Ayhan KIZILTAN <Unknown>\n"
+"PO-Revision-Date: 2014-05-12 09:31+0000\n"
+"Last-Translator: Ediz Duman <neps1192@gmail.com>\n"
 "Language-Team: Turkish <tr@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: 2013-11-21 06:22+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-05-13 06:28+0000\n"
+"X-Generator: Launchpad (build 17002)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -150,7 +150,7 @@ msgstr "Hata!"
 #: selection:mrp.workorder,state:0
 #: selection:mrp_operations.operation.code,start_stop:0
 msgid "Cancelled"
-msgstr "İptal edildi"
+msgstr "İptal Edildi"
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:477
@@ -185,7 +185,7 @@ msgstr "İşlemi Bitirmek için Başlama ya da Sürdürme durumunda olmalı!"
 #. module: mrp_operations
 #: field:mrp.workorder,nbr:0
 msgid "# of Lines"
-msgstr "Satır Sayısı"
+msgstr "# nın Satırları"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
@@ -276,7 +276,7 @@ msgstr "İşlem Adı"
 #: field:mrp.workorder,state:0
 #: field:mrp_operations.operation.code,start_stop:0
 msgid "Status"
-msgstr "Durum"
+msgstr "Durumu"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
@@ -472,7 +472,7 @@ msgstr "Ağustos"
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "Started"
-msgstr "Başlatıldı"
+msgstr "Başladı"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
@@ -503,7 +503,7 @@ msgstr "Üretim için Hazır"
 #. module: mrp_operations
 #: field:stock.move,move_dest_id_lines:0
 msgid "Children Moves"
-msgstr "Çocuk Hareketleri"
+msgstr "Alt Hareketler"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_planning
@@ -524,7 +524,7 @@ msgstr "Kasım"
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "Search"
-msgstr "Ara"
+msgstr "Arama"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
@@ -595,14 +595,14 @@ msgstr "Mik."
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_doneoperation0
 msgid "Operation Done"
-msgstr "İşlem Yapıldı"
+msgstr "İşlem Bitti"
 
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
 #: view:mrp.workorder:0
 #: selection:mrp_operations.operation.code,start_stop:0
 msgid "Done"
-msgstr "Yapıldı"
+msgstr "Biten"
 
 #. module: mrp_operations
 #: model:ir.actions.report.xml,name:mrp_operations.report_code_barcode
@@ -642,7 +642,7 @@ msgstr "İşlemi Başlat"
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Information"
-msgstr "Bilgi"
+msgstr "Bilgisi"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,help:mrp_operations.mrp_production_wc_action_planning
@@ -682,12 +682,12 @@ msgstr "İş Merkezleri Barkodu"
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Late"
-msgstr "Son"
+msgstr "Geciken"
 
 #. module: mrp_operations
 #: field:mrp.workorder,delay:0
 msgid "Delay"
-msgstr "Gecikme"
+msgstr "Ertelenen"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
@@ -749,7 +749,7 @@ msgstr "Mayıs"
 #: selection:mrp.production.workcenter.line,state:0
 #: selection:mrp.workorder,state:0
 msgid "Finished"
-msgstr "Bitirildi"
+msgstr "Biten"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
@@ -794,7 +794,7 @@ msgstr "İşlem yapıldı"
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "#Line Orders"
-msgstr "#Line Emir"
+msgstr "#Emir Satırları"
 
 #. module: mrp_operations
 #: view:mrp.production:0
diff --git a/addons/mrp_repair/i18n/tr.po b/addons/mrp_repair/i18n/tr.po
index 8a8e8f8ba7e..5630187d727 100644
--- a/addons/mrp_repair/i18n/tr.po
+++ b/addons/mrp_repair/i18n/tr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2013-04-13 18:10+0000\n"
-"Last-Translator: Ayhan KIZILTAN <Unknown>\n"
+"PO-Revision-Date: 2014-05-12 09:32+0000\n"
+"Last-Translator: Ediz Duman <neps1192@gmail.com>\n"
 "Language-Team: Turkish <tr@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: 2013-11-21 06:22+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-05-13 06:28+0000\n"
+"X-Generator: Launchpad (build 17002)\n"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,move_id:0
@@ -100,7 +100,7 @@ msgstr "Seri Numarası"
 #. module: mrp_repair
 #: field:mrp.repair,address_id:0
 msgid "Delivery Address"
-msgstr "Teslimat Adresi"
+msgstr "Teslim Adresi"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -116,7 +116,7 @@ msgstr "Ara Toplam"
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Invoice address :"
-msgstr "Fatura Adresi:"
+msgstr "Fatura Adresi :"
 
 #. module: mrp_repair
 #: help:mrp.repair,partner_id:0
@@ -261,7 +261,7 @@ msgstr ""
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Extra Info"
-msgstr "Ek Bilgi"
+msgstr "Ek Bilgisi"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:336
@@ -287,7 +287,7 @@ msgstr "İş Ortağı"
 #: code:addons/mrp_repair/mrp_repair.py:385
 #, python-format
 msgid "No account defined for partner \"%s\"."
-msgstr "\"%s\" Paydaşı için tanımlanmış bir hesap yok."
+msgstr "\"%s\" İş Ortağı için tanımlanmış bir hesap yok."
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -343,7 +343,7 @@ msgstr "Onarım Siparişi N° :"
 #: field:mrp.repair.line,prodlot_id:0
 #: report:repair.order:0
 msgid "Lot Number"
-msgstr "Parti Numarası"
+msgstr "Lot Numarası"
 
 #. module: mrp_repair
 #: field:mrp.repair,message_follower_ids:0
@@ -353,7 +353,7 @@ msgstr "İzleyiciler"
 #. module: mrp_repair
 #: field:mrp.repair,fees_lines:0
 msgid "Fees Lines"
-msgstr "Ücret Kalemleri"
+msgstr "Ücret Satırları"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,type:0
@@ -363,7 +363,7 @@ msgstr "Tip"
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Fees Line(s)"
-msgstr "Ücret Kalemi(leri)"
+msgstr "Ücret Satır(ları)"
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
@@ -404,7 +404,7 @@ msgstr "Teklif Notları"
 #: field:mrp.repair,state:0
 #: field:mrp.repair.line,state:0
 msgid "Status"
-msgstr "Durum"
+msgstr "Durumu"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -420,7 +420,7 @@ msgstr "(Ekle)"
 #: model:ir.model,name:mrp_repair.model_mrp_repair_line
 #: view:mrp.repair:0
 msgid "Repair Line"
-msgstr "Onarım Kalemi"
+msgstr "Onarım Satırı"
 
 #. module: mrp_repair
 #: report:repair.order:0
@@ -447,7 +447,7 @@ msgstr "İç not ekle..."
 #: field:mrp.repair.fee,invoice_line_id:0
 #: field:mrp.repair.line,invoice_line_id:0
 msgid "Invoice Line"
-msgstr "Fatura Kalemi"
+msgstr "Fatura Satırı"
 
 #. module: mrp_repair
 #: selection:mrp.repair,invoice_method:0
@@ -591,7 +591,7 @@ msgstr "Tarih"
 #. module: mrp_repair
 #: model:ir.model,name:mrp_repair.model_mrp_repair_fee
 msgid "Repair Fees Line"
-msgstr "Onarım Ücretleri Kalemi"
+msgstr "Onarım Ücretleri Satırı"
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
@@ -665,7 +665,7 @@ msgstr "Birim Fiyat"
 #. module: mrp_repair
 #: selection:mrp.repair.line,state:0
 msgid "Done"
-msgstr "Yapıldı"
+msgstr "Biten"
 
 #. module: mrp_repair
 #: field:mrp.repair,invoice_id:0
@@ -675,7 +675,7 @@ msgstr "Fatura"
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Fees"
-msgstr "Ücretler"
+msgstr "Ücret"
 
 #. module: mrp_repair
 #: view:mrp.repair.cancel:0
@@ -696,12 +696,12 @@ msgstr "Hedef Konum"
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Operation Line(s)"
-msgstr "İşlem Kalemi (leri)"
+msgstr "İşlem Satır(ları)"
 
 #. module: mrp_repair
 #: field:mrp.repair,location_dest_id:0
 msgid "Delivery Location"
-msgstr "Teslimat Konumu"
+msgstr "Teslim Konumu"
 
 #. module: mrp_repair
 #: help:mrp.repair,deliver_bool:0
@@ -747,7 +747,7 @@ msgstr "Açıklama"
 #. module: mrp_repair
 #: field:mrp.repair,operations:0
 msgid "Operation Lines"
-msgstr "İşlem Kalemleri"
+msgstr "İşlem Satırları"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -769,7 +769,7 @@ msgstr "Fiyat"
 #. module: mrp_repair
 #: field:mrp.repair,deliver_bool:0
 msgid "Deliver"
-msgstr "Teslim et"
+msgstr "Teslim Etme"
 
 #. module: mrp_repair
 #: field:mrp.repair,internal_notes:0
@@ -827,7 +827,7 @@ msgstr "Kaldır"
 #. module: mrp_repair
 #: field:mrp.repair,partner_invoice_id:0
 msgid "Invoicing Address"
-msgstr "Fatura Adresi:"
+msgstr "Fatura Adresi"
 
 #. module: mrp_repair
 #: help:mrp.repair,message_ids:0
@@ -848,7 +848,7 @@ msgstr "Kaynak Konum"
 #: model:ir.model,name:mrp_repair.model_mrp_repair_cancel
 #: view:mrp.repair:0
 msgid "Cancel Repair"
-msgstr "Onarım İptal"
+msgstr "Onarımı İptal Et"
 
 #. module: mrp_repair
 #: selection:mrp.repair,invoice_method:0
diff --git a/addons/sale/i18n/fr_CA.po b/addons/sale/i18n/fr_CA.po
new file mode 100644
index 00000000000..c1c93411dfd
--- /dev/null
+++ b/addons/sale/i18n/fr_CA.po
@@ -0,0 +1,2323 @@
+# French (Canada) translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-07 19:36+0000\n"
+"PO-Revision-Date: 2014-05-13 02:40+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French (Canada) <fr_CA@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: 2014-05-13 06:28+0000\n"
+"X-Generator: Launchpad (build 17002)\n"
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
+#: view:sale.order:0
+msgid "Cancel Order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:101
+#, python-format
+msgid "Incorrect Data"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:102
+#, python-format
+msgid "The value of Advance Amount must be positive."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sales order line."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: sale
+#: view:res.partner:0
+msgid "False"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tax"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Gives the status of the quotation or sales order.              \n"
+"The exception status is automatically set when a cancel operation occurs     "
+"          in the invoice validation (Invoice Exception) or in the picking "
+"list process (Shipping Exception).\n"
+"The 'Waiting Schedule' status is set when the invoice is confirmed           "
+"    but waiting for the scheduler to run on the order date."
+msgstr ""
+"Donne le statut d'une soumission ou d'une commande de vente.\n"
+"Le statut 'Exception' est automatiquement défini quand une opération "
+"d'annulation est effectuée dans la validation de la facture (Exception de "
+"facturation) ou dans le processus de colisage (Exception de colisage).\n"
+"Le statut 'En attente' est défini quand une facture est confirmée mais on "
+"attend le lancement du planificateur à la date de la commande."
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,product_uom_qty:0
+msgid "# of Qty"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:444
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_pricelist:0
+msgid ""
+"Allows to manage different prices based on rules per category of customers.\n"
+"Example: 10% for retailers, promotion of 5 EUR on this product, etc."
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,payment_default_id:0
+msgid "Default Payment Term"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_uom:0
+msgid "Allow using different units of measures"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Percentage"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:764
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sales order lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:107
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#: code:addons/sale/wizard/sale_make_invoice.py:55
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr "Soumissions et ventes"
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:307
+#, python-format
+msgid "Pricelist Warning!"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid "Create & View Invoice"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Mes soumissions"
+
+#. module: sale
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:598
+#, python-format
+msgid "You cannot confirm a sales order which has no line."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation "
+msgstr "Soumission "
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_exception
+msgid "Sales in Exception"
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,address_allotment_id:0
+msgid "A partner to whom the particular product needs to be allotted."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Trigger delivery orders automatically from sales orders"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_orders
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sales\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Cliquez pour créer une soumission qui pourra être convertie "
+"en commande\n"
+"                de vente.\n"
+"              </p><p>\n"
+"                OpenERP vous aidera à compléter efficacement le flux de "
+"vente :\n"
+"                soumission, commande, livraison, facturation et paiement.\n"
+"              </p>\n"
+"            "
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid ""
+"All items in these order lines will be invoiced. You can also invoice a "
+"percentage of the sales order\n"
+"                    or a fixed price (for advances) directly from the sales "
+"order form if you prefer."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_quotations
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Soumissions"
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Delivery address for current sales order."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sales order lines"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sales "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+"Le vendeur confirme la soumission. L'état du bon de commande devient \"En "
+"cours\" ou \"Manuel, en cours\""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:308
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tel. :"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Before Delivery"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:781
+#, python-format
+msgid ""
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract / Analytic"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:505
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_sent
+#: model:mail.message.subtype,name:sale.mt_order_sent
+msgid "Quotation sent"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
+#, python-format
+msgid "Advance Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Soumission / Commande"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Use multiple analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_sale_journal:0
+msgid ""
+"Allows you to categorize your sales and deliveries (picking lists) between "
+"different journals,\n"
+"                and perform batch operations on journals.\n"
+"                This installs the module sale_journal."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sales Orders"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Total :"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "My Sales"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,state:0
+msgid ""
+"* The 'Draft' status is set when the related sales order in draft status.    "
+"                 \n"
+"* The 'Confirmed' status is set when the related sales order is confirmed.   "
+"                  \n"
+"* The 'Exception' status is set when the related sales order is set as "
+"exception.                     \n"
+"* The 'Done' status is set when the sales order line has been picked.        "
+"             \n"
+"* The 'Cancelled' status is set when a user cancel the sales order related."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:960
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:91
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:95
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sales order has at least one invoice."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Send by Email"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/res_config.py:97
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order Date"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Create and View Invoice"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "Date de soumission"
+
+#. module: sale
+#: field:sale.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:942
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,categ_id:0
+msgid "Category of Product"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:564
+#, python-format
+msgid "Cannot cancel this sales order!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Taxes :"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sales order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sales\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sales order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Cliquez pour créer une soumission ou une commande de vente "
+"pour votre client.\n"
+"              </p><p>\n"
+"                OpenERP vous aidera à compléter efficacement le flux de "
+"vente :\n"
+"                soumission, commande, livraison, facturation et paiement.\n"
+"              </p><p>\n"
+"                La fonctionnalité sociale vous aide à organiser les "
+"discussions sur chaque\n"
+"                commande de vente, et permet à vos clients de garder une "
+"trace de \n"
+"                l'évolution des commandes de vente.\n"
+"\n"
+"              </p>\n"
+"            "
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Demand"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sales order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Cliquez pour définir un nouveau magasin.\n"
+"              </p><p>\n"
+"                Chaque soumission ou vente doit être liée à un magasin.\n"
+"                Le magasin définit également de quel entrepôt les produits "
+"seront\n"
+"                livrés pour chaque vente.\n"
+"              </p>\n"
+"            "
+
+#. module: sale
+#: field:sale.order,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'.\n"
+"                You may have to create it and set it as a default value on "
+"this field."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_warning:0
+msgid ""
+"Allow to configure notification on products and trigger them when a user "
+"wants to sale a given product or a given customer.\n"
+"Example: Product: this product is deprecated, do not purchase more than 5.\n"
+"                Supplier: don't forget to ask for an express delivery."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:955
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_sale_margin:0
+msgid "Display margins on sales orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_ids:0
+msgid ""
+"This is the list of invoices that have been generated for this sales order. "
+"The same sales order may have been invoiced in several times (by line for "
+"example)."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Your Reference"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Cancel"
+msgstr ""
+
+#. module: sale
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:952
+#, python-format
+msgid ""
+"Cannot find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#: field:sale.order,order_policy:0
+#: view:sale.order.line:0
+msgid "Create Invoice"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+"Vous permet de faire des soumissions, des commandes de vente en utilisant "
+"différentes politique de commande et de gérer les stock associés.\n"
+"                    Ceci installe le module 'sale_stock'."
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+msgstr ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Soumission' or 'Commande'} (Réf. ${object.name or 'n/a' })"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation Number"
+msgstr "Numéro de soumission"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_quotations
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation, the first step of a new sale.\n"
+"              </p><p>\n"
+"                OpenERP will help you handle efficiently the complete sale "
+"flow:\n"
+"                from the quotation to the sales order, the\n"
+"                delivery, the invoicing and the payment collection.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sales\n"
+"                order, and allow your customers to keep track of the "
+"evolution\n"
+"                of the sales order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Cliquez pour créer une soumission, la première étape d'une "
+"commande de vente.\n"
+"              </p><p>\n"
+"                OpenERP vous aidera à compléter efficacement le flux de "
+"vente :\n"
+"                de la soumission à la commande de vente, la \n"
+"                livraison, la facturation et les paiements.\n"
+"              </p><p>\n"
+"                La fonctionnalité sociale vous aide à organiser les "
+"discussions sur chaque\n"
+"                commande de vente, et permet à vos clients de garder une "
+"trace de \n"
+"                l'évolution des commandes de vente.\n"
+"              </p>\n"
+"            "
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "New Copy of Quotation"
+msgstr "Nouvelle copie de soumission"
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:983
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:865
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#, python-format
+msgid "You cannot create invoice when sales order is not confirmed."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Confirmer la soumission"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_confirmed
+msgid "Quotation confirmed"
+msgstr "Soumission confirmée"
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr "Soumission en brouillon"
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Terms and conditions..."
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:277
+#: code:addons/sale/sale.py:820
+#: code:addons/sale/sale.py:983
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Fax :"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Shipped Quantities"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sales order will automatically create the invoice proposition (draft "
+"invoice).                                              You have to choose  "
+"if you want your invoice based on ordered "
+msgstr ""
+
+#. module: sale
+#: 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 ""
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sales orders."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Cancel Quotation"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Shipping Exception"
+msgstr ""
+
+#. module: sale
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sales Orders"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr ""
+
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: view:sale.order:0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Soumission"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sales order lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:185
+#, python-format
+msgid "There is no default shop for the current user's company!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:277
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:121
+#: model:ir.model,name:sale.model_account_invoice
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+#, python-format
+msgid "Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
+#. module: sale
+#: model:email.template,body_html:sale.email_template_edi_sale
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Bonjour ${object.partner_id.name},</p>\n"
+"    \n"
+"    <p>Veuillez trouver ci-joint votre ${object.state in ('draft', 'sent') "
+"and 'soumission' or 'confirmation de commande'} de la part de  "
+"${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>RÉFÉRENCES</strong><br />\n"
+"       &nbsp;&nbsp;Numéro: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Montant total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Référence: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Votre référence: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Votre contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>Il vous est possible de payer directement avec Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>Si vous avez des questions, n'hésitez pas à nous contacter.</p>\n"
+"    <p>Merci d'avoir choisi ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Tél:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.order.line,product_id:0
+#: view:sale.report:0
+#: field:sale.report,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,order_policy:0
+msgid ""
+"On demand: A draft invoice can be created from the sales order when needed. "
+"\n"
+"On delivery order: A draft invoice can be created from the delivery order "
+"when the products have been delivered. \n"
+"Before delivery: A draft invoice is created from the sales order and must be "
+"paid before the products can be delivered."
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Confirm Sale"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
+msgstr ""
+
+#. module: sale
+#: model:email.template,report_name:sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:565
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:865
+#, python-format
+msgid "No Customer Defined !"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Delivery Address"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Cancel Line"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:185
+#: code:addons/sale/sale.py:363
+#: code:addons/sale/sale.py:504
+#: code:addons/sale/sale.py:598
+#: code:addons/sale/sale.py:763
+#: code:addons/sale/sale.py:780
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"From stock: When needed, the product is taken from the stock or we wait for "
+"replenishment.\n"
+"On order: When needed, the product is purchased or produced."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr "Soumission envoyée"
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:364
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Features"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:287
+#: code:addons/sale/sale.py:584
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#, python-format
+msgid "Sales Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:820
+#, python-format
+msgid "You cannot cancel a sales order line that has already been invoiced."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoiced_rate:0
+msgid "Invoiced Ratio"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/edi/sale_order.py:140
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Delivery Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Reference Unit of Measure"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales order lines done"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:107
+#, python-format
+msgid ""
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Anciennes soumissions"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice.py:55
+#, python-format
+msgid "You shouldn't manually invoice the following sale order %s"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sales order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sales Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_in_progress
+msgid "Sales Order in Progress"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order Status"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr ""
+
+#. module: sale
+#: model:mail.message.subtype,name:sale.mt_order_confirmed
+msgid "Sales Order Confirmed"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:944
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order "
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,name:0
+msgid "Description"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order Number"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,partner_id:0
+#: field:sale.order.line,order_partner_id:0
+msgid "Customer"
+msgstr ""
+
+#. module: sale
+#: model:product.template,name:sale.advance_product_0_product_template
+msgid "Advance"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid ""
+"Use contract to be able to manage your services with\n"
+"                        multiple invoicing as part of the same contract "
+"with\n"
+"                        your customer."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Confirmed sales order lines, not yet delivered"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order,payment_term:0
+msgid "Payment Term"
+msgstr ""
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
+msgstr ""
+"Ce rapport analyse vos soumissions et commandes clients. Il vérifie les "
+"revenus liés aux ventes et les classifie selon différents critères (vendeur, "
+"partenaire, article, etc.). Vous pouvez utiliser ce rapport pour analyser "
+"vos ventes non encore facturées. Si vous souhaitez analyser votre chiffre "
+"d'affaires, vous devriez utiliser le rapport \"Analyse des factures "
+"clients\" dans l'application comptabilité."
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation N°"
+msgstr "Soumission N°"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Picked"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr ""
+
+#~ msgid "Quotation send"
+#~ msgstr "Envoi de la soumission"

From 709e22c32acaeb1db77ef89d0343a3be8b3246f4 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Tue, 13 May 2014 10:15:01 +0200
Subject: [PATCH 102/225] [FIX] sale: sale report view, wrong domain

Quotations are sale.order with state draft and sent
Sale orders are sale.order with state other than draft, sent and cancel
---
 addons/sale/report/sale_report_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index 14b719ebd7a..613475b87f8 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -21,8 +21,8 @@
             <search string="Sales Analysis">
                 <field name="date"/>
                 <field name="date_confirm"/>
-                <filter icon="terp-document-new" name="Quotations" domain="[('state','=','draft')]"/>
-                <filter icon="terp-check" name="Sales" string="Sales" domain="[('state','not in',('draft','done','cancel'))]"/>
+                <filter icon="terp-document-new" name="Quotations" domain="[('state','in',('draft','sent'))]"/>
+                <filter icon="terp-check" name="Sales" string="Sales" domain="[('state','not in',('draft','sent','cancel'))]"/>
                 <separator/>
                 <filter icon="terp-personal" string="My Sales" help="My Sales" domain="[('user_id','=',uid)]"/>
                 <field name="partner_id"/>

From 53d859ba9c03d75db66c310c5ca19bc486609f01 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 13 May 2014 10:49:42 +0200
Subject: [PATCH 103/225] [FIX] a bunch of incomplete website URLs

---
 openerp/addons/base/res/res_partner_demo.xml | 24 ++++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/openerp/addons/base/res/res_partner_demo.xml b/openerp/addons/base/res/res_partner_demo.xml
index 4b8a19a392e..f8e89dbd734 100644
--- a/openerp/addons/base/res/res_partner_demo.xml
+++ b/openerp/addons/base/res/res_partner_demo.xml
@@ -77,7 +77,7 @@
             <field name="street">31 Hong Kong street</field>
             <field name="email">asusteK@yourcompany.example.com</field>
             <field name="phone">(+886) (02) 4162 2023</field>
-            <field name="website">www.asustek.com</field>
+            <field name="website">http://www.asustek.com</field>
             <field name="image" type="base64" file="base/static/img/res_partner_1-image.jpg"/>
         </record>
         <record id="res_partner_2" model="res.partner">
@@ -90,7 +90,7 @@
             <field name="street">69 rue de Namur</field>
             <field name="email">agrolait@yourcompany.example.com</field>
             <field name="phone">+32 10 588 558</field>
-            <field name="website">www.agrolait.com</field>
+            <field name="website">http://www.agrolait.com</field>
             <field name="image" type="base64" file="base/static/img/res_partner_2-image.jpg"/>
         </record>
         <record id="res_partner_3" model="res.partner">
@@ -105,7 +105,7 @@
             <field name="street">52 Chop Suey street</field>
             <field name="email">chinaexport@yourcompany.example.com</field>
             <field name="phone">+86 21 6484 5671</field>
-            <field name="website">www.chinaexport.com/</field>
+            <field name="website">http://www.chinaexport.com/</field>
             <field name="image" type="base64" file="base/static/img/res_partner_3-image.png"/>
         </record>
         
@@ -122,7 +122,7 @@
             <field name="street">3661 Station Street</field>
             <field name="email">deltapc@yourcompany.example.com</field>
             <field name="phone">+1 510 340 2385</field>
-            <field name="website">www.distribpc.com/</field>
+            <field name="website">http://www.distribpc.com/</field>
             <field name="image" type="base64" file="base/static/img/res_partner_4-image.png"/>
         </record>
 
@@ -137,7 +137,7 @@
             <field name="city">Chicago</field>
             <field name="email">epic@yourcompany.example.com</field>
             <field name="phone">+1 312 349 2324</field>
-            <field name="website">www.epic-tech.info//</field>
+            <field name="website">http://www.epic-tech.info//</field>
             <field name="image" type="base64" file="base/static/img/res_partner_5-image.jpg"/>
         </record>
 
@@ -169,7 +169,7 @@
             <field name="country_id" ref="base.uk"/>
             <field name="phone">+44 121 690 4596</field>
             <field name="email">wealthyandsons@yourcompany.example.com</field>
-            <field name="website">www.wealthyandsons.com/</field>
+            <field name="website">http://www.wealthyandsons.com/</field>
             <field name="image" type="base64" file="base/static/img/res_partner_7-image.jpg"/>
         </record>
 
@@ -198,7 +198,7 @@
             <field name="country_id" ref="base.in"/>
             <field name="email">bestdesigners@yourcompany.example.com</field>
             <field name="phone">+91 22 3445 0349</field>
-            <field name="website">www.bestdesigners.com</field>
+            <field name="website">http://www.bestdesigners.com</field>
             <field name="image" type="base64" file="base/static/img/res_partner_9-image.jpg"/>
         </record>
 
@@ -228,7 +228,7 @@
             <field name="city">Barcelona</field>
             <field name="zip">08078</field>
             <field name="phone">+34 934 340 230</field>
-            <field name="website">www.lumitech.com</field>
+            <field name="website">http://www.lumitech.com</field>
             <field name="email">luminous@yourcompany.example.com</field>
             <field name="image" type="base64" file="base/static/img/res_partner_11-image.png"/>
         </record>
@@ -245,7 +245,7 @@
             <field name="country_id" ref="base.fr"/>
             <field name="street">93, Press Avenue</field>
             <field name="email">camptocamp@yourcompany.example.com</field>
-            <field name="website">www.camptocamp.com</field>
+            <field name="website">http://www.camptocamp.com</field>
             <field name="image" type="base64" file="base/static/img/res_partner_12-image.jpg"/>
         </record>
 
@@ -260,7 +260,7 @@
             <field name="email">axelor@yourcompany.example.com</field>
             <field name="phone">+33 1 64 61 04 01</field>
             <field name="street">12 rue Albert Einstein</field>
-            <field name="website">www.axelor.com/</field>
+            <field name="website">http://www.axelor.com/</field>
             <field name="image" type="base64" file="base/static/img/res_partner_13-image.jpg"/>
         </record>
 
@@ -336,7 +336,7 @@
             <field name="phone">+1 857 349 3049</field>
             <field name="country_id" ref="base.us"/>
             <field name="street">One Lincoln Street</field>
-            <field name="website">www.think-big.com</field>
+            <field name="website">http://www.think-big.com</field>
             <field name="image" type="base64" file="base/static/img/res_partner_18-image.png"/>
         </record>
 
@@ -394,7 +394,7 @@
             <field name="zip">LE4 2BN</field>
             <field name="phone">+44 20 1294 2193</field>
             <field name="country_id" ref="base.uk"/>
-            <field name="website">www.vicking-direct.com</field>
+            <field name="website">http://www.vicking-direct.com</field>
             <field name="email">vickingdirect@yourcompany.example.com</field>
             <field name="image" type="base64" file="base/static/img/res_partner_22-image.jpg"/>
         </record>

From 3385300cb7dc25490c6154124b1714d4ec3e2939 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 13 May 2014 11:01:18 +0200
Subject: [PATCH 104/225] [IMP] website: sale_order: display acquirer only when
 set. The purpose is to avoid maanging it from the sale order view; the
 website will set the acquirer for ecommerce related orders. This way the
 acquirer and tx will be displayed on the sale order linked to ecommerce
 sales, and not on other orders.

---
 addons/website_sale/views/sale_order.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/website_sale/views/sale_order.xml b/addons/website_sale/views/sale_order.xml
index 68151998137..2d81f2c5b36 100644
--- a/addons/website_sale/views/sale_order.xml
+++ b/addons/website_sale/views/sale_order.xml
@@ -8,8 +8,8 @@
             <field name="inherit_id" ref="sale.view_order_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='amount_total']" position="after">
-                    <field name="payment_acquirer_id"/>
-                    <field name="payment_tx_id"/>
+                    <field name="payment_acquirer_id" attrs="{'invisible': [('payment_acquirer_id', '=', False)]}"/>
+                    <field name="payment_tx_id" attrs="{'invisible': [('payment_acquirer_id', '=', False)]}"/>
                 </xpath>
             </field>
         </record>

From 8eed1431126c425fdafcb7cae33a5c0f6883f3e9 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 13 May 2014 11:35:45 +0200
Subject: [PATCH 105/225] [IMP] Invert multilang logic in route decorator. True
 by default, can be set to False explicitlty

---
 addons/auth_signup/controllers/main.py        |  4 +-
 addons/report/controllers/main.py             |  2 +-
 addons/stock_picking_wave/controllers/main.py |  2 +-
 addons/survey/controllers/main.py             | 14 ++--
 addons/website/controllers/main.py            |  6 +-
 addons/website/models/ir_http.py              |  2 -
 addons/website/models/website.py              |  2 +-
 addons/website_blog/controllers/main.py       |  8 +--
 .../website_certification/controllers/main.py |  2 +-
 addons/website_crm/controllers/main.py        |  4 +-
 .../controllers/main.py                       |  4 +-
 addons/website_customer/controllers/main.py   |  4 +-
 addons/website_event/controllers/main.py      | 10 +--
 addons/website_event_sale/controllers/main.py |  2 +-
 .../website_event_track/controllers/event.py  | 10 +--
 addons/website_forum/controllers/main.py      | 66 +++++++++----------
 addons/website_forum_doc/controllers/main.py  |  8 +--
 addons/website_hr/controllers/main.py         |  2 +-
 .../controllers/main.py                       |  8 +--
 .../controllers/email_designer.py             |  2 +-
 addons/website_membership/controllers/main.py |  4 +-
 addons/website_partner/controllers/main.py    |  2 +-
 addons/website_project/controllers/main.py    |  2 +-
 addons/website_quote/controllers/main.py      |  2 +-
 addons/website_sale/controllers/main.py       | 24 +++----
 .../website_sale_delivery/controllers/main.py |  2 +-
 26 files changed, 98 insertions(+), 100 deletions(-)

diff --git a/addons/auth_signup/controllers/main.py b/addons/auth_signup/controllers/main.py
index 8a66d3ab075..3040fafaf2b 100644
--- a/addons/auth_signup/controllers/main.py
+++ b/addons/auth_signup/controllers/main.py
@@ -42,7 +42,7 @@ class AuthSignupHome(openerp.addons.web.controllers.main.Home):
             return http.redirect_with_hash(request.params.get('redirect'))
         return response
 
-    @http.route('/web/signup', type='http', auth='public', website=True, multilang=True)
+    @http.route('/web/signup', type='http', auth='public', website=True)
     def web_auth_signup(self, *args, **kw):
         qcontext = self.get_auth_signup_qcontext()
 
@@ -58,7 +58,7 @@ class AuthSignupHome(openerp.addons.web.controllers.main.Home):
 
         return request.render('auth_signup.signup', qcontext)
 
-    @http.route('/web/reset_password', type='http', auth='public', website=True, multilang=True)
+    @http.route('/web/reset_password', type='http', auth='public', website=True)
     def web_auth_reset_password(self, *args, **kw):
         qcontext = self.get_auth_signup_qcontext()
 
diff --git a/addons/report/controllers/main.py b/addons/report/controllers/main.py
index 95a1ea7636a..de3bbd63db6 100644
--- a/addons/report/controllers/main.py
+++ b/addons/report/controllers/main.py
@@ -39,7 +39,7 @@ class ReportController(Controller):
     @route([
         '/report/<path:converter>/<reportname>',
         '/report/<path:converter>/<reportname>/<docids>',
-    ], type='http', auth='user', website=True, multilang=True)
+    ], type='http', auth='user', website=True)
     def report_routes(self, reportname, docids=None, converter=None, **data):
         report_obj = request.registry['report']
         cr, uid, context = request.cr, request.uid, request.context
diff --git a/addons/stock_picking_wave/controllers/main.py b/addons/stock_picking_wave/controllers/main.py
index 9de14934828..8aab4905933 100644
--- a/addons/stock_picking_wave/controllers/main.py
+++ b/addons/stock_picking_wave/controllers/main.py
@@ -4,7 +4,7 @@ from openerp.addons.web.http import request
 
 class picking_wave_report(http.Controller):
     @http.route('/report/stock_picking_wave.report_pickingwave/<ids>', type='http', auth='user', 
-                website=True, multilang=True)
+                website=True)
     def report_picking_wave(self, ids):
         self.cr, self.uid, self.pool = request.cr, request.uid, request.registry
         ids = [int(i) for i in ids.split(',')]
diff --git a/addons/survey/controllers/main.py b/addons/survey/controllers/main.py
index 69fa12222c5..ef4fd05302a 100644
--- a/addons/survey/controllers/main.py
+++ b/addons/survey/controllers/main.py
@@ -76,7 +76,7 @@ class WebsiteSurvey(http.Controller):
     # Survey start
     @http.route(['/survey/start/<model("survey.survey"):survey>',
                  '/survey/start/<model("survey.survey"):survey>/<string:token>'],
-                type='http', auth='public', multilang=True, website=True)
+                type='http', auth='public', website=True)
     def start_survey(self, survey, token=None, **post):
         cr, uid, context = request.cr, request.uid, request.context
         survey_obj = request.registry['survey.survey']
@@ -123,7 +123,7 @@ class WebsiteSurvey(http.Controller):
     # Survey displaying
     @http.route(['/survey/fill/<model("survey.survey"):survey>/<string:token>',
                  '/survey/fill/<model("survey.survey"):survey>/<string:token>/<string:prev>'],
-                type='http', auth='public', multilang=True, website=True)
+                type='http', auth='public', website=True)
     def fill_survey(self, survey, token, prev=None, **post):
         '''Display and validates a survey'''
         cr, uid, context = request.cr, request.uid, request.context
@@ -173,7 +173,7 @@ class WebsiteSurvey(http.Controller):
     # AJAX prefilling of a survey
     @http.route(['/survey/prefill/<model("survey.survey"):survey>/<string:token>',
                  '/survey/prefill/<model("survey.survey"):survey>/<string:token>/<model("survey.page"):page>'],
-                type='http', auth='public', multilang=True, website=True)
+                type='http', auth='public', website=True)
     def prefill(self, survey, token, page=None, **post):
         cr, uid, context = request.cr, request.uid, request.context
         user_input_line_obj = request.registry['survey.user_input_line']
@@ -216,7 +216,7 @@ class WebsiteSurvey(http.Controller):
 
     # AJAX scores loading for quiz correction mode
     @http.route(['/survey/scores/<model("survey.survey"):survey>/<string:token>'],
-                type='http', auth='public', multilang=True, website=True)
+                type='http', auth='public', website=True)
     def get_scores(self, survey, token, page=None, **post):
         cr, uid, context = request.cr, request.uid, request.context
         user_input_line_obj = request.registry['survey.user_input_line']
@@ -234,7 +234,7 @@ class WebsiteSurvey(http.Controller):
 
     # AJAX submission of a page
     @http.route(['/survey/submit/<model("survey.survey"):survey>'],
-                type='http', auth='public', multilang=True, website=True)
+                type='http', auth='public', website=True)
     def submit(self, survey, **post):
         _logger.debug('Incoming data: %s', post)
         page_id = int(post['page_id'])
@@ -284,7 +284,7 @@ class WebsiteSurvey(http.Controller):
     # Printing routes
     @http.route(['/survey/print/<model("survey.survey"):survey>',
                  '/survey/print/<model("survey.survey"):survey>/<string:token>'],
-                type='http', auth='public', multilang=True, website=True)
+                type='http', auth='public', website=True)
     def print_survey(self, survey, token=None, **post):
         '''Display an survey in printable view; if <token> is set, it will
         grab the answers of the user_input_id that has <token>.'''
@@ -295,7 +295,7 @@ class WebsiteSurvey(http.Controller):
                                        'quizz_correction': True if survey.quizz_mode and token else False})
 
     @http.route(['/survey/results/<model("survey.survey"):survey>'],
-                type='http', auth='user', multilang=True, website=True)
+                type='http', auth='user', website=True)
     def survey_reporting(self, survey, token=None, **post):
         '''Display survey Results & Statistics for given survey.'''
         result_template, current_filters, filter_display_data, filter_finish = 'survey.result', [], [], False
diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py
index 4180ecf4c69..a4faa9c361f 100644
--- a/addons/website/controllers/main.py
+++ b/addons/website/controllers/main.py
@@ -32,7 +32,7 @@ class Website(openerp.addons.web.controllers.main.Home):
     #------------------------------------------------------
     # View
     #------------------------------------------------------
-    @http.route('/', type='http', auth="public", website=True, multilang=True)
+    @http.route('/', type='http', auth="public", website=True)
     def index(self, **kw):
         page = 'homepage'
         try:
@@ -47,12 +47,12 @@ class Website(openerp.addons.web.controllers.main.Home):
             pass
         return self.page(page)
 
-    @http.route(website=True, auth="public", multilang=True)
+    @http.route(website=True, auth="public")
     def web_login(self, *args, **kw):
         # TODO: can't we just put auth=public, ... in web client ?
         return super(Website, self).web_login(*args, **kw)
 
-    @http.route('/page/<page:page>', type='http', auth="public", website=True, multilang=True)
+    @http.route('/page/<page:page>', type='http', auth="public", website=True)
     def page(self, page, **opt):
         values = {
             'path': page,
diff --git a/addons/website/models/ir_http.py b/addons/website/models/ir_http.py
index b25509180b0..358f105b0d0 100644
--- a/addons/website/models/ir_http.py
+++ b/addons/website/models/ir_http.py
@@ -46,12 +46,10 @@ class ir_http(orm.AbstractModel):
         try:
             func, arguments = self._find_handler()
             request.website_enabled = func.routing.get('website', False)
-            request.website_multilang = func.routing.get('multilang', False)
         except werkzeug.exceptions.NotFound:
             # either we have a language prefixed route, either a real 404
             # in all cases, website processes them
             request.website_enabled = True
-            request.website_multilang = True
 
         if request.website_enabled:
             if func:
diff --git a/addons/website/models/website.py b/addons/website/models/website.py
index 5e339a21d03..35bae23a7da 100644
--- a/addons/website/models/website.py
+++ b/addons/website/models/website.py
@@ -72,7 +72,7 @@ def is_multilang_url(local_url, langs=None):
         query_string = url[1] if len(url) > 1 else None
         router = request.httprequest.app.get_db_router(request.db).bind('')
         func = router.match(path, query_args=query_string)[0]
-        return func.routing.get('multilang', False)
+        return func.routing.get('website', False) and func.routing.get('multilang', True)
     except Exception:
         return False
 
diff --git a/addons/website_blog/controllers/main.py b/addons/website_blog/controllers/main.py
index e33905272a3..4e81c3b4437 100644
--- a/addons/website_blog/controllers/main.py
+++ b/addons/website_blog/controllers/main.py
@@ -62,7 +62,7 @@ class WebsiteBlog(http.Controller):
     @http.route([
         '/blog',
         '/blog/page/<int:page>',
-    ], type='http', auth="public", website=True, multilang=True)
+    ], type='http', auth="public", website=True)
     def blogs(self, page=1, **post):
         cr, uid, context = request.cr, request.uid, request.context
         blog_obj = request.registry['blog.post']
@@ -87,7 +87,7 @@ class WebsiteBlog(http.Controller):
         '/blog/<model("blog.blog"):blog>/page/<int:page>',
         '/blog/<model("blog.blog"):blog>/tag/<model("blog.tag"):tag>',
         '/blog/<model("blog.blog"):blog>/tag/<model("blog.tag"):tag>/page/<int:page>',
-    ], type='http', auth="public", website=True, multilang=True)
+    ], type='http', auth="public", website=True)
     def blog(self, blog=None, tag=None, page=1, **opt):
         """ Prepare all values to display the blog.
 
@@ -156,7 +156,7 @@ class WebsiteBlog(http.Controller):
 
     @http.route([
             '''/blog/<model("blog.blog"):blog>/post/<model("blog.post", "[('blog_id','=',blog[0])]"):blog_post>''',
-    ], type='http', auth="public", website=True, multilang=True)
+    ], type='http', auth="public", website=True)
     def blog_post(self, blog, blog_post, tag_id=None, page=1, enable_editor=None, **post):
         """ Prepare all values to display the blog.
 
@@ -299,7 +299,7 @@ class WebsiteBlog(http.Controller):
         id = self._blog_post_message(user, blog_post_id, **post)
         return self._get_discussion_detail([id], publish, **post)
 
-    @http.route('/blogpost/new', type='http', auth="public", website=True, multilang=True)
+    @http.route('/blogpost/new', type='http', auth="public", website=True)
     def blog_post_create(self, blog_id, **post):
         cr, uid, context = request.cr, request.uid, request.context
         create_context = dict(context, mail_create_nosubscribe=True)
diff --git a/addons/website_certification/controllers/main.py b/addons/website_certification/controllers/main.py
index ab955bc12dd..303af758a09 100644
--- a/addons/website_certification/controllers/main.py
+++ b/addons/website_certification/controllers/main.py
@@ -28,7 +28,7 @@ class WebsiteCertifiedPartners(http.Controller):
 
     @http.route(['/certifications',
                  '/certifications/<model("certification.type"):cert_type>'], type='http', auth='public',
-                website=True, multilang=True)
+                website=True)
     def certified_partners(self, cert_type=None, **post):
         cr, uid, context = request.cr, request.uid, request.context
         certification_obj = request.registry['certification.certification']
diff --git a/addons/website_crm/controllers/main.py b/addons/website_crm/controllers/main.py
index 163e3ee9793..909e7cc9afb 100644
--- a/addons/website_crm/controllers/main.py
+++ b/addons/website_crm/controllers/main.py
@@ -16,7 +16,7 @@ class contactus(http.Controller):
         )
         return url
 
-    @http.route(['/page/website.contactus'], type='http', auth="public", website=True, multilang=True)
+    @http.route(['/page/website.contactus'], type='http', auth="public", website=True)
     def contact(self, **kwargs):
         values = {}
         for field in ['description', 'partner_name', 'phone', 'contact_name', 'email_from', 'name']:
@@ -26,7 +26,7 @@ class contactus(http.Controller):
         print values
         return request.website.render("website.contactus", values)
 
-    @http.route(['/crm/contactus'], type='http', auth="public", website=True, multilang=True)
+    @http.route(['/crm/contactus'], type='http', auth="public", website=True)
     def contactus(self, description=None, partner_name=None, phone=None, contact_name=None, email_from=None, name=None, **kwargs):
         post = {}
         post['description'] = description
diff --git a/addons/website_crm_partner_assign/controllers/main.py b/addons/website_crm_partner_assign/controllers/main.py
index 4f5639237f4..b4bf893b368 100644
--- a/addons/website_crm_partner_assign/controllers/main.py
+++ b/addons/website_crm_partner_assign/controllers/main.py
@@ -29,7 +29,7 @@ class WebsiteCrmPartnerAssign(http.Controller):
         '/partners/grade/<int:grade_id>/country/<int:country_id>/page/<int:page>',
         '/partners/grade/<int:grade_id>/country/<country_name>-<int:country_id>/page/<int:page>',
         
-    ], type='http', auth="public", website=True, multilang=True)
+    ], type='http', auth="public", website=True)
     def partners(self, country_id=0, grade_id=0, page=0, **post):
         country_obj = request.registry['res.country']
         partner_obj = request.registry['res.partner']
@@ -111,7 +111,7 @@ class WebsiteCrmPartnerAssign(http.Controller):
         return request.website.render("website_crm_partner_assign.index", values)
 
     # Do not use semantic controller due to SUPERUSER_ID
-    @http.route(['/partners/<int:partner_id>', '/partners/<partner_name>-<int:partner_id>'], type='http', auth="public", website=True, multilang=True)
+    @http.route(['/partners/<int:partner_id>', '/partners/<partner_name>-<int:partner_id>'], type='http', auth="public", website=True)
     def partners_ref(self, partner_id, **post):
         partner = request.registry['res.partner'].browse(request.cr, SUPERUSER_ID, partner_id, context=request.context)
         values = website_partner.get_partner_template_value(partner)
diff --git a/addons/website_customer/controllers/main.py b/addons/website_customer/controllers/main.py
index 5f0825e132c..ea8b28cf246 100644
--- a/addons/website_customer/controllers/main.py
+++ b/addons/website_customer/controllers/main.py
@@ -18,7 +18,7 @@ class WebsiteCustomer(http.Controller):
         '/customers/country/<country_name>-<int:country_id>',
         '/customers/country/<int:country_id>/page/<int:page>',
         '/customers/country/<country_name>-<int:country_id>/page/<int:page>',
-    ], type='http', auth="public", website=True, multilang=True)
+    ], type='http', auth="public", website=True)
     def customers(self, country_id=0, page=0, **post):
         cr, uid, context = request.cr, request.uid, request.context
         country_obj = request.registry['res.country']
@@ -83,7 +83,7 @@ class WebsiteCustomer(http.Controller):
         }
         return request.website.render("website_customer.index", values)
 
-    @http.route(['/customers/<int:partner_id>', '/customers/<partner_name>-<int:partner_id>'], type='http', auth="public", website=True, multilang=True)
+    @http.route(['/customers/<int:partner_id>', '/customers/<partner_name>-<int:partner_id>'], type='http', auth="public", website=True)
     def customer(self, partner_id, **post):
         partner = request.registry['res.partner'].browse(request.cr, SUPERUSER_ID, partner_id, context=request.context)
         values = website_partner.get_partner_template_value(partner)
diff --git a/addons/website_event/controllers/main.py b/addons/website_event/controllers/main.py
index 9de29335eb7..5cd3ffda72b 100644
--- a/addons/website_event/controllers/main.py
+++ b/addons/website_event/controllers/main.py
@@ -43,7 +43,7 @@ except ImportError:
     _logger.warn("Please install GeoIP python module to use events localisation.")
 
 class website_event(http.Controller):
-    @http.route(['/event', '/event/page/<int:page>'], type='http', auth="public", website=True, multilang=True)
+    @http.route(['/event', '/event/page/<int:page>'], type='http', auth="public", website=True)
     def events(self, page=1, **searches):
         cr, uid, context = request.cr, request.uid, request.context
         event_obj = request.registry['event.event']
@@ -170,7 +170,7 @@ class website_event(http.Controller):
 
         return request.website.render("website_event.index", values)
 
-    @http.route(['/event/<model("event.event"):event>/page/<page:path>'], type='http', auth="public", website=True, multilang=True)
+    @http.route(['/event/<model("event.event"):event>/page/<page:path>'], type='http', auth="public", website=True)
     def event_page(self, event, page, **post):
         values = {
             'event': event,
@@ -178,7 +178,7 @@ class website_event(http.Controller):
         }
         return request.website.render(page, values)
 
-    @http.route(['/event/<model("event.event"):event>'], type='http', auth="public", website=True, multilang=True)
+    @http.route(['/event/<model("event.event"):event>'], type='http', auth="public", website=True)
     def event(self, event, **post):
         if event.menu_id and event.menu_id.child_id:
             target_url = event.menu_id.child_id[0].url
@@ -188,7 +188,7 @@ class website_event(http.Controller):
             target_url += '?enable_editor=1'
         return request.redirect(target_url);
 
-    @http.route(['/event/<model("event.event"):event>/register'], type='http', auth="public", website=True, multilang=True)
+    @http.route(['/event/<model("event.event"):event>/register'], type='http', auth="public", website=True)
     def event_register(self, event, **post):
         values = {
             'event': event,
@@ -197,7 +197,7 @@ class website_event(http.Controller):
         }
         return request.website.render("website_event.event_description_full", values)
 
-    @http.route('/event/add_event', type='http', auth="user", multilang=True, methods=['POST'], website=True)
+    @http.route('/event/add_event', type='http', auth="user", methods=['POST'], website=True)
     def add_event(self, event_name="New Event", **kwargs):
         return self._add_event(event_name, request.context, **kwargs)
 
diff --git a/addons/website_event_sale/controllers/main.py b/addons/website_event_sale/controllers/main.py
index 1c39484f8c8..ec9dda5957c 100644
--- a/addons/website_event_sale/controllers/main.py
+++ b/addons/website_event_sale/controllers/main.py
@@ -28,7 +28,7 @@ from openerp.tools.translate import _
 
 class website_event(website_event):
 
-    @http.route(['/event/cart/update'], type='http', auth="public", methods=['POST'], website=True, multilang=True)
+    @http.route(['/event/cart/update'], type='http', auth="public", methods=['POST'], website=True)
     def cart_update(self, event_id, **post):
         cr, uid, context = request.cr, request.uid, request.context
         ticket_obj = request.registry.get('event.event.ticket')
diff --git a/addons/website_event_track/controllers/event.py b/addons/website_event_track/controllers/event.py
index 4a3d814960e..1cd7d9eeea7 100644
--- a/addons/website_event_track/controllers/event.py
+++ b/addons/website_event_track/controllers/event.py
@@ -33,7 +33,7 @@ import pytz
 from pytz import timezone
 
 class website_event(http.Controller):
-    @http.route(['''/event/<model("event.event"):event>/track/<model("event.track", "[('event_id','=',event[0])]"):track>'''], type='http', auth="public", website=True, multilang=True)
+    @http.route(['''/event/<model("event.event"):event>/track/<model("event.track", "[('event_id','=',event[0])]"):track>'''], type='http', auth="public", website=True)
     def event_track_view(self, event, track, **post):
         track_obj = request.registry.get('event.track')
         track = track_obj.browse(request.cr, openerp.SUPERUSER_ID, track.id, context=request.context)
@@ -77,7 +77,7 @@ class website_event(http.Controller):
 
 
     # TODO: not implemented
-    @http.route(['''/event/<model("event.event", "[('show_tracks','=',1)]"):event>/agenda'''], type='http', auth="public", website=True, multilang=True)
+    @http.route(['''/event/<model("event.event", "[('show_tracks','=',1)]"):event>/agenda'''], type='http', auth="public", website=True)
     def event_agenda(self, event, tag=None, **post):
         comp = lambda x: (x.date, bool(x.location_id))
         event.track_ids.sort(lambda x,y: cmp(comp(x), comp(y)))
@@ -103,7 +103,7 @@ class website_event(http.Controller):
     @http.route([
         '''/event/<model("event.event", "[('show_tracks','=',1)]"):event>/track''',
         '''/event/<model("event.event", "[('show_tracks','=',1)]"):event>/track/tag/<model("event.track.tag"):tag>'''
-        ], type='http', auth="public", website=True, multilang=True)
+        ], type='http', auth="public", website=True)
     def event_tracks(self, event, tag=None, **post):
         searches = {}
         if tag:
@@ -128,12 +128,12 @@ class website_event(http.Controller):
         }
         return request.website.render("website_event_track.tracks", values)
 
-    @http.route(['''/event/<model("event.event", "[('show_track_proposal','=',1)]"):event>/track_proposal'''], type='http', auth="public", website=True, multilang=True)
+    @http.route(['''/event/<model("event.event", "[('show_track_proposal','=',1)]"):event>/track_proposal'''], type='http', auth="public", website=True)
     def event_track_proposal(self, event, **post):
         values = { 'event': event }
         return request.website.render("website_event_track.event_track_proposal", values)
 
-    @http.route(['/event/<model("event.event"):event>/track_proposal/post'], type='http', auth="public", methods=['POST'], website=True, multilang=True)
+    @http.route(['/event/<model("event.event"):event>/track_proposal/post'], type='http', auth="public", methods=['POST'], website=True)
     def event_track_proposal_post(self, event, **post):
         cr, uid, context = request.cr, request.uid, request.context
 
diff --git a/addons/website_forum/controllers/main.py b/addons/website_forum/controllers/main.py
index 2ff12c3d342..244a6e9f98d 100644
--- a/addons/website_forum/controllers/main.py
+++ b/addons/website_forum/controllers/main.py
@@ -65,7 +65,7 @@ class WebsiteForum(http.Controller):
     # Forum
     # --------------------------------------------------
 
-    @http.route(['/forum'], type='http', auth="public", website=True, multilang=True)
+    @http.route(['/forum'], type='http', auth="public", website=True)
     def forum(self, **kwargs):
         cr, uid, context = request.cr, request.uid, request.context
         Forum = request.registry['forum.forum']
@@ -73,14 +73,14 @@ class WebsiteForum(http.Controller):
         forums = Forum.browse(cr, uid, obj_ids, context=context)
         return request.website.render("website_forum.forum_all", {'forums': forums})
 
-    @http.route('/forum/new', type='http', auth="user", multilang=True, website=True)
+    @http.route('/forum/new', type='http', auth="user", website=True)
     def forum_create(self, forum_name="New Forum", **kwargs):
         forum_id = request.registry['forum.forum'].create(request.cr, request.uid, {
             'name': forum_name,
         }, context=request.context)
         return request.redirect("/forum/%s" % slug(forum_id))
 
-    @http.route('/forum/notification_read', type='json', auth="user", multilang=True, methods=['POST'], website=True)
+    @http.route('/forum/notification_read', type='json', auth="user", methods=['POST'], website=True)
     def notification_read(self, **kwargs):
         request.registry['mail.message'].set_message_read(request.cr, request.uid, [int(kwargs.get('notification_id'))], read=True, context=request.context)
         return True
@@ -88,7 +88,7 @@ class WebsiteForum(http.Controller):
     @http.route(['/forum/<model("forum.forum"):forum>',
                  '/forum/<model("forum.forum"):forum>/page/<int:page>',
                  '''/forum/<model("forum.forum"):forum>/tag/<model("forum.tag", "[('forum_id','=',forum[0])]"):tag>/questions'''
-                 ], type='http', auth="public", website=True, multilang=True)
+                 ], type='http', auth="public", website=True)
     def questions(self, forum, tag=None, page=1, filters='all', sorting='date', search='', **post):
         cr, uid, context = request.cr, request.uid, request.context
         Post = request.registry['forum.post']
@@ -133,18 +133,18 @@ class WebsiteForum(http.Controller):
         })
         return request.website.render("website_forum.forum_index", values)
 
-    @http.route(['/forum/<model("forum.forum"):forum>/faq'], type='http', auth="public", website=True, multilang=True)
+    @http.route(['/forum/<model("forum.forum"):forum>/faq'], type='http', auth="public", website=True)
     def forum_faq(self, forum, **post):
         values = self._prepare_forum_values(forum=forum, searches=dict(), header={'is_guidelines': True}, **post)
         return request.website.render("website_forum.faq", values)
 
-    @http.route('/forum/get_tags', type='http', auth="public", multilang=True, methods=['GET'], website=True)
+    @http.route('/forum/get_tags', type='http', auth="public", methods=['GET'], website=True)
     def tag_read(self, **post):
         tags = request.registry['forum.tag'].search_read(request.cr, request.uid, [], ['name'], context=request.context)
         data = [tag['name'] for tag in tags]
         return simplejson.dumps(data)
 
-    @http.route(['/forum/<model("forum.forum"):forum>/tag'], type='http', auth="public", website=True, multilang=True)
+    @http.route(['/forum/<model("forum.forum"):forum>/tag'], type='http', auth="public", website=True)
     def tags(self, forum, page=1, **post):
         cr, uid, context = request.cr, request.uid, request.context
         Tag = request.registry['forum.tag']
@@ -160,14 +160,14 @@ class WebsiteForum(http.Controller):
     # Questions
     # --------------------------------------------------
 
-    @http.route(['/forum/<model("forum.forum"):forum>/ask'], type='http', auth="public", website=True, multilang=True)
+    @http.route(['/forum/<model("forum.forum"):forum>/ask'], type='http', auth="public", website=True)
     def question_ask(self, forum, **post):
         if not request.session.uid:
             return login_redirect()
         values = self._prepare_forum_values(forum=forum, searches={},  header={'ask_hide': True})
         return request.website.render("website_forum.ask_question", values)
 
-    @http.route('/forum/<model("forum.forum"):forum>/question/new', type='http', auth="user", multilang=True, methods=['POST'], website=True)
+    @http.route('/forum/<model("forum.forum"):forum>/question/new', type='http', auth="user", methods=['POST'], website=True)
     def question_create(self, forum, **post):
         cr, uid, context = request.cr, request.uid, request.context
         Tag = request.registry['forum.tag']
@@ -190,7 +190,7 @@ class WebsiteForum(http.Controller):
             }, context=context)
         return werkzeug.utils.redirect("/forum/%s/question/%s" % (slug(forum), new_question_id))
 
-    @http.route(['''/forum/<model("forum.forum"):forum>/question/<model("forum.post", "[('forum_id','=',forum[0])]"):question>'''], type='http', auth="public", website=True, multilang=True)
+    @http.route(['''/forum/<model("forum.forum"):forum>/question/<model("forum.post", "[('forum_id','=',forum[0])]"):question>'''], type='http', auth="public", website=True)
     def question(self, forum, question, **post):
         cr, uid, context = request.cr, request.uid, request.context
         # increment view counter
@@ -207,7 +207,7 @@ class WebsiteForum(http.Controller):
         })
         return request.website.render("website_forum.post_description_full", values)
 
-    @http.route('/forum/<model("forum.forum"):forum>/question/<model("forum.post"):question>/toggle_favourite', type='json', auth="user", multilang=True, methods=['POST'], website=True)
+    @http.route('/forum/<model("forum.forum"):forum>/question/<model("forum.post"):question>/toggle_favourite', type='json', auth="user", methods=['POST'], website=True)
     def question_toggle_favorite(self, forum, question, **post):
         if not request.session.uid:
             return {'error': 'anonymous_user'}
@@ -220,7 +220,7 @@ class WebsiteForum(http.Controller):
         request.registry['forum.post'].write(request.cr, request.uid, [question.id], {'favourite_ids': favourite_ids}, context=request.context)
         return favourite
 
-    @http.route('/forum/<model("forum.forum"):forum>/question/<model("forum.post"):question>/ask_for_close', type='http', auth="user", multilang=True, website=True)
+    @http.route('/forum/<model("forum.forum"):forum>/question/<model("forum.post"):question>/ask_for_close', type='http', auth="user", website=True)
     def question_ask_for_close(self, forum, question, **post):
         check_res = self._has_enough_karma(question.create_uid.id == request.uid and '_karma_modo_close_own' or '_karma_modo_close_all')
         if not check_res[0]:
@@ -240,7 +240,7 @@ class WebsiteForum(http.Controller):
         })
         return request.website.render("website_forum.close_question", values)
 
-    @http.route('/forum/<model("forum.forum"):forum>/question/<model("forum.post"):question>/edit_answer', type='http', auth="user", website=True, multilang=True)
+    @http.route('/forum/<model("forum.forum"):forum>/question/<model("forum.post"):question>/edit_answer', type='http', auth="user", website=True)
     def question_edit_answer(self, forum, question, **kwargs):
         for record in question.child_ids:
             if record.create_uid.id == request.uid:
@@ -248,7 +248,7 @@ class WebsiteForum(http.Controller):
                 break
         return werkzeug.utils.redirect("/forum/%s/post/%s/edit" % (slug(forum), slug(answer)))
 
-    @http.route('/forum/<model("forum.forum"):forum>/question/<model("forum.post"):question>/close', type='http', auth="user", multilang=True, methods=['POST'], website=True)
+    @http.route('/forum/<model("forum.forum"):forum>/question/<model("forum.post"):question>/close', type='http', auth="user", methods=['POST'], website=True)
     def question_close(self, forum, question, **post):
         check_res = self._has_enough_karma(question.create_uid.id == request.uid and '_karma_modo_close_own' or '_karma_modo_close_all')
         if not check_res[0]:
@@ -262,7 +262,7 @@ class WebsiteForum(http.Controller):
         }, context=request.context)
         return werkzeug.utils.redirect("/forum/%s/question/%s" % (slug(forum), slug(question)))
 
-    @http.route('/forum/<model("forum.forum"):forum>/question/<model("forum.post"):question>/reopen', type='http', auth="user", multilang=True, website=True)
+    @http.route('/forum/<model("forum.forum"):forum>/question/<model("forum.post"):question>/reopen', type='http', auth="user", website=True)
     def question_reopen(self, forum, question, **kwarg):
         check_res = self._has_enough_karma(question.create_uid.id == request.uid and '_karma_modo_close_own' or '_karma_modo_close_all')
         if not check_res[0]:
@@ -271,7 +271,7 @@ class WebsiteForum(http.Controller):
         request.registry['forum.post'].write(request.cr, request.uid, [question.id], {'state': 'active'}, context=request.context)
         return werkzeug.utils.redirect("/forum/%s/question/%s" % (slug(forum), slug(question)))
 
-    @http.route('/forum/<model("forum.forum"):forum>/question/<model("forum.post"):question>/delete', type='http', auth="user", multilang=True, website=True)
+    @http.route('/forum/<model("forum.forum"):forum>/question/<model("forum.post"):question>/delete', type='http', auth="user", website=True)
     def question_delete(self, forum, question, **kwarg):
         check_res = self._has_enough_karma(question.create_uid.id == request.uid and '_karma_modo_unlink_own' or '_karma_modo_unlink_all')
         if not check_res[0]:
@@ -280,7 +280,7 @@ class WebsiteForum(http.Controller):
         request.registry['forum.post'].write(request.cr, request.uid, [question.id], {'active': False}, context=request.context)
         return werkzeug.utils.redirect("/forum/%s/question/%s" % (slug(forum), slug(question)))
 
-    @http.route('/forum/<model("forum.forum"):forum>/question/<model("forum.post"):question>/undelete', type='http', auth="user", multilang=True, website=True)
+    @http.route('/forum/<model("forum.forum"):forum>/question/<model("forum.post"):question>/undelete', type='http', auth="user", website=True)
     def question_undelete(self, forum, question, **kwarg):
         check_res = self._has_enough_karma(question.create_uid.id == request.uid and '_karma_modo_unlink_own' or '_karma_modo_unlink_all')
         if not check_res[0]:
@@ -292,7 +292,7 @@ class WebsiteForum(http.Controller):
     # Post
     # --------------------------------------------------
 
-    @http.route('/forum/<model("forum.forum"):forum>/post/<model("forum.post"):post>/new', type='http', auth="public", multilang=True, methods=['POST'], website=True)
+    @http.route('/forum/<model("forum.forum"):forum>/post/<model("forum.post"):post>/new', type='http', auth="public", methods=['POST'], website=True)
     def post_new(self, forum, post, **kwargs):
         if not request.session.uid:
             return login_redirect()
@@ -339,7 +339,7 @@ class WebsiteForum(http.Controller):
         request.registry['forum.post'].write(cr, uid, [post.id], {'is_correct': not post.is_correct}, context=context)
         return not post.is_correct
 
-    @http.route('/forum/<model("forum.forum"):forum>/post/<model("forum.post"):post>/delete', type='http', auth="user", multilang=True, website=True)
+    @http.route('/forum/<model("forum.forum"):forum>/post/<model("forum.post"):post>/delete', type='http', auth="user", website=True)
     def post_delete(self, forum, post, **kwargs):
         check_res = self._has_enough_karma(post.create_uid.id == request.uid and '_karma_modo_unlink_own' or '_karma_modo_unlink_all')
         if not check_res[0]:
@@ -351,7 +351,7 @@ class WebsiteForum(http.Controller):
             werkzeug.utils.redirect("/forum/%s/question/%s" % (slug(forum), slug(question)))
         return werkzeug.utils.redirect("/forum/%s" % slug(forum))
 
-    @http.route('/forum/<model("forum.forum"):forum>/post/<model("forum.post"):post>/edit', type='http', auth="user", website=True, multilang=True)
+    @http.route('/forum/<model("forum.forum"):forum>/post/<model("forum.post"):post>/edit', type='http', auth="user", website=True)
     def post_edit(self, forum, post, **kwargs):
         check_res = self._has_enough_karma(post.create_uid.id == request.uid and '_karma_modo_edit_own' or '_karma_modo_edit_all')
         if not check_res[0]:
@@ -369,7 +369,7 @@ class WebsiteForum(http.Controller):
         })
         return request.website.render("website_forum.edit_post", values)
 
-    @http.route('/forum/<model("forum.forum"):forum>/post/<model("forum.post"):post>/save', type='http', auth="user", multilang=True, methods=['POST'], website=True)
+    @http.route('/forum/<model("forum.forum"):forum>/post/<model("forum.post"):post>/save', type='http', auth="user", methods=['POST'], website=True)
     def post_save(self, forum, post, **kwargs):
         cr, uid, context = request.cr, request.uid, request.context
         question_tags = []
@@ -392,7 +392,7 @@ class WebsiteForum(http.Controller):
         question = post.parent_id if post.parent_id else post
         return werkzeug.utils.redirect("/forum/%s/question/%s" % (slug(forum), slug(question)))
 
-    @http.route('/forum/<model("forum.forum"):forum>/post/<model("forum.post"):post>/upvote', type='json', auth="public", multilang=True, website=True)
+    @http.route('/forum/<model("forum.forum"):forum>/post/<model("forum.post"):post>/upvote', type='json', auth="public", website=True)
     def post_upvote(self, forum, post, **kwargs):
         if not request.session.uid:
             return {'error': 'anonymous_user'}
@@ -404,7 +404,7 @@ class WebsiteForum(http.Controller):
         upvote = True if not post.user_vote > 0 else False
         return request.registry['forum.post'].vote(request.cr, request.uid, [post.id], upvote=upvote, context=request.context)
 
-    @http.route('/forum/<model("forum.forum"):forum>/post/<model("forum.post"):post>/downvote', type='json', auth="public", multilang=True, website=True)
+    @http.route('/forum/<model("forum.forum"):forum>/post/<model("forum.post"):post>/downvote', type='json', auth="public", website=True)
     def post_downvote(self, forum, post, **kwargs):
         if not request.session.uid:
             return {'error': 'anonymous_user'}
@@ -419,7 +419,7 @@ class WebsiteForum(http.Controller):
     # User
     # --------------------------------------------------
 
-    @http.route('/forum/<model("forum.forum"):forum>/users', type='http', auth="public", website=True, multilang=True)
+    @http.route('/forum/<model("forum.forum"):forum>/users', type='http', auth="public", website=True)
     def users(self, forum, page=1, **searches):
         cr, uid, context = request.cr, request.uid, request.context
         User = request.registry['res.users']
@@ -442,7 +442,7 @@ class WebsiteForum(http.Controller):
 
         return request.website.render("website_forum.users", values)
 
-    @http.route(['/forum/<model("forum.forum"):forum>/partner/<int:partner_id>'], type='http', auth="public", website=True, multilang=True)
+    @http.route(['/forum/<model("forum.forum"):forum>/partner/<int:partner_id>'], type='http', auth="public", website=True)
     def open_partner(self, forum, partner_id=0, **post):
         cr, uid, context = request.cr, request.uid, request.context
         pids = request.registry['res.partner'].search(cr, SUPERUSER_ID, [('id', '=', partner_id)], context=context)
@@ -452,7 +452,7 @@ class WebsiteForum(http.Controller):
                 return werkzeug.utils.redirect("/forum/%s/user/%d" % (slug(forum), partner.user_ids[0].id))
         return werkzeug.utils.redirect("/forum/%s" % slug(forum))
 
-    @http.route(['/forum/<model("forum.forum"):forum>/user/<int:user_id>'], type='http', auth="public", website=True, multilang=True)
+    @http.route(['/forum/<model("forum.forum"):forum>/user/<int:user_id>'], type='http', auth="public", website=True)
     def open_user(self, forum, user_id=0, **post):
         cr, uid, context = request.cr, request.uid, request.context
         User = request.registry['res.users']
@@ -537,7 +537,7 @@ class WebsiteForum(http.Controller):
         })
         return request.website.render("website_forum.user_detail_full", values)
 
-    @http.route('/forum/<model("forum.forum"):forum>/user/<model("res.users"):user>/edit', type='http', auth="user", multilang=True, website=True)
+    @http.route('/forum/<model("forum.forum"):forum>/user/<model("res.users"):user>/edit', type='http', auth="user", website=True)
     def edit_profile(self, forum, user, **kwargs):
         country = request.registry['res.country']
         country_ids = country.search(request.cr, SUPERUSER_ID, [], context=request.context)
@@ -549,7 +549,7 @@ class WebsiteForum(http.Controller):
         })
         return request.website.render("website_forum.edit_profile", values)
 
-    @http.route('/forum/<model("forum.forum"):forum>/user/<model("res.users"):user>/save', type='http', auth="user", multilang=True, website=True)
+    @http.route('/forum/<model("forum.forum"):forum>/user/<model("res.users"):user>/save', type='http', auth="user", website=True)
     def save_edited_profile(self, forum, user, **kwargs):
         request.registry['res.users'].write(request.cr, request.uid, [user.id], {
             'name': kwargs.get('name'),
@@ -564,7 +564,7 @@ class WebsiteForum(http.Controller):
     # Badges
     # --------------------------------------------------
 
-    @http.route('/forum/<model("forum.forum"):forum>/badge', type='http', auth="public", website=True, multilang=True)
+    @http.route('/forum/<model("forum.forum"):forum>/badge', type='http', auth="public", website=True)
     def badges(self, forum, **searches):
         cr, uid, context = request.cr, request.uid, request.context
         Badge = request.registry['gamification.badge']
@@ -576,7 +576,7 @@ class WebsiteForum(http.Controller):
         })
         return request.website.render("website_forum.badge", values)
 
-    @http.route(['''/forum/<model("forum.forum"):forum>/badge/<model("gamification.badge"):badge>'''], type='http', auth="public", website=True, multilang=True)
+    @http.route(['''/forum/<model("forum.forum"):forum>/badge/<model("gamification.badge"):badge>'''], type='http', auth="public", website=True)
     def badge_users(self, forum, badge, **kwargs):
         user_ids = [badge_user.user_id.id for badge_user in badge.owner_ids]
         users = request.registry['res.users'].browse(request.cr, SUPERUSER_ID, user_ids, context=request.context)
@@ -590,7 +590,7 @@ class WebsiteForum(http.Controller):
     # Messaging
     # --------------------------------------------------
 
-    @http.route('/forum/<model("forum.forum"):forum>/post/<model("forum.post"):post>/comment/<model("mail.message"):comment>/convert_to_answer', type='http', auth="public", multilang=True, website=True)
+    @http.route('/forum/<model("forum.forum"):forum>/post/<model("forum.post"):post>/comment/<model("mail.message"):comment>/convert_to_answer', type='http', auth="public", website=True)
     def convert_comment_to_answer(self, forum, post, comment, **kwarg):
         body = comment.body
         request.registry['mail.message'].unlink(request.cr, request.uid, [comment.id], context=request.context)
@@ -600,7 +600,7 @@ class WebsiteForum(http.Controller):
                 return self.post_comment(forum, answer, comment=html2plaintext(body))
         return self.post_new(forum, question, content=body)
 
-    @http.route('/forum/<model("forum.forum"):forum>/post/<model("forum.post"):post>/convert_to_comment', type='http', auth="user", multilang=True, website=True)
+    @http.route('/forum/<model("forum.forum"):forum>/post/<model("forum.post"):post>/convert_to_comment', type='http', auth="user", website=True)
     def convert_answer_to_comment(self, forum, post, **kwarg):
         values = {
             'comment': html2plaintext(post.content),
@@ -609,7 +609,7 @@ class WebsiteForum(http.Controller):
         request.registry['forum.post'].unlink(request.cr, SUPERUSER_ID, [post.id], context=request.context)
         return self.post_comment(forum, question, **values)
 
-    @http.route('/forum/<model("forum.forum"):forum>/post/<model("forum.post"):post>/comment/<model("mail.message"):comment>/delete', type='json', auth="user", multilang=True, website=True)
+    @http.route('/forum/<model("forum.forum"):forum>/post/<model("forum.post"):post>/comment/<model("mail.message"):comment>/delete', type='json', auth="user", website=True)
     def delete_comment(self, forum, post, comment, **kwarg):
         request.registry['mail.message'].unlink(request.cr, SUPERUSER_ID, [comment.id], context=request.context)
         return True
diff --git a/addons/website_forum_doc/controllers/main.py b/addons/website_forum_doc/controllers/main.py
index 25fdf9aa2e4..0ac68cde38a 100644
--- a/addons/website_forum_doc/controllers/main.py
+++ b/addons/website_forum_doc/controllers/main.py
@@ -7,7 +7,7 @@ from openerp.addons.website.models.website import slug
 
 
 class WebsiteDoc(http.Controller):
-    @http.route(['/forum/how-to', '/forum/how-to/<model("forum.documentation.toc"):toc>'], type='http', auth="public", website=True, multilang=True)
+    @http.route(['/forum/how-to', '/forum/how-to/<model("forum.documentation.toc"):toc>'], type='http', auth="public", website=True)
     def toc(self, toc=None, **kwargs):
         cr, uid, context, toc_id = request.cr, request.uid, request.context, False
         if toc:
@@ -26,7 +26,7 @@ class WebsiteDoc(http.Controller):
         }
         return request.website.render("website_forum_doc.documentation", value)
 
-    @http.route(['''/forum/how-to/<model("forum.documentation.toc"):toc>/<model("forum.post", "[('documentation_toc_id','=',toc)]"):post>'''], type='http', auth="public", website=True, multilang=True)
+    @http.route(['''/forum/how-to/<model("forum.documentation.toc"):toc>/<model("forum.post", "[('documentation_toc_id','=',toc)]"):post>'''], type='http', auth="public", website=True)
     def post(self, toc, post, **kwargs):
         # TODO: implement a redirect instead of crash
         assert post.documentation_toc_id.id == toc.id, "Wrong post!"
@@ -38,7 +38,7 @@ class WebsiteDoc(http.Controller):
         }
         return request.website.render("website_forum_doc.documentation_post", value)
 
-    @http.route('/forum/<model("forum.forum"):forum>/question/<model("forum.post"):post>/promote', type='http', auth="user", multilang=True, website=True)
+    @http.route('/forum/<model("forum.forum"):forum>/question/<model("forum.post"):post>/promote', type='http', auth="user", website=True)
     def post_toc(self, forum, post, **kwargs):
         cr, uid, context, toc_id = request.cr, request.uid, request.context, False
         user = request.registry['res.users'].browse(cr, uid, uid, context=context)
@@ -53,7 +53,7 @@ class WebsiteDoc(http.Controller):
         }
         return request.website.render("website_forum_doc.promote_question", value)
 
-    @http.route('/forum/<model("forum.forum"):forum>/promote_ok', type='http', auth="user", multilang=True, website=True)
+    @http.route('/forum/<model("forum.forum"):forum>/promote_ok', type='http', auth="user", website=True)
     def post_toc_ok(self, forum, post_id, toc_id, **kwargs):
         cr, uid, context = request.cr, request.uid, request.context
         user = request.registry['res.users'].browse(cr, uid, uid, context=context)
diff --git a/addons/website_hr/controllers/main.py b/addons/website_hr/controllers/main.py
index 20c865b5b89..d93d482552d 100644
--- a/addons/website_hr/controllers/main.py
+++ b/addons/website_hr/controllers/main.py
@@ -5,7 +5,7 @@ from openerp.addons.web.http import request
 
 class website_hr(http.Controller):
 
-    @http.route(['/page/website.aboutus'], type='http', auth="public", website=True, multilang=True)
+    @http.route(['/page/website.aboutus'], type='http', auth="public", website=True)
     def blog(self, **post):
         hr_obj = request.registry['hr.employee']
         employee_ids = hr_obj.search(request.cr, request.uid, [('website_published', '=', True)],
diff --git a/addons/website_hr_recruitment/controllers/main.py b/addons/website_hr_recruitment/controllers/main.py
index 8140a39dc9b..28b960c6c91 100644
--- a/addons/website_hr_recruitment/controllers/main.py
+++ b/addons/website_hr_recruitment/controllers/main.py
@@ -11,7 +11,7 @@ class website_hr_recruitment(http.Controller):
         '/jobs',
         '/jobs/department/<model("hr.department"):department>',
         '/jobs/office/<string:office>'
-        ], type='http', auth="public", website=True, multilang=True)
+        ], type='http', auth="public", website=True)
     def jobs(self, department=None, office=None):
         context=dict(request.context, show_address=True, no_tag_br=True)
         cr, uid = request.cr, request.uid
@@ -54,11 +54,11 @@ class website_hr_recruitment(http.Controller):
         job_id = request.registry.get('hr.job').create(cr, uid, value, context=context)
         return request.redirect("/jobs/detail/%s?enable_editor=1" % job_id)
 
-    @http.route(['/jobs/detail/<model("hr.job"):job>'], type='http', auth="public", website=True, multilang=True)
+    @http.route(['/jobs/detail/<model("hr.job"):job>'], type='http', auth="public", website=True)
     def jobs_detail(self, job, **kwargs):
         return request.website.render("website_hr_recruitment.detail", { 'job': job, 'main_object': job })
 
-    @http.route(['/jobs/apply/<model("hr.job"):job>'], type='http', auth="public", website=True, multilang=True)
+    @http.route(['/jobs/apply/<model("hr.job"):job>'], type='http', auth="public", website=True)
     def jobs_apply(self, job):
         error = {}
         default = {}
@@ -67,7 +67,7 @@ class website_hr_recruitment(http.Controller):
             default = request.session.pop('website_hr_recruitment_default')
         return request.website.render("website_hr_recruitment.apply", { 'job': job, 'error': error, 'default': default})
 
-    @http.route(['/jobs/thankyou'], methods=['POST'], type='http', auth="public", website=True, multilang=True)
+    @http.route(['/jobs/thankyou'], methods=['POST'], type='http', auth="public", website=True)
     def jobs_thankyou(self, **post):
         cr, uid, context = request.cr, request.uid, request.context
         imd = request.registry['ir.model.data']
diff --git a/addons/website_mail/controllers/email_designer.py b/addons/website_mail/controllers/email_designer.py
index 447474ced36..a9462f7be7d 100644
--- a/addons/website_mail/controllers/email_designer.py
+++ b/addons/website_mail/controllers/email_designer.py
@@ -8,7 +8,7 @@ from openerp.addons.web.http import request
 
 class WebsiteEmailDesigner(http.Controller):
 
-    @http.route('/website_mail/email_designer', type='http', auth="user", website=True, multilang=True)
+    @http.route('/website_mail/email_designer', type='http', auth="user", website=True)
     def index(self, model, res_id, template_model=None, **kw):
         if not model or not model in request.registry or not res_id:
             return request.redirect('/')
diff --git a/addons/website_membership/controllers/main.py b/addons/website_membership/controllers/main.py
index 11e764f0eac..568d9ba1cc5 100644
--- a/addons/website_membership/controllers/main.py
+++ b/addons/website_membership/controllers/main.py
@@ -28,7 +28,7 @@ class WebsiteMembership(http.Controller):
         '/members/association/<int:membership_id>/country/<int:country_id>',
         '/members/association/<int:membership_id>/country/<country_name>-<int:country_id>/page/<int:page>',
         '/members/association/<int:membership_id>/country/<int:country_id>/page/<int:page>',
-    ], type='http', auth="public", website=True, multilang=True)
+    ], type='http', auth="public", website=True)
     def members(self, membership_id=None, country_name=None, country_id=0, page=0, **post):
         cr, uid, context = request.cr, request.uid, request.context
         product_obj = request.registry['product.product']
@@ -105,7 +105,7 @@ class WebsiteMembership(http.Controller):
         }
         return request.website.render("website_membership.index", values)
 
-    @http.route(['/members/<int:partner_id>', '/members/<partner_name>-<int:partner_id>'], type='http', auth="public", website=True, multilang=True)
+    @http.route(['/members/<int:partner_id>', '/members/<partner_name>-<int:partner_id>'], type='http', auth="public", website=True)
     def partners_ref(self, partner_id, **post):
         partner = request.registry['res.partner'].browse(request.cr, SUPERUSER_ID, partner_id, context=request.context)
         values = website_partner.get_partner_template_value(partner)
diff --git a/addons/website_partner/controllers/main.py b/addons/website_partner/controllers/main.py
index 1e6cb9afb61..d79ee840df7 100644
--- a/addons/website_partner/controllers/main.py
+++ b/addons/website_partner/controllers/main.py
@@ -33,7 +33,7 @@ def get_partner_template_value(partner):
     return values
 
 class WebsitePartner(http.Controller):
-    @http.route(['/partners/<int:partner_id>', '/partners/<partner_name>-<int:partner_id>'], type='http', auth="public", website=True, multilang=True)
+    @http.route(['/partners/<int:partner_id>', '/partners/<partner_name>-<int:partner_id>'], type='http', auth="public", website=True)
     def partner(self, partner_id, **post):
         """ Route for displaying a single partner / customer. """
         partner = request.registry['res.partner'].browse(request.cr, SUPERUSER_ID, partner_id, context=request.context)
diff --git a/addons/website_project/controllers/main.py b/addons/website_project/controllers/main.py
index c16d49e9f44..76a65492671 100644
--- a/addons/website_project/controllers/main.py
+++ b/addons/website_project/controllers/main.py
@@ -24,7 +24,7 @@ from openerp.addons.web.http import request
 
 class website_project(http.Controller):
 
-    @http.route(['/project/<model("project.project"):project>'], type='http', auth="public", website=True, multilang=True)
+    @http.route(['/project/<model("project.project"):project>'], type='http', auth="public", website=True)
     def project(self, project=None, **post):
         cr, uid, context = request.cr, request.uid, request.context
         render_values = {
diff --git a/addons/website_quote/controllers/main.py b/addons/website_quote/controllers/main.py
index 0cc56f29096..31ddd94a865 100644
--- a/addons/website_quote/controllers/main.py
+++ b/addons/website_quote/controllers/main.py
@@ -129,7 +129,7 @@ class sale_quote(http.Controller):
         order_line_obj.write(request.cr, SUPERUSER_ID, [line_id], {'product_uom_qty': (quantity)}, context=request.context)
         return [str(quantity), str(order.amount_total)]
 
-    @http.route(["/quote/template/<model('sale.quote.template'):quote>"], type='http', auth="user", website=True, multilang=True)
+    @http.route(["/quote/template/<model('sale.quote.template'):quote>"], type='http', auth="user", website=True)
     def template_view(self, quote, **post):
         values = { 'template': quote }
         return request.website.render('website_quote.so_template', values)
diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index 1b96f8e96e9..0c2353010a4 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -114,7 +114,7 @@ class website_sale(http.Controller):
         '/shop/page/<int:page>',
         '/shop/category/<model("product.public.category"):category>',
         '/shop/category/<model("product.public.category"):category>/page/<int:page>'
-    ], type='http', auth="public", website=True, multilang=True)
+    ], type='http', auth="public", website=True)
     def shop(self, page=0, category=None, search='', **post):
         cr, uid, context, pool = request.cr, request.uid, request.context, request.registry
 
@@ -170,7 +170,7 @@ class website_sale(http.Controller):
 
         return request.website.render("website_sale.products", values)
 
-    @http.route(['/shop/product/<model("product.template"):product>'], type='http', auth="public", website=True, multilang=True)
+    @http.route(['/shop/product/<model("product.template"):product>'], type='http', auth="public", website=True)
     def product(self, product, category='', search='', **kwargs):
         cr, uid, context, pool = request.cr, request.uid, request.context, request.registry
         category_obj = pool['product.public.category']
@@ -215,7 +215,7 @@ class website_sale(http.Controller):
                 context=dict(context, mail_create_nosubcribe=True))
         return werkzeug.utils.redirect(request.httprequest.referrer + "#comments")
 
-    @http.route(['/shop/cart'], type='http', auth="public", website=True, multilang=True)
+    @http.route(['/shop/cart'], type='http', auth="public", website=True)
     def cart(self, **post):
         order = request.website.sale_get_order()
         values = {
@@ -228,13 +228,13 @@ class website_sale(http.Controller):
             values['suggested_products'] = order._cart_accessories(context=request.context)
         return request.website.render("website_sale.cart", values)
 
-    @http.route(['/shop/cart/update'], type='http', auth="public", methods=['POST'], website=True, multilang=True)
+    @http.route(['/shop/cart/update'], type='http', auth="public", methods=['POST'], website=True)
     def cart_update(self, product_id, add_qty=1, set_qty=0, **kw):
         cr, uid, context = request.cr, request.uid, request.context
         request.website.sale_get_order(force_create=1)._cart_update(product_id=int(product_id), add_qty=add_qty, set_qty=set_qty)
         return request.redirect("/shop/cart")
 
-    @http.route(['/shop/cart/update_json'], type='json', auth="public", methods=['POST'], website=True, multilang=True)
+    @http.route(['/shop/cart/update_json'], type='json', auth="public", methods=['POST'], website=True)
     def cart_update_json(self, product_id, line_id, add_qty=None, set_qty=None):
         order = request.website.sale_get_order(force_create=1)
         quantity = order._cart_update(product_id=product_id, line_id=line_id, add_qty=add_qty, set_qty=set_qty)
@@ -408,7 +408,7 @@ class website_sale(http.Controller):
 
         order_obj.write(cr, SUPERUSER_ID, [order.id], order_info, context=context)
 
-    @http.route(['/shop/checkout'], type='http', auth="public", website=True, multilang=True)
+    @http.route(['/shop/checkout'], type='http', auth="public", website=True)
     def checkout(self, **post):
         cr, uid, context, registry = request.cr, request.uid, request.context, request.registry
 
@@ -422,7 +422,7 @@ class website_sale(http.Controller):
 
         return request.website.render("website_sale.checkout", values)
 
-    @http.route(['/shop/confirm_order'], type='http', auth="public", website=True, multilang=True)
+    @http.route(['/shop/confirm_order'], type='http', auth="public", website=True)
     def confirm_order(self, **post):
         cr, uid, context, registry = request.cr, request.uid, request.context, request.registry
 
@@ -449,7 +449,7 @@ class website_sale(http.Controller):
     # Payment
     #------------------------------------------------------
 
-    @http.route(['/shop/payment'], type='http', auth="public", website=True, multilang=True)
+    @http.route(['/shop/payment'], type='http', auth="public", website=True)
     def payment(self, **post):
         """ Payment step. This page proposes several payment means based on available
         payment.acquirer. State at this point :
@@ -548,7 +548,7 @@ class website_sale(http.Controller):
         acquirer_total_url = '%s?%s' % (acquirer_form_post_url, werkzeug.url_encode(post))
         return request.redirect(acquirer_total_url)
 
-    @http.route('/shop/payment/get_status/<int:sale_order_id>', type='json', auth="public", website=True, multilang=True)
+    @http.route('/shop/payment/get_status/<int:sale_order_id>', type='json', auth="public", website=True)
     def payment_get_status(self, sale_order_id, **post):
         cr, uid, context = request.cr, request.uid, request.context
 
@@ -597,7 +597,7 @@ class website_sale(http.Controller):
             'validation': validation
         }
 
-    @http.route('/shop/payment/validate', type='http', auth="public", website=True, multilang=True)
+    @http.route('/shop/payment/validate', type='http', auth="public", website=True)
     def payment_validate(self, transaction_id=None, sale_order_id=None, **post):
         """ Method that should be called by the server when receiving an update
         for a transaction. State at this point :
@@ -639,7 +639,7 @@ class website_sale(http.Controller):
 
         return request.redirect('/shop/confirmation')
 
-    @http.route(['/shop/confirmation'], type='http', auth="public", website=True, multilang=True)
+    @http.route(['/shop/confirmation'], type='http', auth="public", website=True)
     def payment_confirmation(self, **post):
         """ End of checkout process controller. Confirmation is basically seing
         the status of a sale.order. State at this point :
@@ -662,7 +662,7 @@ class website_sale(http.Controller):
     # Edit
     #------------------------------------------------------
 
-    @http.route(['/shop/add_product'], type='http', auth="user", methods=['POST'], website=True, multilang=True)
+    @http.route(['/shop/add_product'], type='http', auth="user", methods=['POST'], website=True)
     def add_product(self, name=None, category=0, **post):
         cr, uid, context, pool = request.cr, request.uid, request.context, request.registry
         if not name:
diff --git a/addons/website_sale_delivery/controllers/main.py b/addons/website_sale_delivery/controllers/main.py
index 5f3a8f5512e..9204a8b9655 100644
--- a/addons/website_sale_delivery/controllers/main.py
+++ b/addons/website_sale_delivery/controllers/main.py
@@ -6,7 +6,7 @@ from openerp import SUPERUSER_ID
 
 class website_sale(openerp.addons.website_sale.controllers.main.website_sale):
 
-    @http.route(['/shop/payment'], type='http', auth="public", website=True, multilang=True)
+    @http.route(['/shop/payment'], type='http', auth="public", website=True)
     def payment(self, **post):
         cr, uid, context = request.cr, request.uid, request.context
         order = self.get_order()

From c73a2f1c57b1f096ba6efd872fe65f710ec9afca Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 13 May 2014 12:07:20 +0200
Subject: [PATCH 106/225] [FIX] restore request.website_multilang for templates

---
 addons/website/models/ir_http.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/website/models/ir_http.py b/addons/website/models/ir_http.py
index 358f105b0d0..4f486b73b5d 100644
--- a/addons/website/models/ir_http.py
+++ b/addons/website/models/ir_http.py
@@ -51,6 +51,8 @@ class ir_http(orm.AbstractModel):
             # in all cases, website processes them
             request.website_enabled = True
 
+        request.website_multilang = request.website_enabled and func.routing.get('multilang', True)
+
         if request.website_enabled:
             if func:
                 self._authenticate(func.routing['auth'])

From 119823ab84f80663ce3943beb129869ccd751632 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 13 May 2014 12:07:29 +0200
Subject: [PATCH 107/225] [IMP] Redirect to language-less url on default
 language

---
 addons/website/models/ir_http.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/addons/website/models/ir_http.py b/addons/website/models/ir_http.py
index 4f486b73b5d..76f6764c427 100644
--- a/addons/website/models/ir_http.py
+++ b/addons/website/models/ir_http.py
@@ -69,6 +69,10 @@ class ir_http(orm.AbstractModel):
                 if path[1] in langs:
                     request.lang = request.context['lang'] = path.pop(1)
                     path = '/'.join(path) or '/'
+                    if request.lang == request.website.default_lang_code:
+                        # If language is in the url and it is the default language, redirect
+                        # to url without language so google doesn't see duplicate content
+                        return request.redirect(path + request.httprequest.query_string)
                     return self.reroute(path)
                 return self._handle_exception(code=404)
         return super(ir_http, self)._dispatch()

From a1e70ea0a466f882552f13a087a5ad7322dea976 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 13 May 2014 12:09:24 +0200
Subject: [PATCH 108/225] [IMP] website_crm, website_sale: have only one
 salesteam to handle ecommerce and contact form. The xml_id is now based on
 website.

---
 addons/website_crm/controllers/main.py       | 1 +
 addons/website_crm/data/website_crm_data.xml | 8 ++++----
 addons/website_sale/data/data.xml            | 2 +-
 addons/website_sale/data/demo.xml            | 2 +-
 addons/website_sale/models/sale_order.py     | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/addons/website_crm/controllers/main.py b/addons/website_crm/controllers/main.py
index 163e3ee9793..59949b984c3 100644
--- a/addons/website_crm/controllers/main.py
+++ b/addons/website_crm/controllers/main.py
@@ -71,6 +71,7 @@ class contactus(http.Controller):
             if not hasattr(field_value, 'filename'):
                 post['description'] = "%s\n%s: %s" % (post['description'], field_name, field_value)
 
+        post['section_id'] = request.registry['ir.model.data'].xmlid_to_res_id(request.cr, SUPERUSER_ID, 'website.salesteam_website_sales')
         lead_id = request.registry['crm.lead'].create(request.cr, SUPERUSER_ID, post, request.context)
 
         for field_name, field_value in kwargs.items():
diff --git a/addons/website_crm/data/website_crm_data.xml b/addons/website_crm/data/website_crm_data.xml
index 80c8530935d..fa1c310f4f6 100644
--- a/addons/website_crm/data/website_crm_data.xml
+++ b/addons/website_crm/data/website_crm_data.xml
@@ -12,11 +12,11 @@
             <field name="state">open</field>
         </record>
 
-        <record model="crm.case.section" id="website.section_sales_department">
-            <field name="name">Website</field>
-            <field name="code">Website</field>
-            <field name="use_leads">True</field>
+        <record model="crm.case.section" id="website.salesteam_website_sales">
+            <field name="name">Website Sales</field>
+            <field name="code">WS</field>
             <field name="member_ids" eval="[(4, ref('base.user_root'))]"/>
+            <field name="use_leads">True</field>
         </record>
 
     </data>
diff --git a/addons/website_sale/data/data.xml b/addons/website_sale/data/data.xml
index 1ce96d4cbf0..398128e0aff 100644
--- a/addons/website_sale/data/data.xml
+++ b/addons/website_sale/data/data.xml
@@ -32,7 +32,7 @@
             <field name="html_class">oe_image_full</field>
         </record>
 
-        <record model="crm.case.section" id="salesteam_website_sales">
+        <record model="crm.case.section" id="website.salesteam_website_sales">
             <field name="name">Website Sales</field>
             <field name="code">WS</field>
             <field name="member_ids" eval="[(4, ref('base.user_root'))]"/>
diff --git a/addons/website_sale/data/demo.xml b/addons/website_sale/data/demo.xml
index 8138f1a3274..f64b6e905ec 100644
--- a/addons/website_sale/data/demo.xml
+++ b/addons/website_sale/data/demo.xml
@@ -548,7 +548,7 @@ Weight: 1.1 ounces</field>
             <field name="sequence">1</field>
         </record>
         
-        <record id="salesteam_website_sales" model="crm.case.section">
+        <record model="crm.case.section" id="website.salesteam_website_sales">
             <field name="member_ids" eval="[(4, ref('base.user_root'), ref('base.user_demo'))]"/>
         </record>
         
diff --git a/addons/website_sale/models/sale_order.py b/addons/website_sale/models/sale_order.py
index 3fbe3329384..285e927bb5f 100644
--- a/addons/website_sale/models/sale_order.py
+++ b/addons/website_sale/models/sale_order.py
@@ -141,7 +141,7 @@ class website(orm.Model):
                     'user_id': w.user_id.id,
                     'partner_id': partner.id,
                     'pricelist_id': partner.property_product_pricelist.id,
-                    'section_id': self.pool.get('ir.model.data').get_object_reference(cr, uid, 'website_sale', 'salesteam_website_sales')[1],
+                    'section_id': self.pool.get('ir.model.data').get_object_reference(cr, uid, 'website', 'salesteam_website_sales')[1],
                 }
                 sale_order_id = sale_order_obj.create(cr, SUPERUSER_ID, values, context=context)
                 values = sale_order_obj.onchange_partner_id(cr, SUPERUSER_ID, [], partner.id, context=context)['value']

From e53c7748a0a19f24a776e8b440cfe993efb3b3c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 13 May 2014 12:21:00 +0200
Subject: [PATCH 109/225] [IMP] website_sale: toggle multi salesteam mode

---
 addons/website_sale/security/website_sale.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/addons/website_sale/security/website_sale.xml b/addons/website_sale/security/website_sale.xml
index 5f623a7bec2..90bf72bd21c 100644
--- a/addons/website_sale/security/website_sale.xml
+++ b/addons/website_sale/security/website_sale.xml
@@ -23,5 +23,10 @@
         <field name="perm_unlink" eval="False"/>
     </record>
 
+    <!-- toggle multi salesteam mode -->
+    <record id="base.group_user" model="res.groups">
+        <field name="implied_ids" eval="[(3, ref('base.group_mono_salesteams')), (4, ref('base.group_multi_salesteams'))]"/>
+    </record>
+
 </data>
 </openerp>

From 28b20d312d837a8ff67012093180217592ad9548 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 13 May 2014 12:32:53 +0200
Subject: [PATCH 110/225] [FIX] Re-added code removed by al at rev 9421:
 website quotation email was not sent anymore.

---
 addons/website_sale/controllers/main.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index 1b96f8e96e9..c31cd970344 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -634,6 +634,16 @@ class website_sale(http.Controller):
             # cancel the quotation
             sale_order_obj.action_cancel(cr, SUPERUSER_ID, [order.id], context=request.context)
 
+        # send the email
+        if email_act and email_act.get('context'):
+            composer_values = {}
+            email_ctx = email_act['context']
+            public_id = request.website.user_id.id
+            if uid == public_id:
+                composer_values['email_from'] = request.website.user_id.company_id.email
+            composer_id = request.registry['mail.compose.message'].create(cr, SUPERUSER_ID, composer_values, context=email_ctx)
+            request.registry['mail.compose.message'].send_mail(cr, SUPERUSER_ID, [composer_id], context=email_ctx)
+
         # clean context and session, then redirect to the confirmation page
         request.website.sale_reset(context=context)
 

From aa08287d08f837ca5d8dcb397e60aa35286db966 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 13 May 2014 13:18:37 +0200
Subject: [PATCH 111/225] [FIX] document, mail, project: re-add tree view for
 attachments removed at revision 9279 and 9280 when adding a kanban view for
 documents.

---
 addons/document/document_view.xml | 2 +-
 addons/mail/mail_message_view.xml | 2 +-
 addons/project/project.py         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index b735d2ce4a4..3376655d29d 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -243,7 +243,7 @@
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">ir.attachment</field>
         <field name="view_type">form</field>
-        <field name="view_mode">kanban,form</field>
+        <field name="view_mode">kanban,tree,form</field>
         <field name="help" type="html">
           <p class="oe_view_nocontent_create">
             Click to create a new document. 
diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index 1c4a7f55c10..6c15114cde6 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -115,7 +115,7 @@
             </field>
         </record>
         <record id="base.action_attachment" model="ir.actions.act_window">
-            <field name="view_mode">kanban,form</field>
+            <field name="view_mode">kanban,tree,form</field>
         </record>
 
 
diff --git a/addons/project/project.py b/addons/project/project.py
index 883db8fd0be..2249cf07dd5 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -214,7 +214,7 @@ class project(osv.osv):
             'res_model': 'ir.attachment',
             'type': 'ir.actions.act_window',
             'view_id': False,
-            'view_mode': 'kanban,form',
+            'view_mode': 'kanban,tree,form',
             'view_type': 'form',
             'limit': 80,
             'context': "{'default_res_model': '%s','default_res_id': %d}" % (self._name, res_id)

From 08c504d39e5670b8d1054fc0c0f1b5831fbfc9bc Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Tue, 13 May 2014 13:38:10 +0200
Subject: [PATCH 112/225] [FIX] web: Dialog: avoid triggering "closing" twice.

---
 addons/web/static/src/js/chrome.js | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 80851395520..f611d5bd502 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -156,7 +156,7 @@ instance.web.Dialog = instance.web.Widget.extend({
             'keyboard': true,
         });
         if (options.size !== 'large'){
-            var dialog_class_size = this.$dialog_box.find('.modal-lg').removeClass('modal-lg')
+            var dialog_class_size = this.$dialog_box.find('.modal-lg').removeClass('modal-lg');
             if (options.size === 'small'){
                 dialog_class_size.addClass('modal-sm');
             }
@@ -169,7 +169,7 @@ instance.web.Dialog = instance.web.Widget.extend({
         }
         $dialog_content.openerpClass();
 
-        this.$dialog_box.on('hidden.bs.modal', this, function(){
+        this.$dialog_box.on('hidden.bs.modal', this, function() {
             self.close();
         });
         this.$dialog_box.modal('show');
@@ -179,13 +179,15 @@ instance.web.Dialog = instance.web.Widget.extend({
         return res;
     },
     /**
-        Closes the popup, if destroy_on_close was passed to the constructor, it is also destroyed.
+        Closes (hide) the popup, if destroy_on_close was passed to the constructor, it will be destroyed instead.
     */
     close: function(reason) {
-        if (this.dialog_inited) {
+        if (this.dialog_inited && !this.__tmp_dialog_hiding) {
             this.trigger("closing", reason);
             if (this.$el.is(":data(bs.modal)")) {     // may have been destroyed by closing signal
-		this.$el.parents('.modal').modal('hide');
+                this.__tmp_dialog_hiding = true;
+                this.$dialog_box.modal('hide');
+                this.__tmp_dialog_hiding = undefined;
             }
         }
     },
@@ -221,7 +223,7 @@ instance.web.Dialog = instance.web.Widget.extend({
                 opened_modal.pop().remove();
                 if (opened_modal.length > 0){
                     //we still have other opened modal so we should focus it
-                    opened_modal[opened_modal.length-1].focus()
+                    opened_modal[opened_modal.length-1].focus();
                 }
             },0);
         }
@@ -247,8 +249,7 @@ instance.web.CrashManager = instance.web.Class.extend({
             this.show_warning({type: "Session Expired", data: { message: _t("Your OpenERP session expired. Please refresh the current web page.") }});
             return;
         }
-        if (error.data.exception_type === "except_osv" || error.data.exception_type === "warning"
-                || error.data.exception_type === "access_error") {
+        if (error.data.exception_type === "except_osv" || error.data.exception_type === "warning" || error.data.exception_type === "access_error") {
             this.show_warning(error);
         } else {
             this.show_error(error);

From 11a9c2d409411029c9a69b38fe22d6091f189847 Mon Sep 17 00:00:00 2001
From: Anael Closson <acl@openerp.com>
Date: Tue, 13 May 2014 14:00:06 +0200
Subject: [PATCH 113/225] [FIX] sale_stock: new product uom is done twice in
 sale order line on change - opw 607150 [FIX] sale_stock: comparing stock and
 sale order line qty is always done with default uom rounding precision

---
 addons/sale_stock/sale_stock.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale_stock/sale_stock.py b/addons/sale_stock/sale_stock.py
index 50e0112fec2..6c1e4c58e6c 100644
--- a/addons/sale_stock/sale_stock.py
+++ b/addons/sale_stock/sale_stock.py
@@ -610,7 +610,7 @@ class sale_order_line(osv.osv):
         res_packing = self.product_packaging_change(cr, uid, ids, pricelist, product, qty, uom, partner_id, packaging, context=context)
         res['value'].update(res_packing.get('value', {}))
         warning_msgs = res_packing.get('warning') and res_packing['warning']['message'] or ''
-        compare_qty = float_compare(product_obj.virtual_available * uom2.factor, qty * product_obj.uom_id.factor, precision_rounding=product_obj.uom_id.rounding)
+        compare_qty = float_compare(product_obj.virtual_available, qty, precision_rounding=uom2.rounding)
         if (product_obj.type=='product') and int(compare_qty) == -1 \
           and (product_obj.procure_method=='make_to_stock'):
             warn_msg = _('You plan to sell %.2f %s but you only have %.2f %s available !\nThe real stock is %.2f %s. (without reservations)') % \

From 5bc76f63e9efe02afc150fbbf122de018985b549 Mon Sep 17 00:00:00 2001
From: Anael Closson <acl@openerp.com>
Date: Tue, 13 May 2014 14:19:45 +0200
Subject: [PATCH 114/225] [FIX] sale_stock: error message does not match chosen
 units when not enough stock.

---
 addons/sale_stock/sale_stock.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/sale_stock/sale_stock.py b/addons/sale_stock/sale_stock.py
index 6c1e4c58e6c..a1e8f511866 100644
--- a/addons/sale_stock/sale_stock.py
+++ b/addons/sale_stock/sale_stock.py
@@ -612,11 +612,11 @@ class sale_order_line(osv.osv):
         warning_msgs = res_packing.get('warning') and res_packing['warning']['message'] or ''
         compare_qty = float_compare(product_obj.virtual_available, qty, precision_rounding=uom2.rounding)
         if (product_obj.type=='product') and int(compare_qty) == -1 \
-          and (product_obj.procure_method=='make_to_stock'):
+           and (product_obj.procure_method=='make_to_stock'):
             warn_msg = _('You plan to sell %.2f %s but you only have %.2f %s available !\nThe real stock is %.2f %s. (without reservations)') % \
-                    (qty, uom2 and uom2.name or product_obj.uom_id.name,
-                     max(0,product_obj.virtual_available), product_obj.uom_id.name,
-                     max(0,product_obj.qty_available), product_obj.uom_id.name)
+                    (qty, uom2.name,
+                     max(0,product_obj.virtual_available), uom2.name,
+                     max(0,product_obj.qty_available), uom2.name)
             warning_msgs += _("Not enough stock ! : ") + warn_msg + "\n\n"
 
         #update of warning messages

From 59effb89e301aedefbfd3a5292dfe78c9064cb78 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 13 May 2014 15:31:24 +0200
Subject: [PATCH 115/225] [FIX] broken domain in route

---
 addons/website_forum_doc/controllers/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_forum_doc/controllers/main.py b/addons/website_forum_doc/controllers/main.py
index 25fdf9aa2e4..f31e41759db 100644
--- a/addons/website_forum_doc/controllers/main.py
+++ b/addons/website_forum_doc/controllers/main.py
@@ -26,7 +26,7 @@ class WebsiteDoc(http.Controller):
         }
         return request.website.render("website_forum_doc.documentation", value)
 
-    @http.route(['''/forum/how-to/<model("forum.documentation.toc"):toc>/<model("forum.post", "[('documentation_toc_id','=',toc)]"):post>'''], type='http', auth="public", website=True, multilang=True)
+    @http.route(['''/forum/how-to/<model("forum.documentation.toc"):toc>/<model("forum.post", "[('documentation_toc_id','=',toc[0])]"):post>'''], type='http', auth="public", website=True, multilang=True)
     def post(self, toc, post, **kwargs):
         # TODO: implement a redirect instead of crash
         assert post.documentation_toc_id.id == toc.id, "Wrong post!"

From c50d82ddea862cc8e619e683e639401f7971ef5d Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 13 May 2014 16:09:26 +0200
Subject: [PATCH 116/225] [FIX] crm: make days to close and days to open simple
 calendar delta

When computing the duration to close or to open a lead, do not use some kind of complex computation with working days. It does not make sense to use the number of intervals with the number of days. The computation was incorrect and very slow.
Replaced by simple calendar delta.
---
 addons/crm/crm_lead.py | 34 +++-------------------------------
 1 file changed, 3 insertions(+), 31 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index bf6ef242cc8..ccc0cbd5396 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -167,9 +167,6 @@ class crm_lead(format_address, osv.osv):
         """
         :return dict: difference between current date and log date
         """
-        cal_obj = self.pool.get('resource.calendar')
-        res_obj = self.pool.get('resource.resource')
-
         res = {}
         for lead in self.browse(cr, uid, ids, context=context):
             for field in fields:
@@ -181,39 +178,14 @@ class crm_lead(format_address, osv.osv):
                         date_create = datetime.strptime(lead.create_date, "%Y-%m-%d %H:%M:%S")
                         date_open = datetime.strptime(lead.date_open, "%Y-%m-%d %H:%M:%S")
                         ans = date_open - date_create
-                        date_until = lead.date_open
                 elif field == 'day_close':
                     if lead.date_closed:
                         date_create = datetime.strptime(lead.create_date, "%Y-%m-%d %H:%M:%S")
                         date_close = datetime.strptime(lead.date_closed, "%Y-%m-%d %H:%M:%S")
-                        date_until = lead.date_closed
                         ans = date_close - date_create
                 if ans:
-                    resource_id = False
-                    if lead.user_id:
-                        resource_ids = res_obj.search(cr, uid, [('user_id','=',lead.user_id.id)])
-                        if len(resource_ids):
-                            resource_id = resource_ids[0]
-
-                    duration = float(ans.days)
-                    if lead.section_id and lead.section_id.resource_calendar_id:
-                        duration =  float(ans.days) * 24
-                        new_dates = cal_obj.interval_get(cr,
-                            uid,
-                            lead.section_id.resource_calendar_id and lead.section_id.resource_calendar_id.id or False,
-                            datetime.strptime(lead.create_date, '%Y-%m-%d %H:%M:%S'),
-                            duration,
-                            resource=resource_id
-                        )
-                        no_days = []
-                        date_until = datetime.strptime(date_until, '%Y-%m-%d %H:%M:%S')
-                        for in_time, out_time in new_dates:
-                            if in_time.date not in no_days:
-                                no_days.append(in_time.date)
-                            if out_time > date_until:
-                                break
-                        duration =  len(no_days)
-                res[lead.id][field] = abs(int(duration))
+                    duration = abs(int(ans.days))
+                res[lead.id][field] = duration
         return res
 
     _columns = {
@@ -253,7 +225,7 @@ class crm_lead(format_address, osv.osv):
         'day_open': fields.function(_compute_day, string='Days to Open', \
                                 multi='day_open', type="float", store=True),
         'day_close': fields.function(_compute_day, string='Days to Close', \
-                                multi='day_close', type="float", store=True),
+                                multi='day_open', type="float", store=True),
         'date_last_stage_update': fields.datetime('Last Stage Update', select=True),
 
         # Messaging and marketing

From c3cfc4bc32db1567c774632770b7d413dcf2c973 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 13 May 2014 16:38:31 +0200
Subject: [PATCH 117/225] [MERGE] sitemap backport, merge trunk from 9438 til
 9440

merge from 9438 revid:fp@tinyerp.com-20140511115231-g8ke14r9iepyypv4 til 9440 revid:fp@tinyerp.com-20140511143314-nzn1239l00arbxjq
---
 addons/website/controllers/main.py            | 35 +++++---
 addons/website/data/website_data.xml          |  2 +-
 addons/website/models/ir_http.py              | 44 ++++++----
 addons/website/models/website.py              | 82 ++++++++-----------
 addons/website/tests/test_requests.py         |  2 +-
 addons/website/views/website_templates.xml    | 40 +++++----
 addons/website_blog/controllers/main.py       |  4 +-
 addons/website_blog/models/website_blog.py    |  2 -
 .../controllers/main.py                       |  1 +
 addons/website_event/controllers/main.py      |  2 +-
 .../website_event_track/controllers/event.py  | 10 +--
 addons/website_forum/controllers/main.py      |  6 +-
 .../security/ir.model.access.csv              |  4 -
 addons/website_forum_doc/controllers/main.py  |  6 +-
 addons/website_mail_group/controllers/main.py |  2 +-
 addons/website_quote/controllers/main.py      |  4 +-
 16 files changed, 123 insertions(+), 123 deletions(-)

diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py
index b611496ef14..37d1528b653 100644
--- a/addons/website/controllers/main.py
+++ b/addons/website/controllers/main.py
@@ -26,7 +26,7 @@ logger = logging.getLogger(__name__)
 
 # Completely arbitrary limits
 MAX_IMAGE_WIDTH, MAX_IMAGE_HEIGHT = IMAGE_LIMITS = (1024, 768)
-
+LOC_PER_SITEMAP = 45000
 
 class Website(openerp.addons.web.controllers.main.Home):
     #------------------------------------------------------
@@ -69,20 +69,34 @@ class Website(openerp.addons.web.controllers.main.Home):
 
         return request.render(page, values)
 
-    @http.route(['/robots.txt'], type='http', auth="public", website=True)
+    @http.route(['/robots.txt'], type='http', auth="public")
     def robots(self):
         return request.render('website.robots', {'url_root': request.httprequest.url_root}, mimetype='text/plain')
 
-    @http.route('/sitemap', type='http', auth='public', website=True, multilang=True)
-    def sitemap(self):
-        return request.render('website.sitemap', {
-            'pages': request.website.enumerate_pages()
-        })
-
     @http.route('/sitemap.xml', type='http', auth="public", website=True)
-    def sitemap_xml(self):
+    def sitemap_xml_index(self):
+        pages = list(request.website.enumerate_pages())
+        if len(pages)<=LOC_PER_SITEMAP:
+            return self.__sitemap_xml(pages, 0)
+        # Sitemaps must be split in several smaller files with a sitemap index
         values = {
-            'pages': request.website.enumerate_pages()
+            'pages': range(len(pages)/LOC_PER_SITEMAP+1),
+            'url_root': request.httprequest.url_root
+        }
+        headers = {
+            'Content-Type': 'application/xml;charset=utf-8',
+        }
+        return request.render('website.sitemap_index_xml', values, headers=headers)
+
+    @http.route('/sitemap-<int:page>.xml', type='http', auth="public", website=True)
+    def sitemap_xml(self, page):
+        pages = list(request.website.enumerate_pages())
+        return self.__sitemap_xml(pages, page)
+
+    def __sitemap_xml(self, pages, index=0):
+        values = {
+            'pages': pages[index*LOC_PER_SITEMAP:(index+1)*LOC_PER_SITEMAP],
+            'url_root': request.httprequest.url_root.rstrip('/')
         }
         headers = {
             'Content-Type': 'application/xml;charset=utf-8',
@@ -450,4 +464,3 @@ class Website(openerp.addons.web.controllers.main.Home):
             return res
         return request.redirect('/')
 
-# vim:et:
diff --git a/addons/website/data/website_data.xml b/addons/website/data/website_data.xml
index 4eff1b8a60d..c5254d65c0f 100644
--- a/addons/website/data/website_data.xml
+++ b/addons/website/data/website_data.xml
@@ -15,7 +15,7 @@
 
         <record id="menu_homepage" model="website.menu">
             <field name="name">Home</field>
-            <field name="url">/</field>
+            <field name="url">/page/homepage</field>
             <field name="parent_id" ref="website.main_menu"/>
             <field name="sequence" type="int">10</field>
         </record>
diff --git a/addons/website/models/ir_http.py b/addons/website/models/ir_http.py
index acceed1e718..91b998c76c9 100644
--- a/addons/website/models/ir_http.py
+++ b/addons/website/models/ir_http.py
@@ -171,8 +171,9 @@ class ir_http(orm.AbstractModel):
         return super(ir_http, self)._handle_exception(exception)
 
 class ModelConverter(ir.ir_http.ModelConverter):
-    def __init__(self, url_map, model=False):
+    def __init__(self, url_map, model=False, domain='[]'):
         super(ModelConverter, self).__init__(url_map, model)
+        self.domain = domain
         self.regex = r'(?:[A-Za-z0-9-_]+?-)?(\d+)(?=$|/)'
 
     def to_url(self, value):
@@ -184,24 +185,31 @@ class ModelConverter(ir.ir_http.ModelConverter):
         return request.registry[self.model].browse(
             request.cr, _uid, int(m.group(1)), context=request.context)
 
-    def generate(self, cr, uid, query=None, context=None):
-        return request.registry[self.model].name_search(
-            cr, uid, name=query or '', context=context)
+    def generate(self, cr, uid, query=None, args=None, context=None):
+        obj = request.registry[self.model]
+        domain = eval( self.domain, (args or {}).copy())
+        if query:
+            domain.append((obj._rec_name, 'ilike', '%'+query+'%'))
+        for record in obj.search_read(cr, uid, domain=domain, fields=['write_date',obj._rec_name], context=context):
+            if record.get(obj._rec_name, False):
+                yield {'loc': (record['id'], record[obj._rec_name])}
 
 class PageConverter(werkzeug.routing.PathConverter):
-    """ Only point of this converter is to bundle pages enumeration logic
-
-    Sads got: no way to get the view's human-readable name even if one exists
-    """
-    def generate(self, cr, uid, query=None, context=None):
+    """ Only point of this converter is to bundle pages enumeration logic """
+    def generate(self, cr, uid, query=None, args={}, context=None):
         View = request.registry['ir.ui.view']
-        views = View.search_read(
-            cr, uid, [['page', '=', True]],
-            fields=[], order='name', context=context)
-        xids = View.get_external_id(
-            cr, uid, [view['id'] for view in views], context=context)
-
+        views = View.search_read(cr, uid, [['page', '=', True]],
+            fields=['xml_id','priority','write_date'], order='name', context=context)
         for view in views:
-            xid = xids[view['id']]
-            if xid and (not query or query.lower() in xid.lower()):
-                yield xid
+            xid = view['xml_id'].startswith('website.') and view['xml_id'][8:] or view['xml_id']
+            # the 'page/homepage' url is indexed as '/', avoid aving the same page referenced twice
+            # when we will have an url mapping mechanism, replace this by a rule: page/homepage --> /
+            if xid=='homepage': continue
+            if query and query.lower() not in xid.lower():
+                continue
+            record = {'loc': xid}
+            if view['priority'] <> 16:
+                record['__priority'] = min(round(view['priority'] / 32.0,1), 1)
+            if view.get('write_date'):
+                record['__lastmod'] = view['write_date'][:10]
+            yield record
diff --git a/addons/website/models/website.py b/addons/website/models/website.py
index 51dda75f516..584dc4b6105 100644
--- a/addons/website/models/website.py
+++ b/addons/website/models/website.py
@@ -296,44 +296,23 @@ class website(osv.osv):
         endpoint = rule.endpoint
         methods = rule.methods or ['GET']
         converters = rule._converters.values()
-
-        return (
-            'GET' in methods
+        if not ('GET' in methods
             and endpoint.routing['type'] == 'http'
             and endpoint.routing['auth'] in ('none', 'public')
             and endpoint.routing.get('website', False)
-            # preclude combinatorial explosion by only allowing a single converter
-            and len(converters) <= 1
-            # ensure all converters on the rule are able to generate values for
-            # themselves
             and all(hasattr(converter, 'generate') for converter in converters)
-        ) and self.endpoint_is_enumerable(rule)
-
-    def endpoint_is_enumerable(self, rule):
-        """ Verifies that it's possible to generate a valid url for the rule's
-        endpoint
-
-        :type rule: werkzeug.routing.Rule
-        :rtype: bool
-        """
-        spec = inspect.getargspec(rule.endpoint.method)
-
-        # if *args bail the fuck out, only dragons can live there
-        if spec.varargs:
+            and endpoint.routing.get('website')):
             return False
 
-        # remove all arguments with a default value from the list
-        defaults_count = len(spec.defaults or []) # spec.defaults can be None
-        # a[:-0] ~ a[:0] ~ [] -> replace defaults_count == 0 by None to get
-        # a[:None] ~ a
-        args = spec.args[:(-defaults_count or None)]
+        # dont't list routes without argument having no default value or converter
+        spec = inspect.getargspec(endpoint.method.original_func)
 
-        # params with defaults were removed, leftover allowed are:
-        # * self (technically should be first-parameter-of-instance-method but whatever)
-        # * any parameter mapping to a converter
-        return all(
-            (arg == 'self' or arg in rule._converters)
-            for arg in args)
+        # remove self and arguments having a default value
+        defaults_count = len(spec.defaults or [])
+        args = spec.args[1:(-defaults_count or None)]
+
+        # check that all args have a converter
+        return all( (arg in rule._converters) for arg in args)
 
     def enumerate_pages(self, cr, uid, ids, query_string=None, context=None):
         """ Available pages in the website/CMS. This is mostly used for links
@@ -357,27 +336,34 @@ class website(osv.osv):
             if not self.rule_is_enumerable(rule):
                 continue
 
-            converters = rule._converters
-            filtered = bool(converters)
-            if converters:
-                # allow single converter as decided by fp, checked by
-                # rule_is_enumerable
-                [(name, converter)] = converters.items()
-                converter_values = converter.generate(
-                    request.cr, uid, query=query_string, context=context)
-                generated = ({k: v} for k, v in itertools.izip(
-                    itertools.repeat(name), converter_values))
-            else:
-                # force single iteration for literal urls
-                generated = [{}]
+            converters = rule._converters or {}
+            values = [{}]
+            convitems = converters.items()
+            # converters with a domain are processed after the other ones
+            gd = lambda x: hasattr(x[1], 'domain') and (x[1].domain <> '[]')
+            convitems.sort(lambda x, y: cmp(gd(x), gd(y)))
+            for (name, converter) in convitems:
+                newval = []
+                for val in values:
+                    for v in converter.generate(request.cr, uid, query=query_string, args=val, context=context):
+                        newval.append( val.copy() )
+                        v[name] = v['loc']
+                        del v['loc']
+                        newval[-1].update(v)
+                values = newval
 
-            for values in generated:
-                domain_part, url = rule.build(values, append_unknown=False)
-                page = {'name': url, 'url': url}
+            for value in values:
+                domain_part, url = rule.build(value, append_unknown=False)
+                page = {'loc': url}
+                for key,val in value.items():
+                    if key.startswith('__'):
+                        page[key[2:]] = val
+                if url in ('/sitemap.xml',):
+                    continue
                 if url in url_list:
                     continue
                 url_list.append(url)
-                if not filtered and query_string and not self.page_matches(cr, uid, page, query_string, context=context):
+                if query_string and not self.page_matches(cr, uid, page, query_string, context=context):
                     continue
                 yield page
 
diff --git a/addons/website/tests/test_requests.py b/addons/website/tests/test_requests.py
index e0309c9ab4b..2a1eea4c877 100644
--- a/addons/website/tests/test_requests.py
+++ b/addons/website/tests/test_requests.py
@@ -96,7 +96,7 @@ class CrawlSuite(unittest2.TestSuite):
             # switch registry to test mode, so that requests can be made
             registry.enter_test_mode()
 
-            paths = [URL('/'), URL('/sitemap')]
+            paths = [URL('/')]
             seen = set(paths)
 
             while paths:
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index de31f13bd66..b9f33ef1c6b 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -16,7 +16,7 @@
         ((submenu.url != '/' and request.httprequest.path.startswith(submenu.url)) or
          request.httprequest.path == submenu.url) and 'active'
         ">
-        <a t-att-href="submenu.url" t-ignore="true" t-att-target="'blank' if submenu.new_window else None">
+        <a t-att-href="(website.menu_id.child_id[0] == submenu) and '/' or submenu.url" t-ignore="true" t-att-target="'blank' if submenu.new_window else None">
             <span t-field="submenu.name"/>
         </a>
     </li>
@@ -458,7 +458,6 @@
             <div class="well mt32">
                 <p>This page does not exists, but you can create it as you are administrator of this site.</p>
                 <a class="btn btn-primary" t-attf-href="/website/add/#{ path }">Create Page</a>
-                <span class="text-muted">or</span> <a href="/sitemap">Search a Page</a>
             </div>
             <div class="text-center text-muted">Edit the content below this line to adapt the default "page not found" page.</div>
         </div>
@@ -694,34 +693,33 @@
 </template>
 
 <template id="robots">
-# robotstxt.org/
 User-agent: *
 Sitemap: <t t-esc="url_root"/>sitemap.xml
 </template>
 
-<template id="sitemap" name="Site Map">
-    <t t-call="website.layout">
-        <ul>
-            <li t-foreach="pages" t-as="page">
-                <a t-att-href="page['url']"><t t-esc="page['name']"/></a>
-            </li>
-        </ul>
-    </t>
+<template id="sitemap_xml">&lt;?xml version="1.0" encoding="UTF-8"?&gt;
+<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
+  <url t-foreach="pages" t-as="page">
+    <loc><t t-esc="url_root"/><t t-esc="page['loc']"/></loc><t t-if="page.get('lastmod', False)">
+    <lastmod t-esc="page['lastmod']"/></t><t t-if="page.get('priority', False)">
+    <priority t-esc="page['priority']"/></t><t t-if="page.get('changefreq', False)">
+    <changefreq t-esc="page['changefreq']"/></t>
+  </url>
+</urlset>
 </template>
 
-<template id="sitemap_xml">
-    <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
-        <t t-foreach="pages" t-as="page">
-            <url>
-                <loc><t t-esc="page['url']"/></loc>
-            </url>
-        </t>
-    </urlset>
+<template id="sitemap_index_xml">&lt;?xml version="1.0" encoding="UTF-8"?&gt;
+<sitemapindex xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
+  <sitemap t-foreach="pages" t-as="page">
+    <loc><t t-esc="url_root"/>sitemap-<t t-esc="page"/>.xml</loc>
+  </sitemap>
+</sitemapindex>
 </template>
 
+
 <!-- Actual pages -->
 
-<template id="homepage" name="Homepage" page="True">
+<template id="homepage" name="Homepage" page="True" priority="29">
     <t t-call="website.layout">
       <div id="wrap" class="oe_structure oe_empty"></div>
     </t>
@@ -729,7 +727,7 @@ Sitemap: <t t-esc="url_root"/>sitemap.xml
 
 <template id="company_description" name="Company Description">
     <address itemscope="itemscope" itemtype="http://schema.org/Organization">
-    	<!-- TODO widget contact must add itemprop attributes -->
+        <!-- TODO widget contact must add itemprop attributes -->
         <div t-field="res_company.partner_id" t-field-options='{
                 "widget": "contact",
                 "fields": ["name", "address", "phone", "mobile", "fax", "email"]}'/>
diff --git a/addons/website_blog/controllers/main.py b/addons/website_blog/controllers/main.py
index e2eac59678e..133a95d0c8a 100644
--- a/addons/website_blog/controllers/main.py
+++ b/addons/website_blog/controllers/main.py
@@ -155,7 +155,7 @@ class WebsiteBlog(http.Controller):
         return response
 
     @http.route([
-        '/blog/<model("blog.blog"):blog>/post/<model("blog.post"):blog_post>',
+            '''/blog/<model("blog.blog"):blog>/post/<model("blog.post", "[('blog_id','=',blog[0])]"):blog_post>''',
     ], type='http', auth="public", website=True, multilang=True)
     def blog_post(self, blog, blog_post, tag_id=None, page=1, enable_editor=None, **post):
         """ Prepare all values to display the blog.
@@ -294,7 +294,7 @@ class WebsiteBlog(http.Controller):
         return values
 
     @http.route(['/blogpost/post_discussion'], type='json', auth="public", website=True)
-    def post_discussion(self, blog_post_id=0, **post):
+    def post_discussion(self, blog_post_id, **post):
         cr, uid, context = request.cr, request.uid, request.context
         publish = request.registry['res.users'].has_group(cr, uid, 'base.group_website_publisher')
         user = request.registry['res.users'].browse(cr, uid, uid, context=context)
diff --git a/addons/website_blog/models/website_blog.py b/addons/website_blog/models/website_blog.py
index ab96cc5b7f8..37678e94aba 100644
--- a/addons/website_blog/models/website_blog.py
+++ b/addons/website_blog/models/website_blog.py
@@ -16,7 +16,6 @@ class Blog(osv.Model):
     _description = 'Blogs'
     _inherit = ['mail.thread', 'website.seo.metadata']
     _order = 'name'
-
     _columns = {
         'name': fields.char('Blog Name', required=True),
         'subtitle': fields.char('Blog Subtitle'),
@@ -29,7 +28,6 @@ class BlogTag(osv.Model):
     _description = 'Blog Tag'
     _inherit = ['website.seo.metadata']
     _order = 'name'
-
     _columns = {
         'name': fields.char('Name', required=True),
     }
diff --git a/addons/website_crm_partner_assign/controllers/main.py b/addons/website_crm_partner_assign/controllers/main.py
index 0581c44ba57..bf54968e9ae 100644
--- a/addons/website_crm_partner_assign/controllers/main.py
+++ b/addons/website_crm_partner_assign/controllers/main.py
@@ -105,6 +105,7 @@ class WebsiteCrmPartnerAssign(http.Controller):
         }
         return request.website.render("website_crm_partner_assign.index", values)
 
+    # Do not use semantic controller due to SUPERUSER_ID
     @http.route(['/partners/<int:partner_id>', '/partners/<partner_name>-<int:partner_id>'], type='http', auth="public", website=True, multilang=True)
     def partners_ref(self, partner_id, partner_name='', **post):
         values = website_partner.get_partner_template_value(partner_id)
diff --git a/addons/website_event/controllers/main.py b/addons/website_event/controllers/main.py
index aae57e32a93..a3df520adec 100644
--- a/addons/website_event/controllers/main.py
+++ b/addons/website_event/controllers/main.py
@@ -169,7 +169,7 @@ class website_event(http.Controller):
 
         return request.website.render("website_event.index", values)
 
-    @http.route(['/event/<model("event.event"):event>/page/<page:page>'], type='http', auth="public", website=True, multilang=True)
+    @http.route(['/event/<model("event.event"):event>/page/<page:path>'], type='http', auth="public", website=True, multilang=True)
     def event_page(self, event, page, **post):
         values = {
             'event': event,
diff --git a/addons/website_event_track/controllers/event.py b/addons/website_event_track/controllers/event.py
index 373ade03ad9..712c168e1db 100644
--- a/addons/website_event_track/controllers/event.py
+++ b/addons/website_event_track/controllers/event.py
@@ -31,7 +31,7 @@ from openerp.addons.web import http
 from openerp.addons.web.http import request
 
 class website_event(http.Controller):
-    @http.route(['/event/<model("event.event"):event>/track/<model("event.track"):track>'], type='http', auth="public", website=True, multilang=True)
+    @http.route(['''/event/<model("event.event"):event>/track/<model("event.track", "[('event_id','=',event[0])]"):track>'''], type='http', auth="public", website=True, multilang=True)
     def event_track_view(self, event, track, **post):
         track_obj = request.registry.get('event.track')
         track = track_obj.browse(request.cr, openerp.SUPERUSER_ID, track.id, context=request.context)
@@ -75,7 +75,7 @@ class website_event(http.Controller):
 
 
     # TODO: not implemented
-    @http.route(['/event/<model("event.event"):event>/agenda'], type='http', auth="public", website=True, multilang=True)
+    @http.route(['''/event/<model("event.event", "[('show_tracks','=',1)]"):event>/agenda'''], type='http', auth="public", website=True, multilang=True)
     def event_agenda(self, event, tag=None, **post):
         days_tracks = collections.defaultdict(lambda: [])
         for track in sorted(event.track_ids, key=lambda x: (x.date, bool(x.location_id))):
@@ -96,8 +96,8 @@ class website_event(http.Controller):
         })
 
     @http.route([
-        '/event/<model("event.event"):event>/track',
-        '/event/<model("event.event"):event>/track/tag/<model("event.track.tag"):tag>'
+        '''/event/<model("event.event", "[('show_tracks','=',1)]"):event>/track''',
+        '''/event/<model("event.event", "[('show_tracks','=',1)]"):event>/track/tag/<model("event.track.tag"):tag>'''
         ], type='http', auth="public", website=True, multilang=True)
     def event_tracks(self, event, tag=None, **post):
         searches = {}
@@ -123,7 +123,7 @@ class website_event(http.Controller):
         }
         return request.website.render("website_event_track.tracks", values)
 
-    @http.route(['/event/<model("event.event"):event>/track_proposal'], type='http', auth="public", website=True, multilang=True)
+    @http.route(['''/event/<model("event.event", "[('show_track_proposal','=',1)]"):event>/track_proposal'''], type='http', auth="public", website=True, multilang=True)
     def event_track_proposal(self, event, **post):
         values = { 'event': event }
         return request.website.render("website_event_track.event_track_proposal", values)
diff --git a/addons/website_forum/controllers/main.py b/addons/website_forum/controllers/main.py
index cd36a802422..4f99cadb08a 100644
--- a/addons/website_forum/controllers/main.py
+++ b/addons/website_forum/controllers/main.py
@@ -87,7 +87,7 @@ class WebsiteForum(http.Controller):
 
     @http.route(['/forum/<model("forum.forum"):forum>',
                  '/forum/<model("forum.forum"):forum>/page/<int:page>',
-                 '/forum/<model("forum.forum"):forum>/tag/<model("forum.tag"):tag>/questions'
+                 '''/forum/<model("forum.forum"):forum>/tag/<model("forum.tag", "[('forum_id','=',forum[0])]"):tag>/questions'''
                  ], type='http', auth="public", website=True, multilang=True)
     def questions(self, forum, tag=None, page=1, filters='all', sorting='date', search='', **post):
         cr, uid, context = request.cr, request.uid, request.context
@@ -190,7 +190,7 @@ class WebsiteForum(http.Controller):
             }, context=context)
         return werkzeug.utils.redirect("/forum/%s/question/%s" % (slug(forum), new_question_id))
 
-    @http.route(['/forum/<model("forum.forum"):forum>/question/<model("forum.post"):question>'], type='http', auth="public", website=True, multilang=True)
+    @http.route(['''/forum/<model("forum.forum"):forum>/question/<model("forum.post", "[('forum_id','=',forum[0])]"):question>'''], type='http', auth="public", website=True, multilang=True)
     def question(self, forum, question, **post):
         cr, uid, context = request.cr, request.uid, request.context
         # increment view counter
@@ -575,7 +575,7 @@ class WebsiteForum(http.Controller):
         })
         return request.website.render("website_forum.badge", values)
 
-    @http.route(['/forum/<model("forum.forum"):forum>/badge/<model("gamification.badge"):badge>'], type='http', auth="public", website=True, multilang=True)
+    @http.route(['''/forum/<model("forum.forum"):forum>/badge/<model("gamification.badge"):badge>'''], type='http', auth="public", website=True, multilang=True)
     def badge_users(self, forum, badge, **kwargs):
         user_ids = [badge_user.user_id.id for badge_user in badge.owner_ids]
         users = request.registry['res.users'].browse(request.cr, SUPERUSER_ID, user_ids, context=request.context)
diff --git a/addons/website_forum/security/ir.model.access.csv b/addons/website_forum/security/ir.model.access.csv
index f7a0e666ad7..0d00861d65d 100644
--- a/addons/website_forum/security/ir.model.access.csv
+++ b/addons/website_forum/security/ir.model.access.csv
@@ -1,19 +1,15 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_forum_forum,forum.forum,model_forum_forum,,1,0,0,0
 access_forum_forum_manager,forum.forum.maanger,model_forum_forum,base.group_erp_manager,1,1,1,1
-
 access_forum_post_public,forum.post.public,model_forum_post,base.group_public,1,0,0,0
 access_forum_post_portal,forum.post.portal,model_forum_post,base.group_portal,1,1,1,0
 access_forum_post_user,forum.post.user,model_forum_post,base.group_user,1,1,1,1
-
 access_forum_post_vote_public,forum.post.vote.public,model_forum_post_vote,base.group_public,1,0,0,0
 access_forum_post_vote_portal,orum.post.vote.portal,model_forum_post_vote,base.group_portal,1,1,1,0
 access_forum_post_vote_user,forum.post.vote.user,model_forum_post_vote,base.group_user,1,1,1,1
-
 access_forum_post_reason_public,forum.post.reason.public,model_forum_post_reason,base.group_public,1,0,0,0
 access_forum_post_reason_portal,forum.post.reason.portal,model_forum_post_reason,base.group_portal,1,0,0,0
 access_forum_post_reason_user,forum.post.reason.user,model_forum_post_reason,base.group_user,1,1,1,1
-
 access_forum_tag_public,forum.tag.public,model_forum_tag,base.group_public,1,0,1,0
 access_forum_tag_portal,forum.tag.portal,model_forum_tag,base.group_portal,1,0,1,0
 access_forum_tag_user,forum.tag.user,model_forum_tag,base.group_user,1,1,1,1
diff --git a/addons/website_forum_doc/controllers/main.py b/addons/website_forum_doc/controllers/main.py
index 4075479af47..f31e41759db 100644
--- a/addons/website_forum_doc/controllers/main.py
+++ b/addons/website_forum_doc/controllers/main.py
@@ -26,7 +26,7 @@ class WebsiteDoc(http.Controller):
         }
         return request.website.render("website_forum_doc.documentation", value)
 
-    @http.route(['/forum/how-to/<model("forum.documentation.toc"):toc>/<model("forum.post"):post>'], type='http', auth="public", website=True, multilang=True)
+    @http.route(['''/forum/how-to/<model("forum.documentation.toc"):toc>/<model("forum.post", "[('documentation_toc_id','=',toc[0])]"):post>'''], type='http', auth="public", website=True, multilang=True)
     def post(self, toc, post, **kwargs):
         # TODO: implement a redirect instead of crash
         assert post.documentation_toc_id.id == toc.id, "Wrong post!"
@@ -42,7 +42,7 @@ class WebsiteDoc(http.Controller):
     def post_toc(self, forum, post, **kwargs):
         cr, uid, context, toc_id = request.cr, request.uid, request.context, False
         user = request.registry['res.users'].browse(cr, uid, uid, context=context)
-        assert user.karma >= 200, 'Not enough karma'
+        assert user.karma >= 200, 'You need 200 karma to promote a post to the documentation'
         toc_obj = request.registry['forum.documentation.toc']
         obj_ids = toc_obj.search(cr, uid, [], context=context)
         tocs = toc_obj.browse(cr, uid, obj_ids, context=context)
@@ -57,7 +57,7 @@ class WebsiteDoc(http.Controller):
     def post_toc_ok(self, forum, post_id, toc_id, **kwargs):
         cr, uid, context = request.cr, request.uid, request.context
         user = request.registry['res.users'].browse(cr, uid, uid, context=context)
-        assert user.karma >= 200, 'Not enough karma'
+        assert user.karma >= 200, 'Not enough karma, you need 200 to promote a documentation.'
 
         toc_obj = request.registry['forum.documentation.toc']
         stage_ids = toc_obj.search(cr, uid, [], limit=1, context=context)
diff --git a/addons/website_mail_group/controllers/main.py b/addons/website_mail_group/controllers/main.py
index 628aa874e7f..88eb1a7e9b7 100644
--- a/addons/website_mail_group/controllers/main.py
+++ b/addons/website_mail_group/controllers/main.py
@@ -77,7 +77,7 @@ class MailGroup(http.Controller):
         return request.website.render('website_mail_group.group_messages', values)
 
     @http.route([
-        "/groups/<model('mail.group'):group>/<model('mail.message'):message>",
+        '''/groups/<model('mail.group'):group>/<model('mail.message', "[('model','=','mail.group'), ('res_id','=',group[0])]"):message>''',
     ], type='http', auth="public", website=True)
     def thread_discussion(self, group, message, mode='thread', date_begin=None, date_end=None, **post):
         cr, uid, context = request.cr, request.uid, request.context
diff --git a/addons/website_quote/controllers/main.py b/addons/website_quote/controllers/main.py
index 03ba273ea31..0cc56f29096 100644
--- a/addons/website_quote/controllers/main.py
+++ b/addons/website_quote/controllers/main.py
@@ -59,7 +59,7 @@ class sale_quote(http.Controller):
         return request.website.render('website_quote.so_quotation', values)
 
     @http.route(['/quote/accept'], type='json', auth="public", website=True)
-    def accept(self, order_id=None, token=None, signer=None, sign=None, **post):
+    def accept(self, order_id, token=None, signer=None, sign=None, **post):
         order_obj = request.registry.get('sale.order')
         order = order_obj.browse(request.cr, SUPERUSER_ID, order_id)
         if token != order.access_token:
@@ -111,7 +111,7 @@ class sale_quote(http.Controller):
         return True
 
     @http.route(['/quote/update_line'], type='json', auth="public", website=True)
-    def update(self, line_id=None, remove=False, unlink=False, order_id=None, token=None, **post):
+    def update(self, line_id, remove=False, unlink=False, order_id=None, token=None, **post):
         order = request.registry.get('sale.order').browse(request.cr, SUPERUSER_ID, int(order_id))
         if token != order.access_token:
             return request.website.render('website.404')

From 6369400f5b5888f7c8c7a75b670fc1b8b72ec682 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 13 May 2014 16:57:12 +0200
Subject: [PATCH 118/225] [FIX] website_forum: restrict a bunch of controllers
 to POST-only, convert a few more links to buttons

---
 addons/website_forum/controllers/main.py     | 18 +++----
 addons/website_forum/views/website_forum.xml | 52 ++++++++++++++------
 2 files changed, 47 insertions(+), 23 deletions(-)

diff --git a/addons/website_forum/controllers/main.py b/addons/website_forum/controllers/main.py
index cd36a802422..8fa7922e518 100644
--- a/addons/website_forum/controllers/main.py
+++ b/addons/website_forum/controllers/main.py
@@ -73,7 +73,7 @@ class WebsiteForum(http.Controller):
         forums = Forum.browse(cr, uid, obj_ids, context=context)
         return request.website.render("website_forum.forum_all", {'forums': forums})
 
-    @http.route('/forum/new', type='http', auth="user", multilang=True, website=True)
+    @http.route('/forum/new', type='http', auth="user", methods=['POST'], multilang=True, website=True)
     def forum_create(self, forum_name="New Forum", **kwargs):
         forum_id = request.registry['forum.forum'].create(request.cr, request.uid, {
             'name': forum_name,
@@ -220,7 +220,7 @@ class WebsiteForum(http.Controller):
         request.registry['forum.post'].write(request.cr, request.uid, [question.id], {'favourite_ids': favourite_ids}, context=request.context)
         return favourite
 
-    @http.route('/forum/<model("forum.forum"):forum>/question/<model("forum.post"):question>/ask_for_close', type='http', auth="user", multilang=True, website=True)
+    @http.route('/forum/<model("forum.forum"):forum>/question/<model("forum.post"):question>/ask_for_close', type='http', auth="user", methods=['POST'], multilang=True, website=True)
     def question_ask_for_close(self, forum, question, **post):
         check_res = self._has_enough_karma(question.create_uid.id == request.uid and '_karma_modo_close_own' or '_karma_modo_close_all')
         if not check_res[0]:
@@ -261,7 +261,7 @@ class WebsiteForum(http.Controller):
         }, context=request.context)
         return werkzeug.utils.redirect("/forum/%s/question/%s" % (slug(forum), slug(question)))
 
-    @http.route('/forum/<model("forum.forum"):forum>/question/<model("forum.post"):question>/reopen', type='http', auth="user", multilang=True, website=True)
+    @http.route('/forum/<model("forum.forum"):forum>/question/<model("forum.post"):question>/reopen', type='http', auth="user", methods=['POST'], multilang=True, website=True)
     def question_reopen(self, forum, question, **kwarg):
         check_res = self._has_enough_karma(question.create_uid.id == request.uid and '_karma_modo_close_own' or '_karma_modo_close_all')
         if not check_res[0]:
@@ -270,7 +270,7 @@ class WebsiteForum(http.Controller):
         request.registry['forum.post'].write(request.cr, request.uid, [question.id], {'state': 'active'}, context=request.context)
         return werkzeug.utils.redirect("/forum/%s/question/%s" % (slug(forum), slug(question)))
 
-    @http.route('/forum/<model("forum.forum"):forum>/question/<model("forum.post"):question>/delete', type='http', auth="user", multilang=True, website=True)
+    @http.route('/forum/<model("forum.forum"):forum>/question/<model("forum.post"):question>/delete', type='http', auth="user", methods=['POST'], multilang=True, website=True)
     def question_delete(self, forum, question, **kwarg):
         check_res = self._has_enough_karma(question.create_uid.id == request.uid and '_karma_modo_unlink_own' or '_karma_modo_unlink_all')
         if not check_res[0]:
@@ -279,7 +279,7 @@ class WebsiteForum(http.Controller):
         request.registry['forum.post'].write(request.cr, request.uid, [question.id], {'active': False}, context=request.context)
         return werkzeug.utils.redirect("/forum/%s/question/%s" % (slug(forum), slug(question)))
 
-    @http.route('/forum/<model("forum.forum"):forum>/question/<model("forum.post"):question>/undelete', type='http', auth="user", multilang=True, website=True)
+    @http.route('/forum/<model("forum.forum"):forum>/question/<model("forum.post"):question>/undelete', type='http', auth="user", methods=['POST'], multilang=True, website=True)
     def question_undelete(self, forum, question, **kwarg):
         check_res = self._has_enough_karma(question.create_uid.id == request.uid and '_karma_modo_unlink_own' or '_karma_modo_unlink_all')
         if not check_res[0]:
@@ -338,7 +338,7 @@ class WebsiteForum(http.Controller):
         request.registry['forum.post'].write(cr, uid, [post.id], {'is_correct': not post.is_correct}, context=context)
         return not post.is_correct
 
-    @http.route('/forum/<model("forum.forum"):forum>/post/<model("forum.post"):post>/delete', type='http', auth="user", multilang=True, website=True)
+    @http.route('/forum/<model("forum.forum"):forum>/post/<model("forum.post"):post>/delete', type='http', auth="user", methods=['POST'], multilang=True, website=True)
     def post_delete(self, forum, post, **kwargs):
         check_res = self._has_enough_karma(post.create_uid.id == request.uid and '_karma_modo_unlink_own' or '_karma_modo_unlink_all')
         if not check_res[0]:
@@ -548,7 +548,7 @@ class WebsiteForum(http.Controller):
         })
         return request.website.render("website_forum.edit_profile", values)
 
-    @http.route('/forum/<model("forum.forum"):forum>/user/<model("res.users"):user>/save', type='http', auth="user", multilang=True, website=True)
+    @http.route('/forum/<model("forum.forum"):forum>/user/<model("res.users"):user>/save', type='http', auth="user", methods=['POST'], multilang=True, website=True)
     def save_edited_profile(self, forum, user, **kwargs):
         request.registry['res.users'].write(request.cr, request.uid, [user.id], {
             'name': kwargs.get('name'),
@@ -589,7 +589,7 @@ class WebsiteForum(http.Controller):
     # Messaging
     # --------------------------------------------------
 
-    @http.route('/forum/<model("forum.forum"):forum>/post/<model("forum.post"):post>/comment/<model("mail.message"):comment>/convert_to_answer', type='http', auth="public", multilang=True, website=True)
+    @http.route('/forum/<model("forum.forum"):forum>/post/<model("forum.post"):post>/comment/<model("mail.message"):comment>/convert_to_answer', type='http', auth="public", methods=['POST'], multilang=True, website=True)
     def convert_comment_to_answer(self, forum, post, comment, **kwarg):
         body = comment.body
         request.registry['mail.message'].unlink(request.cr, request.uid, [comment.id], context=request.context)
@@ -599,7 +599,7 @@ class WebsiteForum(http.Controller):
                 return self.post_comment(forum, answer, comment=html2plaintext(body))
         return self.post_new(forum, question, content=body)
 
-    @http.route('/forum/<model("forum.forum"):forum>/post/<model("forum.post"):post>/convert_to_comment', type='http', auth="user", multilang=True, website=True)
+    @http.route('/forum/<model("forum.forum"):forum>/post/<model("forum.post"):post>/convert_to_comment', type='http', auth="user", methods=['POST'], multilang=True, website=True)
     def convert_answer_to_comment(self, forum, post, **kwarg):
         values = {
             'comment': html2plaintext(post.content),
diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml
index 75b9fcbd7e7..0e0ada6df48 100644
--- a/addons/website_forum/views/website_forum.xml
+++ b/addons/website_forum/views/website_forum.xml
@@ -21,9 +21,9 @@
 </template>
 
 <!-- helper -->
-<template id="muted_button">
+<template id="link_button">
     <form method="POST" t-att-action="url">
-        <button t-attf-class="text-muted fa btn-link #{classes}">
+        <button t-attf-class="fa btn-link #{classes}">
             <t t-esc="label"/></button>
     </form>
 </template>
@@ -440,7 +440,11 @@
                         on <span t-field="question.closed_date"/></b>
                     </p>
                     <div t-if="question.state == 'close' and user.karma&gt;=500" class="mb24 text-center">
-                        <a class="fa fa-arrow-right" t-attf-href="/forum/#{ slug(forum) }/question/#{slug(question)}/reopen"> Reopen</a>
+                        <t t-call="website_forum.link_button">
+                            <t t-set="url"><t t-escf="/forum/#{ slug(forum) }/question/#{slug(question)}/reopen"/></t>
+                            <t t-set="label"> Reopen</t>
+                            <t t-set="classes">fa-arrow-right</t>
+                        </t>
                     </div>
                 </div>
                 <t t-raw="question.content"/>
@@ -460,19 +464,39 @@
                                 </a>
                             </li>
                             <li t-if="question.state != 'close' and ((user.id == question.create_uid.id and can_close_own) or can_close_all)">
-                                <a class="text-muted fa fa-times" t-attf-href="/forum/#{ slug(forum) }/question/#{slug(question)}/ask_for_close"> Close</a>
+                                <t t-call="website_forum.link_button">
+                                    <t t-set="url"><t t-escf="/forum/#{ slug(forum) }/question/#{slug(question)}/ask_for_close"/></t>
+                                    <t t-set="label"> Close</t>
+                                    <t t-set="classes">text-muted fa-times</t>
+                                </t>
                             </li>
                             <li t-if="question.state == 'close' and ((user.id == question.create_uid.id and can_close_own) or can_close_all)">
-                                <a class="text-muted fa fa-undo" t-attf-href="/forum/#{ slug(forum) }/question/#{slug(question)}/reopen"> Reopen</a>
+                                <t t-call="website_forum.link_button">
+                                    <t t-set="url"><t t-escf="/forum/#{ slug(forum) }/question/#{slug(question)}/reopen"/></t>
+                                    <t t-set="label"> Reopen</t>
+                                    <t t-set="classes">text-muted fa-undo</t>
+                                </t>
                             </li>
                             <li t-if="(user.id == question.create_uid.id and can_edit_own) or can_edit_all">
-                                <a class="text-muted fa fa-edit" t-attf-href="/forum/#{ slug(forum) }/post/#{slug(question)}/edit"> Edit</a>
+                                <t t-call="website_forum.link_button">
+                                    <t t-set="url"><t t-escf="/forum/#{ slug(forum) }/post/#{slug(question)}/edit"/></t>
+                                    <t t-set="label"> Edit</t>
+                                    <t t-set="classes">text-muted fa-edit</t>
+                                </t>
                             </li>
                             <li t-if="question.active and ((user.id == question.create_uid.id and can_unlink_own) or can_unlink_all)">
-                                <a class="text-muted fa fa-trash-o" t-attf-href="/forum/#{ slug(forum) }/question/#{slug(question)}/delete"> Delete</a>
+                                <t t-call="website_forum.link_button">
+                                    <t t-set="url"><t t-escf="/forum/#{ slug(forum) }/question/#{slug(question)}/delete"/></t>
+                                    <t t-set="label"> Delete</t>
+                                    <t t-set="classes">text-muted fa-trash-o</t>
+                                </t>
                             </li>
                             <li t-if="not question.active and ((user.id == question.create_uid.id and can_unlink_own) or can_unlink_all)">
-                                <a class="text-muted fa fa-trash-o" t-attf-href="/forum/#{ slug(forum) }/question/#{slug(question)}/undelete"> Undelete</a>
+                                <t t-call="website_forum.link_button">
+                                    <t t-set="url"><t t-escf="/forum/#{ slug(forum) }/question/#{slug(question)}/undelete"/></t>
+                                    <t t-set="label"> Undelete</t>
+                                    <t t-set="classes">text-muted fa-trash-o</t>
+                                </t>
                             </li>
                         </ul>
                     </div>
@@ -519,17 +543,17 @@
                                 <a class="text-muted fa fa-edit" t-attf-href="/forum/#{slug(forum)}/post/#{slug(answer)}/edit"> Edit</a>
                             </li>
                             <li t-if="(user.id == answer.create_uid.id and can_unlink_own) or can_unlink_all">
-                                <t t-call="website_forum.muted_button">
+                                <t t-call="website_forum.link_button">
                                     <t t-set="url"><t t-escf="/forum/#{slug(forum)}/post/#{slug(answer)}/delete"/></t>
                                     <t t-set="label"> Delete</t>
-                                    <t t-set="classes">fa-trash-o</t>
+                                    <t t-set="classes">text-muted fa-trash-o</t>
                                 </t>
                             </li>
                             <li t-if="user.id == answer.create_uid.id">
-                                <t t-call="website_forum.muted_button">
+                                <t t-call="website_forum.link_button">
                                     <t t-set="url"><t t-escf="/forum/#{slug(forum)}/post/#{slug(answer)}/convert_to_comment"/></t>
                                     <t t-set="label">Convert as a comment</t>
-                                    <t t-set="classes">fa-magic</t>
+                                    <t t-set="classes">text-muted fa-magic</t>
                                 </t>
                             </li>
                         </ul>
@@ -574,10 +598,10 @@
                         style="display: inline-block;"/>
                     on <span t-field="message.date" t-field-options='{"format":"short"}'/>
 
-                    <t t-call="website_forum.muted_button">
+                    <t t-call="website_forum.link_button">
                         <t t-set="url"><t t-escf="/forum/#{slug(forum)}/post/#{slug(object)}/comment/#{slug(message)}/convert_to_answer"/></t>
                         <t t-set="label"> Convert as an answer</t>
-                        <t t-set="classes">fa-magic pull-right</t>
+                        <t t-set="classes">text-muted fa-magic pull-right</t>
                     </t>
                 </small>
             </div>

From 7e66bd9d5562fd9d5c9603b12182886ece01b854 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 13 May 2014 17:29:35 +0200
Subject: [PATCH 119/225] [FIX] orm.search_read: drop active_test context flag
 during the read() step

The active_test flag is meant for search(),
but when passed to search_read() it was also
propagated to the read() call.
This has little consequence normally because
read() ignores this flag, but it can have
side-effects when reading x2m fields or
function fields. They are likely to call
search() somewhere downstream, still with
 the propagated active_test flag, while
it should not be applied anymore.

Ultimately dropping this flag could be
done by read() in all cases, but changing
search_read() is less likely to block
exotic cases where the flag was passed
on purpose. Moving it to read() could
be done as a later step.
---
 openerp/osv/orm.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index e9f4d8f59bd..8fe7bb1df7f 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -5083,7 +5083,14 @@ class BaseModel(object):
             # shortcut read if we only want the ids
             return [{'id': id} for id in record_ids]
 
-        result = self.read(cr, uid, record_ids, fields, context=context)
+        # read() ignores active_test, but it would forward it to any downstream search call
+        # (e.g. for x2m or function fields), and this is not the desired behavior, the flag
+        # was presumably only meant for the main search().
+        # TODO: Move this to read() directly?                                                                                                
+        read_ctx = dict(context or {})                                                                                                       
+        read_ctx.pop('active_test', None)                                                                                                    
+                                                                                                                                             
+        result = self.read(cr, uid, record_ids, fields, context=read_ctx) 
         if len(result) <= 1:
             return result
 

From a6f036d43fced59654770f6c30cca8581009cf2b Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Tue, 13 May 2014 18:52:37 +0200
Subject: [PATCH 120/225] [FIX] website_membership: correct view and controller

---
 addons/website_membership/controllers/main.py     | 14 +++++---------
 .../views/website_membership.xml                  | 15 +++++++++------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/addons/website_membership/controllers/main.py b/addons/website_membership/controllers/main.py
index 11e764f0eac..810fd7dac14 100644
--- a/addons/website_membership/controllers/main.py
+++ b/addons/website_membership/controllers/main.py
@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 
-import openerp
 from openerp import SUPERUSER_ID
 from openerp.addons.web import http
 from openerp.addons.web.http import request
@@ -39,7 +38,7 @@ class WebsiteMembership(http.Controller):
         current_country = None
 
         # base domain for groupby / searches
-        base_line_domain = [("partner.website_published", "=", True),('state', 'in', ['free', 'paid'])]
+        base_line_domain = [("partner.website_published", "=", True), ('state', 'in', ['free', 'paid'])]
         if membership_id:
             base_line_domain.append(('membership_id', '=', membership_id))
             membership = product_obj.browse(cr, uid, membership_id, context=context)
@@ -76,12 +75,10 @@ class WebsiteMembership(http.Controller):
         membership_line_ids = membership_line_obj.search(cr, uid, line_domain, context=context)
         membership_lines = membership_line_obj.browse(cr, uid, membership_line_ids, context=context)
         membership_lines.sort(key=lambda x: x.membership_id.website_sequence)
-        partner_ids = [m.partner and m.partner.id for m in membership_lines]
+        partner_ids = [m.partner.id for m in membership_lines]
         google_map_partner_ids = ",".join(map(str, partner_ids))
 
-        partners_data = {}
-        for partner in partner_obj.read(cr, openerp.SUPERUSER_ID, partner_ids, request.website.get_partner_white_list_fields(), context=context):
-            partners_data[partner.get("id")] = partner
+        partners = dict((p.id, p) for p in partner_obj.browse(request.cr, SUPERUSER_ID, partner_ids, request.context))
 
         # format domain for group_by and memberships
         membership_ids = product_obj.search(cr, uid, [('membership', '=', True)], order="website_sequence", context=context)
@@ -91,7 +88,7 @@ class WebsiteMembership(http.Controller):
         pager = request.website.pager(url="/members", total=len(membership_line_ids), page=page, step=self._references_per_page, scope=7, url_args=post)
 
         values = {
-            'partners_data': partners_data,
+            'partners': partners,
             'membership_lines': membership_lines,
             'memberships': memberships,
             'membership': membership,
@@ -107,8 +104,7 @@ class WebsiteMembership(http.Controller):
 
     @http.route(['/members/<int:partner_id>', '/members/<partner_name>-<int:partner_id>'], type='http', auth="public", website=True, multilang=True)
     def partners_ref(self, partner_id, **post):
-        partner = request.registry['res.partner'].browse(request.cr, SUPERUSER_ID, partner_id, context=request.context)
-        values = website_partner.get_partner_template_value(partner)
+        values = website_partner.get_partner_template_value(partner_id)
         if not values:
             return self.members(**post)
         values['main_object'] = values['partner']
diff --git a/addons/website_membership/views/website_membership.xml b/addons/website_membership/views/website_membership.xml
index 6b7f8c088b6..ca38873c0d0 100644
--- a/addons/website_membership/views/website_membership.xml
+++ b/addons/website_membership/views/website_membership.xml
@@ -59,14 +59,17 @@
                             <t t-set="current_membership_id" t-value="membership_line_id.membership_id.id"/>
                             <h3 class="text-center"><span t-field="membership_line_id.membership_id"/></h3>
                         </t>
-                        <t t-set="partner_data" t-value="partners_data[membership_line_id.partner.id]"/>
+                        <t t-set="partner" t-value="partners[membership_line_id.partner.id]"/>
                         <div class="media">
-                            <a class="pull-left" t-attf-href="/members/#{ slug([partner_data.get('id'), partner_data.get('name')]) }">
-                                <img class="media-object" t-attf-src="data:image/png;base64,#{partner_data.get('image_small')}"/>
-                            </a>
+                            <a class="pull-left" t-attf-href="/members/#{slug(partner)}"
+                               t-field="partner.image_small"
+                               t-field-options='{"widget": "image", "class": "media-object"}'
+                            ></a>
                             <div class="media-body" style="min-height: 64px;">
-                                <a class="media-heading" t-attf-href="/members/#{ slug([partner_data.get('id'), partner_data.get('name')]) }"><t t-if="partner_data.get('parent_id')"><span t-esc="partner_data.get('parent_id')[1]"/></t> <span t-esc="partner_data.get('name')"/></a>
-                                <div t-raw="partner_data.get('website_short_description')"/>
+                                <a class="media-heading" t-attf-href="/members/#{slug(partner)}">
+                                    <span t-field="partner.display_name"/>
+                                </a>
+                                <div t-field="partner.website_short_description"/>
                             </div>
                         </div>
                     </t>

From 7564f528e0ba959807e995ff5134ec0b04e4cb3f Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Wed, 14 May 2014 05:45:54 +0000
Subject: [PATCH 121/225] Launchpad automatic translations update.

---
 addons/account_test/i18n/de.po | 241 +++++++++++++++++++++++++++++++++
 addons/edi/i18n/ta.po          |  87 ++++++++++++
 addons/sale/i18n/fr_CA.po      |   2 +-
 3 files changed, 329 insertions(+), 1 deletion(-)
 create mode 100644 addons/account_test/i18n/de.po
 create mode 100644 addons/edi/i18n/ta.po

diff --git a/addons/account_test/i18n/de.po b/addons/account_test/i18n/de.po
new file mode 100644
index 00000000000..157223be184
--- /dev/null
+++ b/addons/account_test/i18n/de.po
@@ -0,0 +1,241 @@
+# German translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2014-05-13 09:39+0000\n"
+"Last-Translator: Claudia Haida <claudia.haida@initos.com>\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: 2014-05-14 05:45+0000\n"
+"X-Generator: Launchpad (build 17002)\n"
+
+#. module: account_test
+#: view:accounting.assert.test:0
+msgid ""
+"Code should always set a variable named `result` with the result of your "
+"test, that can be a list or\n"
+"a dictionary. If `result` is an empty list, it means that the test was "
+"succesful. Otherwise it will\n"
+"try to translate and print what is inside `result`.\n"
+"\n"
+"If the result of your test is a dictionary, you can set a variable named "
+"`column_order` to choose in\n"
+"what order you want to print `result`'s content.\n"
+"\n"
+"Should you need them, you can also use the following variables into your "
+"code:\n"
+"    * cr: cursor to the database\n"
+"    * uid: ID of the current user\n"
+"\n"
+"In any ways, the code must be legal python statements with correct "
+"indentation (if needed).\n"
+"\n"
+"Example: \n"
+"    sql = '''SELECT id, name, ref, date\n"
+"             FROM account_move_line \n"
+"             WHERE account_id IN (SELECT id FROM account_account WHERE type "
+"= 'view')\n"
+"          '''\n"
+"    cr.execute(sql)\n"
+"    result = cr.dictfetchall()"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_02
+msgid "Test 2: Opening a fiscal year"
+msgstr "Test2: Eröffnung eines Geschäftsjahres"
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_05
+msgid ""
+"Check that reconciled invoice for Sales/Purchases has reconciled entries for "
+"Payable and Receivable Accounts"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_03
+msgid ""
+"Check if movement lines are balanced and have the same date and period"
+msgstr ""
+
+#. module: account_test
+#: field:accounting.assert.test,name:0
+msgid "Test Name"
+msgstr ""
+
+#. module: account_test
+#: report:account.test.assert.print:0
+msgid "Accouting tests on"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_01
+msgid "Test 1: General balance"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_06
+msgid "Check that paid/reconciled invoices are not in 'Open' state"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_05_2
+msgid ""
+"Check that reconciled account moves, that define Payable and Receivable "
+"accounts, are belonging to reconciled invoices"
+msgstr ""
+
+#. module: account_test
+#: view:accounting.assert.test:0
+msgid "Tests"
+msgstr ""
+
+#. module: account_test
+#: field:accounting.assert.test,desc:0
+msgid "Test Description"
+msgstr ""
+
+#. module: account_test
+#: view:accounting.assert.test:0
+msgid "Description"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_06_1
+msgid "Check that there's no move for any account with « View » account type"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_08
+msgid "Test 9 : Accounts and partners on account moves"
+msgstr ""
+
+#. module: account_test
+#: model:ir.actions.act_window,name:account_test.action_accounting_assert
+#: model:ir.actions.report.xml,name:account_test.account_assert_test_report
+#: model:ir.ui.menu,name:account_test.menu_action_license
+msgid "Accounting Tests"
+msgstr ""
+
+#. module: account_test
+#: code:addons/account_test/report/account_test_report.py:74
+#, python-format
+msgid "The test was passed successfully"
+msgstr ""
+
+#. module: account_test
+#: field:accounting.assert.test,active:0
+msgid "Active"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_06
+msgid "Test 6 : Invoices status"
+msgstr ""
+
+#. module: account_test
+#: model:ir.model,name:account_test.model_accounting_assert_test
+msgid "accounting.assert.test"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_05
+msgid ""
+"Test 5.1 : Payable and Receivable accountant lines of reconciled invoices"
+msgstr ""
+
+#. module: account_test
+#: field:accounting.assert.test,code_exec:0
+msgid "Python code"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_07
+msgid ""
+"Check on bank statement that the Closing Balance = Starting Balance + sum of "
+"statement lines"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_07
+msgid "Test 8 : Closing balance on bank statements"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_03
+msgid "Test 3: Movement lines"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_05_2
+msgid "Test 5.2 : Reconcilied invoices and Payable/Receivable accounts"
+msgstr ""
+
+#. module: account_test
+#: view:accounting.assert.test:0
+msgid "Expression"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_04
+msgid "Test 4: Totally reconciled mouvements"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_04
+msgid "Check if the totally reconciled movements are balanced"
+msgstr ""
+
+#. module: account_test
+#: field:accounting.assert.test,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_02
+msgid ""
+"Check if the balance of the new opened fiscal year matches with last year's "
+"balance"
+msgstr ""
+
+#. module: account_test
+#: view:accounting.assert.test:0
+msgid "Python Code"
+msgstr ""
+
+#. module: account_test
+#: model:ir.actions.act_window,help:account_test.action_accounting_assert
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create Accounting Test.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_01
+msgid "Check the balance: Debit sum = Credit sum"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_08
+msgid "Check that general accounts and partners on account moves are active"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_06_1
+msgid "Test 7: « View  » account type"
+msgstr ""
+
+#. module: account_test
+#: view:accounting.assert.test:0
+msgid "Code Help"
+msgstr ""
diff --git a/addons/edi/i18n/ta.po b/addons/edi/i18n/ta.po
new file mode 100644
index 00000000000..7f0570794ac
--- /dev/null
+++ b/addons/edi/i18n/ta.po
@@ -0,0 +1,87 @@
+# Tamil translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2014-05-13 08:27+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Tamil <ta@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: 2014-05-14 05:45+0000\n"
+"X-Generator: Launchpad (build 17002)\n"
+
+#. module: edi
+#. openerp-web
+#: code:addons/edi/static/src/js/edi.js:67
+#, python-format
+msgid "Reason:"
+msgstr ""
+
+#. module: edi
+#. openerp-web
+#: code:addons/edi/static/src/js/edi.js:60
+#, python-format
+msgid "The document has been successfully imported!"
+msgstr ""
+
+#. module: edi
+#. openerp-web
+#: code:addons/edi/static/src/js/edi.js:65
+#, python-format
+msgid "Sorry, the document could not be imported."
+msgstr ""
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_currency
+msgid "Currency"
+msgstr ""
+
+#. module: edi
+#. openerp-web
+#: code:addons/edi/static/src/js/edi.js:71
+#, python-format
+msgid "Document Import Notification"
+msgstr ""
+
+#. module: edi
+#: code:addons/edi/models/edi.py:130
+#, python-format
+msgid "Missing application."
+msgstr ""
+
+#. module: edi
+#: code:addons/edi/models/edi.py:131
+#, python-format
+msgid ""
+"The document you are trying to import requires the OpenERP `%s` application. "
+"You can install it by connecting as the administrator and opening the "
+"configuration assistant."
+msgstr ""
+
+#. module: edi
+#: code:addons/edi/models/edi.py:47
+#, python-format
+msgid "'%s' is an invalid external ID"
+msgstr ""
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_partner
+msgid "Partner"
+msgstr ""
+
+#. module: edi
+#: model:ir.model,name:edi.model_edi_edi
+msgid "EDI Subsystem"
+msgstr ""
diff --git a/addons/sale/i18n/fr_CA.po b/addons/sale/i18n/fr_CA.po
index 56acd05eb3f..867db031b73 100644
--- a/addons/sale/i18n/fr_CA.po
+++ b/addons/sale/i18n/fr_CA.po
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-13 05:59+0000\n"
+"X-Launchpad-Export-Date: 2014-05-14 05:45+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
 
 #. module: sale

From 994a6ec0228351fd61a8f0fba975d5265139bb60 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Wed, 14 May 2014 06:20:22 +0000
Subject: [PATCH 122/225] Launchpad automatic translations update.

---
 openerp/addons/base/i18n/es.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/i18n/es.po b/openerp/addons/base/i18n/es.po
index 07f23939afb..21b593dde9e 100644
--- a/openerp/addons/base/i18n/es.po
+++ b/openerp/addons/base/i18n/es.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-13 06:28+0000\n"
+"X-Launchpad-Export-Date: 2014-05-14 06:20+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
 
 #. module: base

From 0159a72661991837510adea00fcf2f7351ef7b06 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Wed, 14 May 2014 06:20:49 +0000
Subject: [PATCH 123/225] Launchpad automatic translations update.

---
 addons/account_test/i18n/de.po  | 241 ++++++++++++++++++++++++++++++++
 addons/edi/i18n/ta.po           |  87 ++++++++++++
 addons/mail/i18n/lt.po          |   8 +-
 addons/project_issue/i18n/mn.po |  18 +--
 addons/sale/i18n/fr_CA.po       |   2 +-
 addons/stock/i18n/nl.po         |   8 +-
 6 files changed, 346 insertions(+), 18 deletions(-)
 create mode 100644 addons/account_test/i18n/de.po
 create mode 100644 addons/edi/i18n/ta.po

diff --git a/addons/account_test/i18n/de.po b/addons/account_test/i18n/de.po
new file mode 100644
index 00000000000..ba590e63d51
--- /dev/null
+++ b/addons/account_test/i18n/de.po
@@ -0,0 +1,241 @@
+# German translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-07 19:36+0000\n"
+"PO-Revision-Date: 2014-05-13 09:38+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: 2014-05-14 06:20+0000\n"
+"X-Generator: Launchpad (build 17002)\n"
+
+#. module: account_test
+#: view:accounting.assert.test:0
+msgid ""
+"Code should always set a variable named `result` with the result of your "
+"test, that can be a list or\n"
+"a dictionary. If `result` is an empty list, it means that the test was "
+"succesful. Otherwise it will\n"
+"try to translate and print what is inside `result`.\n"
+"\n"
+"If the result of your test is a dictionary, you can set a variable named "
+"`column_order` to choose in\n"
+"what order you want to print `result`'s content.\n"
+"\n"
+"Should you need them, you can also use the following variables into your "
+"code:\n"
+"    * cr: cursor to the database\n"
+"    * uid: ID of the current user\n"
+"\n"
+"In any ways, the code must be legal python statements with correct "
+"indentation (if needed).\n"
+"\n"
+"Example: \n"
+"    sql = '''SELECT id, name, ref, date\n"
+"             FROM account_move_line \n"
+"             WHERE account_id IN (SELECT id FROM account_account WHERE type "
+"= 'view')\n"
+"          '''\n"
+"    cr.execute(sql)\n"
+"    result = cr.dictfetchall()"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_02
+msgid "Test 2: Opening a fiscal year"
+msgstr "Test2: Eröffnung eines Geschäftsjahres"
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_05
+msgid ""
+"Check that reconciled invoice for Sales/Purchases has reconciled entries for "
+"Payable and Receivable Accounts"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_03
+msgid ""
+"Check if movement lines are balanced and have the same date and period"
+msgstr ""
+
+#. module: account_test
+#: field:accounting.assert.test,name:0
+msgid "Test Name"
+msgstr ""
+
+#. module: account_test
+#: report:account.test.assert.print:0
+msgid "Accouting tests on"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_01
+msgid "Test 1: General balance"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_06
+msgid "Check that paid/reconciled invoices are not in 'Open' state"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_05_2
+msgid ""
+"Check that reconciled account moves, that define Payable and Receivable "
+"accounts, are belonging to reconciled invoices"
+msgstr ""
+
+#. module: account_test
+#: view:accounting.assert.test:0
+msgid "Tests"
+msgstr ""
+
+#. module: account_test
+#: field:accounting.assert.test,desc:0
+msgid "Test Description"
+msgstr ""
+
+#. module: account_test
+#: view:accounting.assert.test:0
+msgid "Description"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_06_1
+msgid "Check that there's no move for any account with « View » account type"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_08
+msgid "Test 9 : Accounts and partners on account moves"
+msgstr ""
+
+#. module: account_test
+#: model:ir.actions.act_window,name:account_test.action_accounting_assert
+#: model:ir.actions.report.xml,name:account_test.account_assert_test_report
+#: model:ir.ui.menu,name:account_test.menu_action_license
+msgid "Accounting Tests"
+msgstr ""
+
+#. module: account_test
+#: code:addons/account_test/report/account_test_report.py:74
+#, python-format
+msgid "The test was passed successfully"
+msgstr ""
+
+#. module: account_test
+#: field:accounting.assert.test,active:0
+msgid "Active"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_06
+msgid "Test 6 : Invoices status"
+msgstr ""
+
+#. module: account_test
+#: model:ir.model,name:account_test.model_accounting_assert_test
+msgid "accounting.assert.test"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_05
+msgid ""
+"Test 5.1 : Payable and Receivable accountant lines of reconciled invoices"
+msgstr ""
+
+#. module: account_test
+#: field:accounting.assert.test,code_exec:0
+msgid "Python code"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_07
+msgid ""
+"Check on bank statement that the Closing Balance = Starting Balance + sum of "
+"statement lines"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_07
+msgid "Test 8 : Closing balance on bank statements"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_03
+msgid "Test 3: Movement lines"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_05_2
+msgid "Test 5.2 : Reconcilied invoices and Payable/Receivable accounts"
+msgstr ""
+
+#. module: account_test
+#: view:accounting.assert.test:0
+msgid "Expression"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_04
+msgid "Test 4: Totally reconciled mouvements"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_04
+msgid "Check if the totally reconciled movements are balanced"
+msgstr ""
+
+#. module: account_test
+#: field:accounting.assert.test,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_02
+msgid ""
+"Check if the balance of the new opened fiscal year matches with last year's "
+"balance"
+msgstr ""
+
+#. module: account_test
+#: view:accounting.assert.test:0
+msgid "Python Code"
+msgstr ""
+
+#. module: account_test
+#: model:ir.actions.act_window,help:account_test.action_accounting_assert
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create Accounting Test.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_01
+msgid "Check the balance: Debit sum = Credit sum"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_08
+msgid "Check that general accounts and partners on account moves are active"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_06_1
+msgid "Test 7: « View  » account type"
+msgstr ""
+
+#. module: account_test
+#: view:accounting.assert.test:0
+msgid "Code Help"
+msgstr ""
diff --git a/addons/edi/i18n/ta.po b/addons/edi/i18n/ta.po
new file mode 100644
index 00000000000..7764550d8e4
--- /dev/null
+++ b/addons/edi/i18n/ta.po
@@ -0,0 +1,87 @@
+# Tamil translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-07 19:37+0000\n"
+"PO-Revision-Date: 2014-05-13 08:27+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Tamil <ta@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: 2014-05-14 06:20+0000\n"
+"X-Generator: Launchpad (build 17002)\n"
+
+#. module: edi
+#. openerp-web
+#: code:addons/edi/static/src/js/edi.js:67
+#, python-format
+msgid "Reason:"
+msgstr ""
+
+#. module: edi
+#. openerp-web
+#: code:addons/edi/static/src/js/edi.js:60
+#, python-format
+msgid "The document has been successfully imported!"
+msgstr ""
+
+#. module: edi
+#. openerp-web
+#: code:addons/edi/static/src/js/edi.js:65
+#, python-format
+msgid "Sorry, the document could not be imported."
+msgstr ""
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_currency
+msgid "Currency"
+msgstr ""
+
+#. module: edi
+#. openerp-web
+#: code:addons/edi/static/src/js/edi.js:71
+#, python-format
+msgid "Document Import Notification"
+msgstr ""
+
+#. module: edi
+#: code:addons/edi/models/edi.py:130
+#, python-format
+msgid "Missing application."
+msgstr ""
+
+#. module: edi
+#: code:addons/edi/models/edi.py:131
+#, python-format
+msgid ""
+"The document you are trying to import requires the OpenERP `%s` application. "
+"You can install it by connecting as the administrator and opening the "
+"configuration assistant."
+msgstr ""
+
+#. module: edi
+#: code:addons/edi/models/edi.py:47
+#, python-format
+msgid "'%s' is an invalid external ID"
+msgstr ""
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_partner
+msgid "Partner"
+msgstr ""
+
+#. module: edi
+#: model:ir.model,name:edi.model_edi_edi
+msgid "EDI Subsystem"
+msgstr ""
diff --git a/addons/mail/i18n/lt.po b/addons/mail/i18n/lt.po
index 60839dcb191..95245e5d84b 100644
--- a/addons/mail/i18n/lt.po
+++ b/addons/mail/i18n/lt.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2014-05-09 10:30+0000\n"
+"PO-Revision-Date: 2014-05-13 07:02+0000\n"
 "Last-Translator: Andrius Preimantas @ hbee <andrius.preimantas@gmail.com>\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: 2014-05-10 07:55+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-14 06:20+0000\n"
+"X-Generator: Launchpad (build 17002)\n"
 
 #. module: mail
 #: view:mail.followers:0
@@ -367,7 +367,7 @@ msgstr "Atsakyti (kam)"
 #: code:addons/mail/wizard/invite.py:37
 #, python-format
 msgid "<div>You have been invited to follow %s.</div>"
-msgstr "<div>Jūs buvote pakviesta užsiprenumeruoti %s.</div>"
+msgstr "<div>Jūs buvote pakviestas(-a) užsiprenumeruoti %s.</div>"
 
 #. module: mail
 #. openerp-web
diff --git a/addons/project_issue/i18n/mn.po b/addons/project_issue/i18n/mn.po
index 64ddd663a40..badabe240d0 100644
--- a/addons/project_issue/i18n/mn.po
+++ b/addons/project_issue/i18n/mn.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2014-02-09 02:52+0000\n"
+"PO-Revision-Date: 2014-05-14 03:32+0000\n"
 "Last-Translator: gobi <Unknown>\n"
 "Language-Team: Mongolian <mn@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: 2014-02-10 05:53+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-05-14 06:20+0000\n"
+"X-Generator: Launchpad (build 17002)\n"
 
 #. module: project_issue
 #: model:project.category,name:project_issue.project_issue_category_03
@@ -129,13 +129,13 @@ msgid ""
 "You cannot escalate this issue.\n"
 "The relevant Project has not configured the Escalation Project!"
 msgstr ""
-"Энэ асуудлыг томруулах боломжгүй.\n"
-"Энэ төсөл нь томруулж болох төслөөр тохируулагдаагүй байна!"
+"Энэ асуудлыг дэвшүүлэх боломжгүй.\n"
+"Энэ төсөл нь Дэвшүүлэх Төслийг тохируулаагүй байна!"
 
 #. module: project_issue
 #: constraint:project.project:0
 msgid "Error! You cannot assign escalation to the same project!"
-msgstr "Алдаа! Ижил төсөлд томруулалтыг олгох боломжгүй."
+msgstr "Алдаа! Ижил төсөлд дэвшүүлэхээр тохируулах боломжгүй."
 
 #. module: project_issue
 #: selection:project.issue,priority:0
@@ -264,7 +264,7 @@ msgid ""
 "If any issue is escalated from the current Project, it will be listed under "
 "the project selected here."
 msgstr ""
-"Хэрэв асуудал энэ төслөөс томруулсан бол тэдгээр нь энд сонгосон төслүүдэд "
+"Хэрэв асуудал энэ төслөөс дэвшүүлэгдсэн бол тэдгээр нь энд сонгосон төсөлд "
 "харагдана."
 
 #. module: project_issue
@@ -899,7 +899,7 @@ msgstr "Онцлогийн тайлбар"
 #. module: project_issue
 #: field:project.project,project_escalation_id:0
 msgid "Project Escalation"
-msgstr "Төслийг Томруулах"
+msgstr "Дэвшүүлэх Төсөл"
 
 #. module: project_issue
 #: model:ir.actions.act_window,help:project_issue.project_issue_version_action
@@ -948,7 +948,7 @@ msgstr "4-р сар"
 #. module: project_issue
 #: view:project.issue:0
 msgid "⇒ Escalate"
-msgstr "⇒ Томруулах"
+msgstr "⇒ Дэвшүүлэх"
 
 #. module: project_issue
 #: model:mail.message.subtype,description:project_issue.mt_issue_new
diff --git a/addons/sale/i18n/fr_CA.po b/addons/sale/i18n/fr_CA.po
index c1c93411dfd..08a464d8f55 100644
--- a/addons/sale/i18n/fr_CA.po
+++ b/addons/sale/i18n/fr_CA.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-13 06:28+0000\n"
+"X-Launchpad-Export-Date: 2014-05-14 06:20+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
 
 #. module: sale
diff --git a/addons/stock/i18n/nl.po b/addons/stock/i18n/nl.po
index 032e6ca53d5..3fb1f4079fc 100644
--- a/addons/stock/i18n/nl.po
+++ b/addons/stock/i18n/nl.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2014-02-06 15:56+0000\n"
-"PO-Revision-Date: 2014-05-08 15:02+0000\n"
+"PO-Revision-Date: 2014-05-13 13:54+0000\n"
 "Last-Translator: Erwin van der Ploeg (BAS Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@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: 2014-05-10 07:55+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-14 06:20+0000\n"
+"X-Generator: Launchpad (build 17002)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -1628,7 +1628,7 @@ msgstr "Terug te betalen (Credit factuur)"
 #: code:addons/stock/stock.py:2450
 #, python-format
 msgid "You can only delete draft moves."
-msgstr "Er kunnen alleen concept-wijzigingen worden verwijderd."
+msgstr "Er kunnen alleen regels met de status 'Nieuw' worden verwijderd."
 
 #. module: stock
 #: code:addons/stock/stock.py:1665

From b00783ab46b7e137e8ffbb435657ee2d03861276 Mon Sep 17 00:00:00 2001
From: "Richard Mathot (OpenERP)" <rim@openerp.com>
Date: Wed, 14 May 2014 09:47:25 +0200
Subject: [PATCH 124/225] [FIX] survey: Prevent template crashing while there
 are no data for the survey

---
 addons/survey/controllers/main.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/survey/controllers/main.py b/addons/survey/controllers/main.py
index d6f23f503d9..0e708d96f43 100644
--- a/addons/survey/controllers/main.py
+++ b/addons/survey/controllers/main.py
@@ -310,7 +310,8 @@ class WebsiteSurvey(http.Controller):
             current_filters = survey_obj.filter_input_ids(request.cr, request.uid, filter_data, filter_finish, context=request.context)
             filter_display_data = survey_obj.get_filter_display_data(request.cr, request.uid, filter_data, context=request.context)
         return request.website.render(result_template,
-                                      {'survey_dict': self.prepare_result_dict(survey, current_filters),
+                                      {'survey': survey,
+                                       'survey_dict': self.prepare_result_dict(survey, current_filters),
                                        'page_range': self.page_range,
                                        'current_filters': current_filters,
                                        'filter_display_data': filter_display_data,

From 02be7aa65cb2fa06ab2d1fcd250a419015f3c674 Mon Sep 17 00:00:00 2001
From: Kersten Jeremy <jke@openerp.com>
Date: Wed, 14 May 2014 10:28:10 +0200
Subject: [PATCH 125/225] [IMP] Improve Calendar synchronization

    - Use the new fields from calendar (renamed in 9398.1.7 trunk-cal-v8-jke)
    - Manage some google excpetions about token expiration
    - Manage some google excpetions about token revokation
    - Manage some google excpetions about 410 - Gone from google
    - Detect / Allow user to change the calendar and remove all old reference.
    - Use by default the since_modified for synchronization and not always a full (updatedTime in google)
    - Add some key for ir_parameters :
             'calendar.week_synchro' : number of week to synchornize when we are in full mode
             'calendar.block_synchro_attendee' : need to synchronize the attendees between google and openerp (creation of partner)
             'calendar.block_since_synchro' : Always use the full synchro. (Can be forced in "one time" removing the last synchro from res_users form)
             'calendar.debug_print' : _logger is more verbose
    - Pep 8
    - Change behaviour of do_request to return a tuple with status raquest and response
    - Add field from token and synchro date in res_users view form
---
 addons/calendar/calendar.py                   |  49 +-
 addons/google_account/google_account.py       | 122 ++---
 addons/google_calendar/__openerp__.py         |   6 +-
 addons/google_calendar/controllers/main.py    |  73 +--
 addons/google_calendar/google_calendar.py     | 449 +++++++++++++-----
 .../static/src/js/calendar_sync.js            |  42 +-
 addons/google_calendar/views/res_users.xml    |  24 +
 7 files changed, 498 insertions(+), 267 deletions(-)
 create mode 100644 addons/google_calendar/views/res_users.xml

diff --git a/addons/calendar/calendar.py b/addons/calendar/calendar.py
index c4b584100b6..46e8b024dd6 100644
--- a/addons/calendar/calendar.py
+++ b/addons/calendar/calendar.py
@@ -1,23 +1,4 @@
 # -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Business Applications
-#    Copyright (c) 2011-2014 OpenERP S.A. <http://openerp.com>
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
 
 import pytz
 import re
@@ -188,7 +169,8 @@ class calendar_attendee(osv.Model):
         res = cal.serialize()
         return res
 
-    def _send_mail_to_attendees(self, cr, uid, ids, email_from=tools.config.get('email_from', False), template_xmlid='calendar_template_meeting_invitation', context=None):
+    def _send_mail_to_attendees(self, cr, uid, ids, email_from=tools.config.get('email_from', False),
+                                template_xmlid='calendar_template_meeting_invitation', context=None):
         """
         Send mail for event invitation to event attendees.
         @param email_from: email address for user sending the mail
@@ -273,7 +255,8 @@ class calendar_attendee(osv.Model):
         meeting_obj = self.pool['calendar.event']
         res = self.write(cr, uid, ids, {'state': 'accepted'}, context)
         for attendee in self.browse(cr, uid, ids, context=context):
-            meeting_obj.message_post(cr, uid, attendee.event_id.id, body=_(("%s has accepted invitation") % (attendee.cn)), subtype="calendar.subtype_invitation", context=context)
+            meeting_obj.message_post(cr, uid, attendee.event_id.id, body=_(("%s has accepted invitation") % (attendee.cn)),
+                                     subtype="calendar.subtype_invitation", context=context)
 
         return res
 
@@ -1410,7 +1393,7 @@ class calendar_event(osv.Model):
             new_args.append(new_arg)
 
         if not context.get('virtual_id', True):
-            return super(calendar_event, self).search(cr, uid, new_args, offset=offset, limit=limit, order=order, context=context, count=count)
+            return super(calendar_event, self).search(cr, uid, new_args, offset=offset, limit=limit, order=order, count=count, context=context)
 
         # offset, limit, order and count must be treated separately as we may need to deal with virtual ids
         res = super(calendar_event, self).search(cr, uid, new_args, offset=0, limit=0, order=None, context=context, count=False)
@@ -1535,17 +1518,17 @@ class calendar_event(osv.Model):
 
         if (values.get('start_date') or values.get('start_datetime', False)) and values.get('active', True):
             the_id = new_id or (ids and int(ids[0]))
+            if the_id:
+                if attendees_create:
+                    attendees_create = attendees_create[the_id]
+                    mail_to_ids = list(set(attendees_create['old_attendee_ids']) - set(attendees_create['removed_attendee_ids']))
+                else:
+                    mail_to_ids = [att.id for att in self.browse(cr, uid, the_id, context=context).attendee_ids]
 
-            if attendees_create:
-                attendees_create = attendees_create[the_id]
-                mail_to_ids = list(set(attendees_create['old_attendee_ids']) - set(attendees_create['removed_attendee_ids']))
-            else:
-                mail_to_ids = [att.id for att in self.browse(cr, uid, the_id, context=context).attendee_ids]
-
-            if mail_to_ids:
-                current_user = self.pool['res.users'].browse(cr, uid, uid, context=context)
-                if self.pool['calendar.attendee']._send_mail_to_attendees(cr, uid, mail_to_ids, template_xmlid='calendar_template_meeting_changedate', email_from=current_user.email, context=context):
-                    self.message_post(cr, uid, the_id, body=_("A email has been send to specify that the date has been changed !"), subtype="calendar.subtype_invitation", context=context)
+                if mail_to_ids:
+                    current_user = self.pool['res.users'].browse(cr, uid, uid, context=context)
+                    if self.pool['calendar.attendee']._send_mail_to_attendees(cr, uid, mail_to_ids, template_xmlid='calendar_template_meeting_changedate', email_from=current_user.email, context=context):
+                        self.message_post(cr, uid, the_id, body=_("A email has been send to specify that the date has been changed !"), subtype="calendar.subtype_invitation", context=context)
         return res or True and False
 
     def create(self, cr, uid, vals, context=None):
@@ -1624,7 +1607,7 @@ class calendar_event(osv.Model):
                     continue
             if r['class'] == 'private':
                 for f in r.keys():
-                    if f not in ('id', 'allday', 'start', 'stop', 'duration', 'user_id', 'state', 'interval', 'count', 'recurrent_id_date'):
+                    if f not in ('id', 'allday', 'start', 'stop', 'duration', 'user_id', 'state', 'interval', 'count', 'recurrent_id_date', 'rrule'):
                         if isinstance(r[f], list):
                             r[f] = []
                         else:
diff --git a/addons/google_account/google_account.py b/addons/google_account/google_account.py
index d42b0b67e59..7ffa4f95f48 100644
--- a/addons/google_account/google_account.py
+++ b/addons/google_account/google_account.py
@@ -1,28 +1,12 @@
 # -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
 
+import openerp
+from openerp.http import request
 from openerp.osv import osv
 from openerp import SUPERUSER_ID
 from openerp.tools.translate import _
-from openerp.addons.web.http import request
+from datetime import datetime
+from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT
 
 import werkzeug.urls
 import urllib2
@@ -31,6 +15,7 @@ import simplejson
 import logging
 _logger = logging.getLogger(__name__)
 
+
 class google_service(osv.osv_memory):
     _name = 'google.service'
 
@@ -48,7 +33,8 @@ class google_service(osv.osv_memory):
             req = urllib2.Request("https://accounts.google.com/o/oauth2/token", data, headers)
             content = urllib2.urlopen(req).read()
         except urllib2.HTTPError:
-            raise self.pool.get('res.config.settings').get_config_warning(cr, _("Something went wrong during your token generation. Maybe your Authorization Code is invalid or already expired"), context=context)
+            error_msg = "Something went wrong during your token generation. Maybe your Authorization Code is invalid or already expired"
+            raise self.pool.get('res.config.settings').get_config_warning(cr, _(error_msg), context=context)
 
         content = simplejson.loads(content)
         return content.get('refresh_token')
@@ -65,8 +51,8 @@ class google_service(osv.osv_memory):
         uri = 'https://accounts.google.com/o/oauth2/auth?%s' % werkzeug.url_encode(params)
         return uri
 
-    #If no scope is passed, we use service by default to get a default scope
-    def _get_authorize_uri(self, cr, uid, from_url, service, scope = False, context=None): 
+    # If no scope is passed, we use service by default to get a default scope
+    def _get_authorize_uri(self, cr, uid, from_url, service, scope=False, context=None):
         """ This method return the url needed to allow this instance of OpenErp to access to the scope of gmail specified as parameters """
         state_obj = dict(d=cr.dbname, s=service, f=from_url)
 
@@ -76,11 +62,11 @@ class google_service(osv.osv_memory):
         params = {
             'response_type': 'code',
             'client_id': client_id,
-            'state' : simplejson.dumps(state_obj),
+            'state': simplejson.dumps(state_obj),
             'scope': scope or 'https://www.googleapis.com/auth/%s' % (service,),
             'redirect_uri': base_url + '/google_account/authentication',
-            'approval_prompt':'force',
-            'access_type':'offline'
+            'approval_prompt': 'force',
+            'access_type': 'offline'
         }
 
         uri = self.get_uri_oauth(a='auth') + "?%s" % werkzeug.url_encode(params)
@@ -96,25 +82,24 @@ class google_service(osv.osv_memory):
             'code': authorize_code,
             'client_id': client_id,
             'client_secret': client_secret,
-            'grant_type' : 'authorization_code',
+            'grant_type': 'authorization_code',
             'redirect_uri': base_url + '/google_account/authentication'
         }
 
         headers = {"content-type": "application/x-www-form-urlencoded"}
 
         try:
+            uri = self.get_uri_oauth(a='token')
             data = werkzeug.url_encode(params)
-            req = urllib2.Request(self.get_uri_oauth(a='token'), data, headers)
 
-            content = urllib2.urlopen(req).read()
-            res = simplejson.loads(content)
-        except urllib2.HTTPError,e:
-            raise self.pool.get('res.config.settings').get_config_warning(cr, _("Something went wrong during your token generation. Maybe your Authorization Code is invalid"), context=context)
+            st, res = self._do_request(cr, uid, uri, params=data, headers=headers, type='POST', preuri='', context=context)
+        except urllib2.HTTPError:
+            error_msg = "Something went wrong during your token generation. Maybe your Authorization Code is invalid"
+            raise self.pool.get('res.config.settings').get_config_warning(cr, _(error_msg), context=context)
         return res
 
-    def _refresh_google_token_json(self, cr, uid, refresh_token, service, context=None): #exchange_AUTHORIZATION vs Token (service = calendar)
+    def _refresh_google_token_json(self, cr, uid, refresh_token, service, context=None):  # exchange_AUTHORIZATION vs Token (service = calendar)
         res = False
-        base_url = self.get_base_url(cr, uid, context)
         client_id = self.get_client_id(cr, uid, service, context)
         client_secret = self.get_client_secret(cr, uid, service, context)
 
@@ -122,60 +107,79 @@ class google_service(osv.osv_memory):
             'refresh_token': refresh_token,
             'client_id': client_id,
             'client_secret': client_secret,
-            'grant_type' : 'refresh_token'
+            'grant_type': 'refresh_token',
         }
 
         headers = {"content-type": "application/x-www-form-urlencoded"}
 
         try:
-            data = werkzeug.url_encode(params)
-            req = urllib2.Request(self.get_uri_oauth(a='token'), data, headers)
-            content = urllib2.urlopen(req).read()
-            res = simplejson.loads(content)
-        except urllib2.HTTPError:
-            raise self.pool.get('res.config.settings').get_config_warning(cr, _("Something went wrong during your token generation. Maybe your Authorization Code is invalid or already expired"), context=context)
+            uri = self.get_uri_oauth(a='token')
 
+            data = werkzeug.url_encode(params)
+            st, res = self._do_request(cr, uid, uri, params=data, headers=headers, type='POST', preuri='', context=context)
+        except urllib2.HTTPError, e:
+            if e.code == 400:  # invalid grant
+                registry = openerp.modules.registry.RegistryManager.get(request.session.db)
+                with registry.cursor() as cur:
+                    self.pool['res.users'].write(cur, uid, [uid], {'google_%s_rtoken' % service: False}, context=context)
+            error_key = simplejson.loads(e.read()).get("error", "nc")
+            _logger.exception("Bad google request : %s !" % error_key)
+            error_msg = "Something went wrong during your token generation. Maybe your Authorization Code is invalid or already expired [%s]" % error_key
+            raise self.pool.get('res.config.settings').get_config_warning(cr, _(error_msg), context=context)
         return res
 
+    def _do_request(self, cr, uid, uri, params={}, headers={}, type='POST', preuri="https://www.googleapis.com", context=None):
+        if context is None:
+            context = {}
 
-    def _do_request(self,cr,uid,uri,params={},headers={},type='POST', context=None):
-        _logger.debug("Uri: %s - Type : %s - Headers: %s - Params : %s !" % (uri,type,headers,werkzeug.url_encode(params) if type =='GET' else params))
-        res = False
+        """ Return a tuple ('HTTP_CODE', 'HTTP_RESPONSE') """
+        _logger.debug("Uri: %s - Type : %s - Headers: %s - Params : %s !" % (uri, type, headers, werkzeug.url_encode(params) if type == 'GET' else params))
 
+        status = 418
+        response = ""
         try:
             if type.upper() == 'GET' or type.upper() == 'DELETE':
                 data = werkzeug.url_encode(params)
-                req = urllib2.Request(self.get_uri_api() + uri + "?" + data)
-            elif type.upper() == 'POST'  or type.upper() == 'PATCH' or type.upper() == 'PUT':
-                req = urllib2.Request(self.get_uri_api() + uri, params, headers)
+                req = urllib2.Request(preuri + uri + "?" + data)
+            elif type.upper() == 'POST' or type.upper() == 'PATCH' or type.upper() == 'PUT':
+                req = urllib2.Request(preuri + uri, params, headers)
             else:
                 raise ('Method not supported [%s] not in [GET, POST, PUT, PATCH or DELETE]!' % (type))
             req.get_method = lambda: type.upper()
 
             request = urllib2.urlopen(req)
+            status = request.getcode()
 
-            if request.getcode() == 204: #No content returned, (ex: POST calendar/event/clear)
-                res = True
-            elif request.getcode() == 404: #Page not found
-                res = False
+            if int(status) in (204, 404):  # Page not found, no response
+                response = False
             else:
-                content=request.read()
-                res = simplejson.loads(content)
-        except urllib2.HTTPError,e:
+                content = request.read()
+                response = simplejson.loads(content)
+
+            if context.get('ask_time'):
+                try:
+                    date = datetime.strptime(request.headers.get('date'), "%a, %d %b %Y %H:%M:%S %Z")
+                except:
+                    date = datetime.now().strftime(DEFAULT_SERVER_DATETIME_FORMAT)
+                context['ask_time'] = date
+        except urllib2.HTTPError, e:
+            if e.code in (400, 401, 410):
+                raise e
+
             _logger.exception("Bad google request : %s !" % e.read())
             raise self.pool.get('res.config.settings').get_config_warning(cr, _("Something went wrong with your request to google"), context=context)
-        return res
+        return (status, response)
 
     def get_base_url(self, cr, uid, context=None):
-        return self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url',default='http://www.openerp.com?NoBaseUrl',context=context)
+        return self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url', default='http://www.openerp.com?NoBaseUrl', context=context)
 
     def get_client_id(self, cr, uid, service, context=None):
-        return self.pool.get('ir.config_parameter').get_param(cr, uid, 'google_%s_client_id' % (service,),default=False,context=context)
+        return self.pool.get('ir.config_parameter').get_param(cr, uid, 'google_%s_client_id' % (service,), default=False, context=context)
 
     def get_client_secret(self, cr, uid, service, context=None):
-        return self.pool.get('ir.config_parameter').get_param(cr, uid, 'google_%s_client_secret' % (service,),default=False,context=context)
+        return self.pool.get('ir.config_parameter').get_param(cr, uid, 'google_%s_client_secret' % (service,), default=False, context=context)
 
-    def get_uri_oauth(self,a=''): #a = optional action
+    def get_uri_oauth(self, a=''):  # a = optional action
         return "https://accounts.google.com/o/oauth2/%s" % (a,)
 
     def get_uri_api(self):
diff --git a/addons/google_calendar/__openerp__.py b/addons/google_calendar/__openerp__.py
index 18f2806976b..7e7a34362f6 100644
--- a/addons/google_calendar/__openerp__.py
+++ b/addons/google_calendar/__openerp__.py
@@ -25,20 +25,20 @@
     'version': '1.0',
     'category': 'Tools',
     'description': """
-The module adds the possibility to synchronize Google Calendar with OpenERP 
+The module adds the possibility to synchronize Google Calendar with OpenERP
 ========================================
 """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
-    'depends': ['google_account','calendar'],
+    'depends': ['google_account', 'calendar'],
     'qweb': ['static/src/xml/*.xml'],
     'data': [
         'res_config_view.xml',
         'security/ir.model.access.csv',
         'views/google_calendar.xml',
+        'views/res_users.xml',
     ],
     'demo': [],
     'installable': True,
     'auto_install': False,
 }
-
diff --git a/addons/google_calendar/controllers/main.py b/addons/google_calendar/controllers/main.py
index 49083a79bfc..1f307133ea0 100644
--- a/addons/google_calendar/controllers/main.py
+++ b/addons/google_calendar/controllers/main.py
@@ -1,51 +1,60 @@
-import simplejson
-import urllib
-import openerp
 import openerp.addons.web.http as http
 from openerp.addons.web.http import request
-import openerp.addons.web.controllers.main as webmain
-from openerp.addons.web.http import SessionExpiredException
-from werkzeug.exceptions import BadRequest
-import werkzeug.utils
+
 
 class google_calendar_controller(http.Controller):
-    
+
     @http.route('/google_calendar/sync_data', type='json', auth='user')
-    def sync_data(self, arch, fields, model,**kw):
-        """ 
+    def sync_data(self, arch, fields, model, **kw):
+        """
             This route/function is called when we want to synchronize openERP calendar with Google Calendar
             Function return a dictionary with the status :  need_config_from_admin, need_auth, need_refresh, success if not calendar_event
-            The dictionary may contains an url, to allow OpenERP Client to redirect user on this URL for authorization for example 
+            The dictionary may contains an url, to allow OpenERP Client to redirect user on this URL for authorization for example
         """
-                            
+
         if model == 'calendar.event':
             gs_obj = request.registry['google.service']
             gc_obj = request.registry['google.calendar']
-            
+
             # Checking that admin have already configured Google API for google synchronization !
-            client_id = gs_obj.get_client_id(request.cr, request.uid,'calendar',context=kw.get('local_context'))
+            client_id = gs_obj.get_client_id(request.cr, request.uid, 'calendar', context=kw.get('local_context'))
 
             if not client_id or client_id == '':
                 action = ''
-                if gc_obj.can_authorize_google(request.cr,request.uid):
-                    dummy, action = request.registry.get('ir.model.data').get_object_reference(request.cr, request.uid, 'google_calendar', 'action_config_settings_google_calendar')
-                
+                if gc_obj.can_authorize_google(request.cr, request.uid):
+                    dummy, action = request.registry.get('ir.model.data').get_object_reference(request.cr, request.uid,
+                                                                                               'google_calendar', 'action_config_settings_google_calendar')
+
                 return {
-                        "status" :  "need_config_from_admin",
-                        "url" : '',
-                        "action" : action
-                        }
-                        
+                    "status": "need_config_from_admin",
+                    "url": '',
+                    "action": action
+                }
+
             # Checking that user have already accepted OpenERP to access his calendar !
-            if gc_obj.need_authorize(request.cr, request.uid,context=kw.get('local_context')):
-                url =  gc_obj.authorize_google_uri(request.cr, request.uid, from_url=kw.get('fromurl'), context=kw.get('local_context'))
+            if gc_obj.need_authorize(request.cr, request.uid, context=kw.get('local_context')):
+                url = gc_obj.authorize_google_uri(request.cr, request.uid, from_url=kw.get('fromurl'), context=kw.get('local_context'))
                 return {
-                        "status" :  "need_auth",
-                        "url" : url 
-                        }
-            
+                    "status": "need_auth",
+                    "url": url
+                }
+
             # If App authorized, and user access accepted, We launch the synchronization
-            return gc_obj.synchronize_events(request.cr, request.uid, [], kw.get('local_context'))
-                      
-        return { "status" : "success" }
-    
+            return gc_obj.synchronize_events(request.cr, request.uid, [], context=kw.get('local_context'))
+
+        return {"status": "success"}
+
+    @http.route('/google_calendar/remove_references', type='json', auth='user')
+    def remove_references(self, model, **kw):
+        """
+            This route/function is called when we want to remove all the references between one calendar OpenERP and one Google Calendar
+        """
+        status = "NOP"
+        if model == 'calendar.event':
+            gc_obj = request.registry['google.calendar']
+            # Checking that user have already accepted OpenERP to access his calendar !
+            if gc_obj.remove_references(request.cr, request.uid, context=kw.get('local_context')):
+                status = "OK"
+            else:
+                status = "KO"
+        return {"status": status}
diff --git a/addons/google_calendar/google_calendar.py b/addons/google_calendar/google_calendar.py
index 177642f091d..543c81977aa 100644
--- a/addons/google_calendar/google_calendar.py
+++ b/addons/google_calendar/google_calendar.py
@@ -1,31 +1,15 @@
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2012 OpenERP SA (<http://www.openerp.com>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
+# -*- coding: utf-8 -*-
 
 import operator
 import simplejson
-import urllib
+import urllib2
 
+import openerp
 from openerp import tools
 from openerp import SUPERUSER_ID
-
+from openerp.tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT
+from openerp.tools.translate import _
+from openerp.http import request
 from datetime import datetime, timedelta
 from dateutil import parser
 import pytz
@@ -35,6 +19,13 @@ import logging
 _logger = logging.getLogger(__name__)
 
 
+def status_response(status, substr=False):
+    if substr:
+        return int(str(status)[0])
+    else:
+        return status_response(status, substr=True) == 2
+
+
 class Meta(type):
     """ This Meta class allow to define class as a structure, and so instancied variable
         in __init__ to avoid to have side effect alike 'static' variable """
@@ -90,7 +81,7 @@ class SyncEvent(object):
     def __getitem__(self, key):
         return getattr(self, key)
 
-    def compute_OP(self):
+    def compute_OP(self, modeFull=True):
         #If event are already in Gmail and in OpenERP
         if self.OE.found and self.GG.found:
             #If the event has been deleted from one side, we delete on other side !
@@ -120,7 +111,6 @@ class SyncEvent(object):
                 else:
                     if not self.OE.synchro or self.OE.synchro.split('.')[0] < self.OE.update.split('.')[0]:
                         self.OP = Update('OE', 'Event already updated by another user, but not synchro with my google calendar')
-                        #import ipdb; ipdb.set_trace();
                     else:
                         self.OP = NothingToDo("", 'Not update needed')
             else:
@@ -128,11 +118,13 @@ class SyncEvent(object):
 
         # New in openERP...  Create on create_events of synchronize function
         elif self.OE.found and not self.GG.found:
-            #Has been deleted from gmail
             if self.OE.status:
-                self.OP = Delete('OE', 'Removed from GOOGLE')
+                self.OP = Delete('OE', 'Update or delete from GOOGLE')
             else:
-                self.OP = NothingToDo("", "Already Deleted in gmail and unlinked in OpenERP")
+                if not modeFull:
+                    self.OP = Delete('GG', 'Deleted from OpenERP, need to delete it from Gmail if already created')
+                else:
+                    self.OP = NothingToDo("", "Already Deleted in gmail and unlinked in OpenERP")
         elif self.GG.found and not self.OE.found:
             tmpSrc = 'GG'
             if not self.GG.status and not self.GG.isInstance:
@@ -151,11 +143,11 @@ class SyncEvent(object):
         return self.__repr__()
 
     def __repr__(self):
-        myPrint = "---- A SYNC EVENT ---"
+        myPrint = "\n\n---- A SYNC EVENT ---"
         myPrint += "\n    ID          OE: %s " % (self.OE.event and self.OE.event.id)
         myPrint += "\n    ID          GG: %s " % (self.GG.event and self.GG.event.get('id', False))
-        myPrint += "\n    Name        OE: %s " % (self.OE.event and self.OE.event.name)
-        myPrint += "\n    Name        GG: %s " % (self.GG.event and self.GG.event.get('summary', False))
+        myPrint += "\n    Name        OE: %s " % (self.OE.event and self.OE.event.name.encode('utf8'))
+        myPrint += "\n    Name        GG: %s " % (self.GG.event and self.GG.event.get('summary', '').encode('utf8'))
         myPrint += "\n    Found       OE:%5s vs GG: %5s" % (self.OE.found, self.GG.found)
         myPrint += "\n    Recurrence  OE:%5s vs GG: %5s" % (self.OE.isRecurrence, self.GG.isRecurrence)
         myPrint += "\n    Instance    OE:%5s vs GG: %5s" % (self.OE.isInstance, self.GG.isInstance)
@@ -207,15 +199,15 @@ class google_calendar(osv.AbstractModel):
     STR_SERVICE = 'calendar'
     _name = 'google.%s' % STR_SERVICE
 
-    def generate_data(self, cr, uid, event, context=None):
+    def generate_data(self, cr, uid, event, isCreating=False, context=None):
         if event.allday:
-            start_date = fields.datetime.context_timestamp(cr, uid, datetime.strptime(event.date, tools.DEFAULT_SERVER_DATETIME_FORMAT), context=context).isoformat('T').split('T')[0]
-            end_date = fields.datetime.context_timestamp(cr, uid, datetime.strptime(event.date, tools.DEFAULT_SERVER_DATETIME_FORMAT) + timedelta(hours=event.duration), context=context).isoformat('T').split('T')[0]
+            start_date = fields.datetime.context_timestamp(cr, uid, datetime.strptime(event.start, tools.DEFAULT_SERVER_DATETIME_FORMAT), context=context).isoformat('T').split('T')[0]
+            final_date = fields.datetime.context_timestamp(cr, uid, datetime.strptime(event.start, tools.DEFAULT_SERVER_DATETIME_FORMAT) + timedelta(hours=event.duration) + timedelta(days=isCreating and 1 or 0), context=context).isoformat('T').split('T')[0]
             type = 'date'
             vstype = 'dateTime'
         else:
-            start_date = fields.datetime.context_timestamp(cr, uid, datetime.strptime(event.date, tools.DEFAULT_SERVER_DATETIME_FORMAT), context=context).isoformat('T')
-            end_date = fields.datetime.context_timestamp(cr, uid, datetime.strptime(event.date_deadline, tools.DEFAULT_SERVER_DATETIME_FORMAT), context=context).isoformat('T')
+            start_date = fields.datetime.context_timestamp(cr, uid, datetime.strptime(event.start, tools.DEFAULT_SERVER_DATETIME_FORMAT), context=context).isoformat('T')
+            final_date = fields.datetime.context_timestamp(cr, uid, datetime.strptime(event.stop, tools.DEFAULT_SERVER_DATETIME_FORMAT), context=context).isoformat('T')
             type = 'dateTime'
             vstype = 'date'
         attendee_list = []
@@ -235,7 +227,7 @@ class google_calendar(osv.AbstractModel):
                 'timeZone': 'UTC'
             },
             "end": {
-                type: end_date,
+                type: final_date,
                 vstype: None,
                 'timeZone': 'UTC'
             },
@@ -256,10 +248,9 @@ class google_calendar(osv.AbstractModel):
 
     def create_an_event(self, cr, uid, event, context=None):
         gs_pool = self.pool['google.service']
+        data = self.generate_data(cr, uid, event, isCreating=True, context=context)
 
-        data = self.generate_data(cr, uid, event, context=context)
-
-        url = "/calendar/v3/calendars/%s/events?fields=%s&access_token=%s" % ('primary', urllib.quote('id,updated'), self.get_token(cr, uid, context))
+        url = "/calendar/v3/calendars/%s/events?fields=%s&access_token=%s" % ('primary', urllib2.quote('id,updated'), self.get_token(cr, uid, context))
         headers = {'Content-type': 'application/json', 'Accept': 'text/plain'}
         data_json = simplejson.dumps(data)
 
@@ -276,38 +267,89 @@ class google_calendar(osv.AbstractModel):
 
         return gs_pool._do_request(cr, uid, url, params, headers, type='DELETE', context=context)
 
-    def get_event_dict(self, cr, uid, token=False, nextPageToken=False, context=None):
+    def get_calendar_primary_id(self, cr, uid, context=None):
+        params = {
+            'fields': 'id',
+            'access_token': self.get_token(cr, uid, context)
+        }
+        headers = {'Content-type': 'application/json', 'Accept': 'text/plain'}
+
+        url = "/calendar/v3/calendars/primary"
+
+        try:
+            st, content = self.pool['google.service']._do_request(cr, uid, url, params, headers, type='GET', context=context)
+        except Exception, e:
+
+            if (e.code == 401):  # Token invalid / Acces unauthorized
+                error_msg = "Your token is invalid or has been revoked !"
+
+                registry = openerp.modules.registry.RegistryManager.get(request.session.db)
+                with registry.cursor() as cur:
+                    self.pool['res.users'].write(cur, uid, [uid], {'google_calendar_token': False, 'google_calendar_token_validity': False}, context=context)
+
+                raise self.pool.get('res.config.settings').get_config_warning(cr, _(error_msg), context=context)
+            raise
+
+        return status_response(st) and content['id'] or False
+
+    def get_event_synchro_dict(self, cr, uid, lastSync=False, token=False, nextPageToken=False, context=None):
         if not token:
             token = self.get_token(cr, uid, context)
 
-        gs_pool = self.pool['google.service']
-
         params = {
             'fields': 'items,nextPageToken',
             'access_token': token,
             'maxResults': 1000,
-            'timeMin': self.get_start_time_to_synchro(cr, uid, context=context).strftime("%Y-%m-%dT%H:%M:%S.%fz"),
+            #'timeMin': self.get_minTime(cr, uid, context=context).strftime("%Y-%m-%dT%H:%M:%S.%fz"),
         }
+
+        if lastSync:
+            params['updatedMin'] = lastSync.strftime("%Y-%m-%dT%H:%M:%S.%fz")
+            params['showDeleted'] = True
+        else:
+            params['timeMin'] = self.get_minTime(cr, uid, context=context).strftime("%Y-%m-%dT%H:%M:%S.%fz")
+
         headers = {'Content-type': 'application/json', 'Accept': 'text/plain'}
 
         url = "/calendar/v3/calendars/%s/events" % 'primary'
         if nextPageToken:
             params['pageToken'] = nextPageToken
 
-        content = gs_pool._do_request(cr, uid, url, params, headers, type='GET', context=context)
+        status, content = self.pool['google.service']._do_request(cr, uid, url, params, headers, type='GET', context=context)
 
         google_events_dict = {}
-
         for google_event in content['items']:
             google_events_dict[google_event['id']] = google_event
 
-        if content.get('nextPageToken', False):
-            google_events_dict.update(self.get_event_dict(cr, uid, token, content['nextPageToken'], context=context))
+        if content.get('nextPageToken'):
+            google_events_dict.update(
+                self.get_event_synchro_dict(cr, uid, lastSync=lastSync, token=token, nextPageToken=content['nextPageToken'], context=context)
+            )
+
         return google_events_dict
 
+    def get_one_event_synchro(self, cr, uid, google_id, context=None):
+        token = self.get_token(cr, uid, context)
+
+        params = {
+            'access_token': token,
+            'maxResults': 1000,
+            'showDeleted': True,
+        }
+
+        headers = {'Content-type': 'application/json', 'Accept': 'text/plain'}
+
+        url = "/calendar/v3/calendars/%s/events/%s" % ('primary', google_id)
+        try:
+            status, content = self.pool['google.service']._do_request(cr, uid, url, params, headers, type='GET', context=context)
+        except:
+            _logger.info("Calendar Synchro - In except of get_one_event_synchro")
+            pass
+
+        return status_response(status) and content or False
+
     def update_to_google(self, cr, uid, oe_event, google_event, context):
         calendar_event = self.pool['calendar.event']
-        gs_pool = self.pool['google.service']
 
         url = "/calendar/v3/calendars/%s/events/%s?fields=%s&access_token=%s" % ('primary', google_event['id'], 'id,updated', self.get_token(cr, uid, context))
         headers = {'Content-type': 'application/json', 'Accept': 'text/plain'}
@@ -315,7 +357,7 @@ class google_calendar(osv.AbstractModel):
         data['sequence'] = google_event.get('sequence', 0)
         data_json = simplejson.dumps(data)
 
-        content = gs_pool._do_request(cr, uid, url, data_json, headers, type='PATCH', context=context)
+        status, content = self.pool['google.service']._do_request(cr, uid, url, data_json, headers, type='PATCH', context=context)
 
         update_date = datetime.strptime(content['updated'], "%Y-%m-%dT%H:%M:%S.%fz")
         calendar_event.write(cr, uid, [oe_event.id], {'oe_update_date': update_date})
@@ -324,15 +366,13 @@ class google_calendar(osv.AbstractModel):
             self.pool['calendar.attendee'].write(cr, uid, [context['curr_attendee']], {'oe_synchro_date': update_date}, context)
 
     def update_an_event(self, cr, uid, event, context=None):
-        gs_pool = self.pool['google.service']
-
         data = self.generate_data(cr, uid, event, context=context)
 
         url = "/calendar/v3/calendars/%s/events/%s" % ('primary', event.google_internal_event_id)
         headers = {}
         data['access_token'] = self.get_token(cr, uid, context)
 
-        response = gs_pool._do_request(cr, uid, url, data, headers, type='GET', context=context)
+        status, response = self.pool['google.service']._do_request(cr, uid, url, data, headers, type='GET', context=context)
         #TO_CHECK : , if http fail, no event, do DELETE ?
         return response
 
@@ -379,7 +419,12 @@ class google_calendar(osv.AbstractModel):
                 if self.get_need_synchro_attendee(cr, uid, context=context):
                     attendee_id = res_partner_obj.search(cr, uid, [('email', '=', google_attendee['email'])], context=context)
                     if not attendee_id:
-                        attendee_id = [res_partner_obj.create(cr, uid, {'email': google_attendee['email'], 'customer': False, 'name': google_attendee.get("displayName", False) or google_attendee['email']}, context=context)]
+                        data = {
+                            'email': google_attendee['email'],
+                            'customer': False,
+                            'name': google_attendee.get("displayName", False) or google_attendee['email']
+                        }
+                        attendee_id = [res_partner_obj.create(cr, uid, data, context=context)]
                     attendee = res_partner_obj.read(cr, uid, attendee_id[0], ['email'], context=context)
                     partner_record.append((4, attendee.get('id')))
                     attendee['partner_id'] = attendee.pop('id')
@@ -388,26 +433,25 @@ class google_calendar(osv.AbstractModel):
 
         UTC = pytz.timezone('UTC')
         if single_event_dict.get('start') and single_event_dict.get('end'):  # If not cancelled
+
             if single_event_dict['start'].get('dateTime', False) and single_event_dict['end'].get('dateTime', False):
                 date = parser.parse(single_event_dict['start']['dateTime'])
-                date_deadline = parser.parse(single_event_dict['end']['dateTime'])
-                delta = date_deadline.astimezone(UTC) - date.astimezone(UTC)
+                stop = parser.parse(single_event_dict['end']['dateTime'])
                 date = str(date.astimezone(UTC))[:-6]
-                date_deadline = str(date_deadline.astimezone(UTC))[:-6]
+                stop = str(stop.astimezone(UTC))[:-6]
                 allday = False
             else:
-                date = (single_event_dict['start']['date'] + ' 00:00:00')
-                date_deadline = (single_event_dict['end']['date'] + ' 00:00:00')
-                d_start = datetime.strptime(date, "%Y-%m-%d %H:%M:%S")
-                d_end = datetime.strptime(date_deadline, "%Y-%m-%d %H:%M:%S")
-                delta = (d_end - d_start)
+                date = (single_event_dict['start']['date'])
+                stop = (single_event_dict['end']['date'])
+                d_end = datetime.strptime(stop, DEFAULT_SERVER_DATE_FORMAT)
                 allday = True
+                d_end = d_end + timedelta(days=-1)
+                stop = d_end.strftime(DEFAULT_SERVER_DATE_FORMAT)
 
-            result['duration'] = (delta.seconds / 60) / 60.0 + delta.days * 24
             update_date = datetime.strptime(single_event_dict['updated'], "%Y-%m-%dT%H:%M:%S.%fz")
             result.update({
-                'date': date,
-                'date_deadline': date_deadline,
+                'start': date,
+                'stop': stop,
                 'allday': allday
             })
         result.update({
@@ -419,7 +463,6 @@ class google_calendar(osv.AbstractModel):
             'location': single_event_dict.get('location', False),
             'class': single_event_dict.get('visibility', 'public'),
             'oe_update_date': update_date,
-            # 'google_internal_event_id': single_event_dict.get('id',False),
         })
 
         if single_event_dict.get("recurrence", False):
@@ -431,7 +474,6 @@ class google_calendar(osv.AbstractModel):
         elif type == "copy":
             result['recurrence'] = True
             res = calendar_event.write(cr, uid, [event['id']], result, context=context)
-
         elif type == "create":
             res = calendar_event.create(cr, uid, result, context=context)
 
@@ -439,18 +481,81 @@ class google_calendar(osv.AbstractModel):
             self.pool['calendar.attendee'].write(cr, uid, [context['curr_attendee']], {'oe_synchro_date': update_date, 'google_internal_event_id': single_event_dict.get('id', False)}, context)
         return res
 
-    def synchronize_events(self, cr, uid, ids, context=None):
-        # Create all new events from OpenERP into Gmail, if that is not recurrent event
-        self.create_new_events(cr, uid, context=context)
-        self.bind_recurring_events_to_google(cr, uid, context)
-        res = self.update_events(cr, uid, context)
+    def remove_references(self, cr, uid, context=None):
+        current_user = self.pool['res.users'].browse(cr, uid, uid, context=context)
+        reset_data = {
+            'google_calendar_rtoken': False,
+            'google_calendar_token': False,
+            'google_calendar_token_validity': False,
+            'google_calendar_last_sync_date': False,
+            'google_calendar_cal_id': False,
+        }
 
+        all_my_attendees = self.pool['calendar.attendee'].search(cr, uid, [('partner_id', '=', current_user.partner_id.id)], context=context)
+        self.pool['calendar.attendee'].write(cr, uid, all_my_attendees, {'oe_synchro_date': False, 'google_internal_event_id': False}, context=context)
+        current_user.write(reset_data, context=context)
+        return True
+
+    def synchronize_events(self, cr, uid, ids, lastSync=True, context=None):
+        if context is None:
+            context = {}
+
+        # def isValidSync(syncToken):
+        #     gs_pool = self.pool['google.service']
+        #     params = {
+        #         'maxResults': 1,
+        #         'fields': 'id',
+        #         'access_token': self.get_token(cr, uid, context),
+        #         'syncToken': syncToken,
+        #     }
+        #     url = "/calendar/v3/calendars/primary/events"
+        #     status, response = gs_pool._do_request(cr, uid, url, params, type='GET', context=context)
+        #     return int(status) != 410
+
+        current_user = self.pool['res.users'].browse(cr, uid, uid, context=context)
+
+        context_with_time = dict(context.copy(), ask_time=True)
+        current_google = self.get_calendar_primary_id(cr, uid, context=context_with_time)
+
+        if current_user.google_calendar_cal_id:
+            if current_google != current_user.google_calendar_cal_id:
+                return {
+                    "status": "need_reset",
+                    "info": {
+                        "old_name": current_user.google_calendar_cal_id,
+                        "new_name": current_google
+                    },
+                    "url": ''
+                }
+
+            if lastSync and self.get_last_sync_date(cr, uid, context=context) and not self.get_disable_since_synchro(cr, uid, context=context):
+                lastSync = self.get_last_sync_date(cr, uid, context)
+                _logger.info("Calendar Synchro - MODE SINCE_MODIFIED : %s !" % lastSync.strftime(DEFAULT_SERVER_DATETIME_FORMAT))
+            else:
+                lastSync = False
+                _logger.info("Calendar Synchro - MODE FULL SYNCHRO FORCED")
+        else:
+            current_user.write({'google_calendar_cal_id': current_google}, context=context)
+            lastSync = False
+            _logger.info("Calendar Synchro - MODE FULL SYNCHRO - NEW CAL ID")
+
+        new_ids = []
+        new_ids += self.create_new_events(cr, uid, context=context)
+        new_ids += self.bind_recurring_events_to_google(cr, uid, context)
+
+        res = self.update_events(cr, uid, lastSync, context)
+
+        current_user.write({'google_calendar_last_sync_date': context_with_time.get('ask_time')}, context=context)
         return {
             "status": res and "need_refresh" or "no_new_event_form_google",
             "url": ''
         }
 
     def create_new_events(self, cr, uid, context=None):
+        if context is None:
+            context = {}
+
+        new_ids = []
         ev_obj = self.pool['calendar.event']
         att_obj = self.pool['calendar.attendee']
         user_obj = self.pool['res.users']
@@ -458,32 +563,43 @@ class google_calendar(osv.AbstractModel):
 
         context_norecurrent = context.copy()
         context_norecurrent['virtual_id'] = False
-
         my_att_ids = att_obj.search(cr, uid, [('partner_id', '=', myPartnerID),
                                     ('google_internal_event_id', '=', False),
                                     '|',
-                                    ('event_id.date_deadline', '>', self.get_start_time_to_synchro(cr, uid, context).strftime("%Y-%m-%d %H:%M:%S")),
-                                    ('event_id.end_date', '>', self.get_start_time_to_synchro(cr, uid, context).strftime("%Y-%m-%d %H:%M:%S")),
+                                    ('event_id.stop', '>', self.get_minTime(cr, uid, context=context).strftime(DEFAULT_SERVER_DATETIME_FORMAT)),
+                                    ('event_id.final_date', '>', self.get_minTime(cr, uid, context=context).strftime(DEFAULT_SERVER_DATETIME_FORMAT)),
                                     ], context=context_norecurrent)
-
         for att in att_obj.browse(cr, uid, my_att_ids, context=context):
             if not att.event_id.recurrent_id or att.event_id.recurrent_id == 0:
-                response = self.create_an_event(cr, uid, att.event_id, context=context)
-                update_date = datetime.strptime(response['updated'], "%Y-%m-%dT%H:%M:%S.%fz")
-                ev_obj.write(cr, uid, att.event_id.id, {'oe_update_date': update_date})
-                att_obj.write(cr, uid, [att.id], {'google_internal_event_id': response['id'], 'oe_synchro_date': update_date})
-                cr.commit()
+                st, response = self.create_an_event(cr, uid, att.event_id, context=context)
+                if status_response(st):
+                    update_date = datetime.strptime(response['updated'], "%Y-%m-%dT%H:%M:%S.%fz")
+                    ev_obj.write(cr, uid, att.event_id.id, {'oe_update_date': update_date})
+                    new_ids.append(response['id'])
+                    att_obj.write(cr, uid, [att.id], {'google_internal_event_id': response['id'], 'oe_synchro_date': update_date})
+                    cr.commit()
+                else:
+                    _logger.warning("Impossible to create event %s. [%s]" % (att.event_id.id, st))
+                    _logger.warning("Response : %s" % response)
+        return new_ids
 
-    def bind_recurring_events_to_google(self, cr, uid, context):
+    def get_context_no_virtual(self, context):
+        context_norecurrent = context.copy()
+        context_norecurrent['virtual_id'] = False
+        context_norecurrent['active_test'] = False
+        return context_norecurrent
+
+    def bind_recurring_events_to_google(self, cr, uid, context=None):
+        if context is None:
+            context = {}
+
+        new_ids = []
         ev_obj = self.pool['calendar.event']
         att_obj = self.pool['calendar.attendee']
         user_obj = self.pool['res.users']
         myPartnerID = user_obj.browse(cr, uid, uid, context=context).partner_id.id
 
-        context_norecurrent = context.copy()
-        context_norecurrent['virtual_id'] = False
-        context_norecurrent['active_test'] = False
-
+        context_norecurrent = self.get_context_no_virtual(context)
         my_att_ids = att_obj.search(cr, uid, [('partner_id', '=', myPartnerID), ('google_internal_event_id', '=', False)], context=context_norecurrent)
 
         for att in att_obj.browse(cr, uid, my_att_ids, context=context):
@@ -500,11 +616,20 @@ class google_calendar(osv.AbstractModel):
 
                 if new_google_internal_event_id:
                     #TODO WARNING, NEED TO CHECK THAT EVENT and ALL instance NOT DELETE IN GMAIL BEFORE !
-                    self.update_recurrent_event_exclu(cr, uid, new_google_internal_event_id, source_attendee_record.google_internal_event_id, att.event_id, context=context)
-                    att_obj.write(cr, uid, [att.id], {'google_internal_event_id': new_google_internal_event_id}, context=context)
-                    cr.commit()
+                    try:
+                        st, response = self.update_recurrent_event_exclu(cr, uid, new_google_internal_event_id, source_attendee_record.google_internal_event_id, att.event_id, context=context)
+                        if status_response(st):
+                            att_obj.write(cr, uid, [att.id], {'google_internal_event_id': new_google_internal_event_id}, context=context)
+                            new_ids.append(new_google_internal_event_id)
+                            cr.commit()
+                        else:
+                            _logger.warning("Impossible to create event %s. [%s]" % (att.event_id.id, st))
+                            _logger.warning("Response : %s" % response)
+                    except:
+                        pass
+        return new_ids
 
-    def update_events(self, cr, uid, context=None):
+    def update_events(self, cr, uid, lastSync=False, context=None):
         if context is None:
             context = {}
 
@@ -512,20 +637,64 @@ class google_calendar(osv.AbstractModel):
         user_obj = self.pool['res.users']
         att_obj = self.pool['calendar.attendee']
         myPartnerID = user_obj.browse(cr, uid, uid, context=context).partner_id.id
+        context_novirtual = self.get_context_no_virtual(context)
 
-        context_novirtual = context.copy()
-        context_novirtual['virtual_id'] = False
-        context_novirtual['active_test'] = False
+        if lastSync:
+            try:
+                all_event_from_google = self.get_event_synchro_dict(cr, uid, lastSync=lastSync, context=context)
+            except urllib2.HTTPError, e:
+                if e.code == 410:  # GONE, Google is lost.
+                    # we need to force the rollback from this cursor, because it locks my res_users but I need to write in this tuple before to raise.
+                    cr.rollback()
+                    registry = openerp.modules.registry.RegistryManager.get(request.session.db)
+                    with registry.cursor() as cur:
+                        self.pool['res.users'].write(cur, uid, [uid], {'google_calendar_last_sync_date': False}, context=context)
+                error_key = simplejson.loads(e.read())
+                error_key = error_key.get('error', {}).get('message', 'nc')
+                error_msg = "Google are lost... the next synchro will be a full synchro. \n\n %s" % error_key
+                raise self.pool.get('res.config.settings').get_config_warning(cr, _(error_msg), context=context)
 
-        all_event_from_google = self.get_event_dict(cr, uid, context=context)
+            my_google_att_ids = att_obj.search(cr, uid, [
+                ('partner_id', '=', myPartnerID),
+                ('google_internal_event_id', 'in', all_event_from_google.keys())
+            ], context=context_novirtual)
+
+            my_openerp_att_ids = att_obj.search(cr, uid, [
+                ('partner_id', '=', myPartnerID),
+                ('event_id.oe_update_date', '>', lastSync and lastSync.strftime(DEFAULT_SERVER_DATETIME_FORMAT) or self.get_minTime(cr, uid, context).strftime(DEFAULT_SERVER_DATETIME_FORMAT)),
+                ('google_internal_event_id', '!=', False),
+            ], context=context_novirtual)
+
+            my_openerp_googleinternal_ids = att_obj.read(cr, uid, my_openerp_att_ids, ['google_internal_event_id', 'event_id'], context=context_novirtual)
+
+            if self.get_print_log(cr, uid, context=context):
+                _logger.info("Calendar Synchro -  \n\nUPDATE IN GOOGLE\n%s\n\nRETRIEVE FROM OE\n%s\n\nUPDATE IN OE\n%s\n\nRETRIEVE FROM GG\n%s\n\n" % (all_event_from_google, my_google_att_ids, my_openerp_att_ids, my_openerp_googleinternal_ids))
+
+            for giid in my_openerp_googleinternal_ids:
+                active = True  # if not sure, we request google
+                if giid.get('event_id'):
+                    active = calendar_event.browse(cr, uid, int(giid.get('event_id')[0]), context=context_novirtual).active
+
+                if giid.get('google_internal_event_id') and not all_event_from_google.get(giid.get('google_internal_event_id')) and active:
+                    one_event = self.get_one_event_synchro(cr, uid, giid.get('google_internal_event_id'), context=context)
+                    if one_event:
+                        all_event_from_google[one_event['id']] = one_event
+
+            my_att_ids = list(set(my_google_att_ids + my_openerp_att_ids))
+
+        else:
+            domain = [
+                ('partner_id', '=', myPartnerID),
+                ('google_internal_event_id', '!=', False),
+                '|',
+                ('event_id.stop', '>', self.get_minTime(cr, uid, context).strftime(DEFAULT_SERVER_DATETIME_FORMAT)),
+                ('event_id.final_date', '>', self.get_minTime(cr, uid, context).strftime(DEFAULT_SERVER_DATETIME_FORMAT)),
+            ]
+
+            # Select all events from OpenERP which have been already synchronized in gmail
+            my_att_ids = att_obj.search(cr, uid, domain, context=context_novirtual)
+            all_event_from_google = self.get_event_synchro_dict(cr, uid, lastSync=False, context=context)
 
-        # Select all events from OpenERP which have been already synchronized in gmail
-        my_att_ids = att_obj.search(cr, uid, [('partner_id', '=', myPartnerID),
-                                    ('google_internal_event_id', '!=', False),
-                                    '|',
-                                    ('event_id.date_deadline', '>', self.get_start_time_to_synchro(cr, uid, context).strftime("%Y-%m-%d %H:%M:%S")),
-                                    ('event_id.end_date', '>', self.get_start_time_to_synchro(cr, uid, context).strftime("%Y-%m-%d %H:%M:%S")),
-                                    ], context=context_novirtual)
         event_to_synchronize = {}
         for att in att_obj.browse(cr, uid, my_att_ids, context=context):
             event = att.event_id
@@ -576,8 +745,10 @@ class google_calendar(osv.AbstractModel):
         ######################
         for base_event in event_to_synchronize:
             for current_event in event_to_synchronize[base_event]:
-                event_to_synchronize[base_event][current_event].compute_OP()
-            #print event_to_synchronize[base_event]
+                event_to_synchronize[base_event][current_event].compute_OP(modeFull=not lastSync)
+            if self.get_print_log(cr, uid, context=context):
+                if not isinstance(event_to_synchronize[base_event][current_event].OP, NothingToDo):
+                    _logger.info(event_to_synchronize[base_event])
 
         ######################
         #      DO ACTION     #
@@ -615,24 +786,35 @@ class google_calendar(osv.AbstractModel):
                     if actSrc == 'OE':
                         self.delete_an_event(cr, uid, current_event[0], context=context)
                     elif actSrc == 'GG':
-                            new_google_event_id = event.GG.event['id'].split('_')[1]
-                            if 'T' in new_google_event_id:
-                                new_google_event_id = new_google_event_id.replace('T', '')[:-1]
-                            else:
-                                new_google_event_id = new_google_event_id + "000000"
+                        new_google_event_id = event.GG.event['id'].split('_')[1]
+                        if 'T' in new_google_event_id:
+                            new_google_event_id = new_google_event_id.replace('T', '')[:-1]
+                        else:
+                            new_google_event_id = new_google_event_id + "000000"
 
-                                if event.GG.status:
-                                    parent_event = {}
-                                    parent_event['id'] = "%s-%s" % (event_to_synchronize[base_event][0][1].OE.event_id, new_google_event_id)
-                                    res = self.update_from_google(cr, uid, parent_event, event.GG.event, "copy", context)
-                                else:
-                                    if event_to_synchronize[base_event][0][1].OE.event_id:
-                                        parent_oe_id = event_to_synchronize[base_event][0][1].OE.event_id
-                                        calendar_event.unlink(cr, uid, "%s-%s" % (parent_oe_id, new_google_event_id), can_be_deleted=True, context=context)
+                        if event.GG.status:
+                            parent_event = {}
+                            if not event_to_synchronize[base_event][0][1].OE.event_id:
+                                event_to_synchronize[base_event][0][1].OE.event_id = att_obj.search_read(cr, uid, [('google_internal_event_id', '=', event.GG.event['id'].split('_')[0])], ['event_id'], context=context_novirtual)[0].get('event_id')[0]
+
+                            parent_event['id'] = "%s-%s" % (event_to_synchronize[base_event][0][1].OE.event_id, new_google_event_id)
+                            res = self.update_from_google(cr, uid, parent_event, event.GG.event, "copy", context)
+                        else:
+                            parent_oe_id = event_to_synchronize[base_event][0][1].OE.event_id
+                            calendar_event.unlink(cr, uid, "%s-%s" % (parent_oe_id, new_google_event_id), can_be_deleted=True, context=context)
 
                 elif isinstance(actToDo, Delete):
                     if actSrc == 'GG':
-                        self.delete_an_event(cr, uid, current_event[0], context=context)
+                        try:
+                            self.delete_an_event(cr, uid, current_event[0], context=context)
+                        except Exception, e:
+                            error = simplejson.loads(e.read())
+                            error_nr = error.get('error', {}).get('code')
+                            # if already deleted from gmail or never created
+                            if error_nr in (404, 410,):
+                                pass
+                            else:
+                                raise e
                     elif actSrc == 'OE':
                         calendar_event.unlink(cr, uid, event.OE.event_id, can_be_deleted=False, context=context)
         return True
@@ -655,7 +837,7 @@ class google_calendar(osv.AbstractModel):
 
         url = "/calendar/v3/calendars/%s/events/%s" % ('primary', instance_id)
 
-        content = gs_pool._do_request(cr, uid, url, params, headers, type='GET', context=context)
+        st, content = gs_pool._do_request(cr, uid, url, params, headers, type='GET', context=context)
         return content.get('sequence', 0)
 #################################
 ##  MANAGE CONNEXION TO GMAIL  ##
@@ -663,13 +845,16 @@ class google_calendar(osv.AbstractModel):
 
     def get_token(self, cr, uid, context=None):
         current_user = self.pool['res.users'].browse(cr, uid, uid, context=context)
-
-        if datetime.strptime(current_user.google_calendar_token_validity.split('.')[0], "%Y-%m-%d %H:%M:%S") < (datetime.now() + timedelta(minutes=1)):
+        if not current_user.google_calendar_token_validity or \
+                datetime.strptime(current_user.google_calendar_token_validity.split('.')[0], DEFAULT_SERVER_DATETIME_FORMAT) < (datetime.now() + timedelta(minutes=1)):
             self.do_refresh_token(cr, uid, context=context)
             current_user.refresh()
-
         return current_user.google_calendar_token
 
+    def get_last_sync_date(self, cr, uid, context=None):
+        current_user = self.pool['res.users'].browse(cr, uid, uid, context=context)
+        return current_user.google_calendar_last_sync_date and datetime.strptime(current_user.google_calendar_last_sync_date, DEFAULT_SERVER_DATETIME_FORMAT) + timedelta(minutes=0) or False
+
     def do_refresh_token(self, cr, uid, context=None):
         current_user = self.pool['res.users'].browse(cr, uid, uid, context=context)
         gs_pool = self.pool['google.service']
@@ -707,14 +892,18 @@ class google_calendar(osv.AbstractModel):
         vals['google_%s_token' % self.STR_SERVICE] = all_token.get('access_token')
         self.pool['res.users'].write(cr, SUPERUSER_ID, uid, vals, context=context)
 
-    def get_start_time_to_synchro(self, cr, uid, context=None):
-        # WILL BE AN IR CONFIG PARAMETER - beginning from SAAS4
-        number_of_week = 13
+    def get_minTime(self, cr, uid, context=None):
+        number_of_week = self.pool['ir.config_parameter'].get_param(cr, uid, 'calendar.week_synchro', default=13)
         return datetime.now() - timedelta(weeks=number_of_week)
 
     def get_need_synchro_attendee(self, cr, uid, context=None):
-        # WILL BE AN IR CONFIG PARAMETER - beginning from SAAS4
-        return True
+        return self.pool['ir.config_parameter'].get_param(cr, uid, 'calendar.block_synchro_attendee', default=True)
+
+    def get_disable_since_synchro(self, cr, uid, context=None):
+        return self.pool['ir.config_parameter'].get_param(cr, uid, 'calendar.block_since_synchro', default=False)
+
+    def get_print_log(self, cr, uid, context=None):
+        return self.pool['ir.config_parameter'].get_param(cr, uid, 'calendar.debug_print', default=False)
 
 
 class res_users(osv.Model):
@@ -724,16 +913,22 @@ class res_users(osv.Model):
         'google_calendar_rtoken': fields.char('Refresh Token'),
         'google_calendar_token': fields.char('User token'),
         'google_calendar_token_validity': fields.datetime('Token Validity'),
+        'google_calendar_last_sync_date': fields.datetime('Last synchro date'),
+        'google_calendar_cal_id': fields.char('Calendar ID', help='Last Calendar ID who has been synchronized. If it is changed, we remove \
+all links between GoogleID and OpenERP Google Internal ID')
     }
 
 
 class calendar_event(osv.Model):
     _inherit = "calendar.event"
 
+    def get_fields_need_update_google(self, cr, uid, context=None):
+        return ['name', 'description', 'allday', 'date', 'date_end', 'stop', 'attendee_ids', 'location', 'class', 'active']
+
     def write(self, cr, uid, ids, vals, context=None):
         if context is None:
             context = {}
-        sync_fields = set(['name', 'description', 'date', 'date_closed', 'date_deadline', 'attendee_ids', 'location', 'class'])
+        sync_fields = set(self.get_fields_need_update_google(cr, uid, context))
         if (set(vals.keys()) & sync_fields) and 'oe_update_date' not in vals.keys() and 'NewMeeting' not in context:
             vals['oe_update_date'] = datetime.now()
 
@@ -762,7 +957,7 @@ class calendar_attendee(osv.Model):
     _inherit = 'calendar.attendee'
 
     _columns = {
-        'google_internal_event_id': fields.char('Google Calendar Event Id', size=256),
+        'google_internal_event_id': fields.char('Google Calendar Event Id'),
         'oe_synchro_date': fields.datetime('OpenERP Synchro Date'),
     }
     _sql_constraints = [('google_id_uniq', 'unique(google_internal_event_id,partner_id,event_id)', 'Google ID should be unique!')]
diff --git a/addons/google_calendar/static/src/js/calendar_sync.js b/addons/google_calendar/static/src/js/calendar_sync.js
index fdc4aeffb77..fc05ca05ab0 100644
--- a/addons/google_calendar/static/src/js/calendar_sync.js
+++ b/addons/google_calendar/static/src/js/calendar_sync.js
@@ -11,38 +11,54 @@ openerp.google_calendar = function(instance) {
             });
             return this._super(r);
         },
-        sync_calendar: function(res,button) {
+        sync_calendar: function(res, button) {
             var self = this;
             var context = instance.web.pyeval.eval('context');
             //$('div.oe_cal_sync_button').hide();
-            $('div.oe_cal_sync_button').prop('disabled',true);
-            
+            $('div.oe_cal_sync_button').prop('disabled', true);
+
             self.rpc('/google_calendar/sync_data', {
                 arch: res.arch,
                 fields: res.fields,
-                model:res.model,
+                model: res.model,
                 fromurl: window.location.href,
-                local_context:context
+                local_context: context
             }).done(function(o) {
-                if (o.status == "need_auth") {
+                if (o.status === "need_auth") {
                     alert(_t("You will be redirected on gmail to authorize your OpenErp to access your calendar !"));
                     instance.web.redirect(o.url);
                 }
-                else if (o.status == "need_config_from_admin") {
-                    
-                    if (!_.isUndefined(o.action) && parseInt(o.action)) {
-                        if (confirm(_t("An admin need to configure Google Synchronization before to use it, do you want to configure it now ? !"))) {
-                            self.do_action(o.action);                        
+                else if (o.status === "need_config_from_admin"){
+                    if (!_.isUndefined(o.action) && parseInt(o.action)){
+                        if (confirm(_t("An admin need to configure Google Synchronization before to use it, do you want to configure it now ? !"))){
+                            self.do_action(o.action);
                         }
                     }
-                    else {
+                    else{
                         alert(_t("An admin need to configure Google Synchronization before to use it !"));
                     }
                 }
-                else if (o.status == "need_refresh"){
+                else if (o.status === "need_refresh"){
                     self.$calendar.fullCalendar('refetchEvents');
                 }
+                else if (o.status === "need_reset"){
+                    if (confirm(_t("The account that you are trying to synchronize (" + o.info.new_name + "), is not the same that the last one used \
+(" + o.info.old_name + "! )" + "\r\n\r\nDo you want remove all references from the old account ?"))){
 
+                        self.rpc('/google_calendar/remove_references', {
+                            model:res.model,
+                            local_context:context
+                        }).done(function(o) {
+                            if (o.status === "OK") {
+                                alert(_t("All old references have been deleted. You can now restart the synchronization"));
+                            }
+                            else if (o.status === "KO") {
+                                alert(_t("An error has occured when we was removing all old references. Please retry or contact your administrator."));
+                            }
+                            //else NOP
+                        });
+                    }
+                }
             }).always(function(o) { $('div.oe_cal_sync_button').prop('disabled',false); });
         }
     });
diff --git a/addons/google_calendar/views/res_users.xml b/addons/google_calendar/views/res_users.xml
new file mode 100644
index 00000000000..8adc3429090
--- /dev/null
+++ b/addons/google_calendar/views/res_users.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>   
+        <record id="view_users_form" model="ir.ui.view">
+            <field name="name">res.users.form</field>
+            <field name="model">res.users</field>
+            <field name="inherit_id" ref="base.view_users_form"/>
+            <field name="arch" type="xml">
+                <notebook colspan="4" position="inside">
+                    <page string="Calendar">
+                        <group>
+                            <field name="google_calendar_rtoken"/>
+                            <field name="google_calendar_token"/>
+                            <field name="google_calendar_token_validity"/>
+                            <field name="google_calendar_last_sync_date"/>
+                            <field name="google_calendar_cal_id"/>
+                        </group>
+                    </page>
+                </notebook>
+            </field>
+        </record>
+    </data>
+</openerp>
+

From 3ff7b48a811bf04aafa70a6ce0db73122cee4bcc Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 14 May 2014 10:59:20 +0200
Subject: [PATCH 126/225] [FIX] gamification: make sure than a cron running
 more than once a day will not report the progress more than once

---
 addons/gamification/models/challenge.py | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/addons/gamification/models/challenge.py b/addons/gamification/models/challenge.py
index 8ed3890ce69..222e5cca49e 100644
--- a/addons/gamification/models/challenge.py
+++ b/addons/gamification/models/challenge.py
@@ -329,19 +329,20 @@ class gamification_challenge(osv.Model):
                 self.write(cr, uid, [challenge.id], {'user_ids': [(4, user.id) for user in challenge.autojoin_group_id.users]}, context=context)
             self.generate_goals_from_challenge(cr, uid, [challenge.id], context=context)
 
-            # goals closed but still opened at the last report date
-            closed_goals_to_report = goal_obj.search(cr, uid, [
-                ('challenge_id', '=', challenge.id),
-                ('start_date', '>=', challenge.last_report_date),
-                ('end_date', '<=', challenge.last_report_date)
-            ])
+            if challenge.last_report_date != fields.date.today():
+                # goals closed but still opened at the last report date
+                closed_goals_to_report = goal_obj.search(cr, uid, [
+                    ('challenge_id', '=', challenge.id),
+                    ('start_date', '>=', challenge.last_report_date),
+                    ('end_date', '<=', challenge.last_report_date)
+                ])
 
-            if len(closed_goals_to_report) > 0:
-                # some goals need a final report
-                self.report_progress(cr, uid, challenge, subset_goal_ids=closed_goals_to_report, context=context)
+                if fields.date.today() >= challenge.next_report_date:
+                    self.report_progress(cr, uid, challenge, context=context)
 
-            if fields.date.today() == challenge.next_report_date:
-                self.report_progress(cr, uid, challenge, context=context)
+                elif len(closed_goals_to_report) > 0:
+                    # some goals need a final report
+                    self.report_progress(cr, uid, challenge, subset_goal_ids=closed_goals_to_report, context=context)
 
         self.check_challenge_reward(cr, uid, ids, context=context)
         return True

From e6e5ac048b150624750355735b4299421f3c469f Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 14 May 2014 12:11:24 +0200
Subject: [PATCH 127/225] [FIX] broken routes for pages

---
 addons/website/controllers/main.py       | 2 +-
 addons/website_crm/controllers/main.py   | 2 +-
 addons/website_event/controllers/main.py | 2 +-
 addons/website_hr/controllers/main.py    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py
index 37d1528b653..5068d7d0e74 100644
--- a/addons/website/controllers/main.py
+++ b/addons/website/controllers/main.py
@@ -49,7 +49,7 @@ class Website(openerp.addons.web.controllers.main.Home):
         # TODO: can't we just put auth=public, ... in web client ?
         return super(Website, self).web_login(*args, **kw)
 
-    @http.route('/page/<page:page>', type='http', auth="public", website=True, multilang=True)
+    @http.route('/page/<path:page>', type='http', auth="public", website=True, multilang=True)
     def page(self, page, **opt):
         values = {
             'path': page,
diff --git a/addons/website_crm/controllers/main.py b/addons/website_crm/controllers/main.py
index e3662ef40a0..e7dc2e781f7 100644
--- a/addons/website_crm/controllers/main.py
+++ b/addons/website_crm/controllers/main.py
@@ -16,7 +16,7 @@ class contactus(http.Controller):
         )
         return url
 
-    @http.route(['/page/website.contactus'], type='http', auth="public", website=True, multilang=True)
+    @http.route(['/page/website.contactus', '/page/contactus'], type='http', auth="public", website=True, multilang=True)
     def contact(self, **kwargs):
         values = {}
         for field in ['description', 'partner_name', 'phone', 'contact_name', 'email_from', 'name']:
diff --git a/addons/website_event/controllers/main.py b/addons/website_event/controllers/main.py
index a3df520adec..3e0a0729d92 100644
--- a/addons/website_event/controllers/main.py
+++ b/addons/website_event/controllers/main.py
@@ -169,7 +169,7 @@ class website_event(http.Controller):
 
         return request.website.render("website_event.index", values)
 
-    @http.route(['/event/<model("event.event"):event>/page/<page:path>'], type='http', auth="public", website=True, multilang=True)
+    @http.route(['/event/<model("event.event"):event>/page/<path:page>'], type='http', auth="public", website=True, multilang=True)
     def event_page(self, event, page, **post):
         values = {
             'event': event,
diff --git a/addons/website_hr/controllers/main.py b/addons/website_hr/controllers/main.py
index 20c865b5b89..d48dde301d7 100644
--- a/addons/website_hr/controllers/main.py
+++ b/addons/website_hr/controllers/main.py
@@ -5,7 +5,7 @@ from openerp.addons.web.http import request
 
 class website_hr(http.Controller):
 
-    @http.route(['/page/website.aboutus'], type='http', auth="public", website=True, multilang=True)
+    @http.route(['/page/website.aboutus', '/page/aboutus'], type='http', auth="public", website=True, multilang=True)
     def blog(self, **post):
         hr_obj = request.registry['hr.employee']
         employee_ids = hr_obj.search(request.cr, request.uid, [('website_published', '=', True)],

From 8e3a8bb0feaec9e48bb597caaeda1120d346ce94 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 14 May 2014 13:44:14 +0200
Subject: [PATCH 128/225] [FIX] google maps controller should be for POST only

---
 addons/website_google_map/controllers/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_google_map/controllers/main.py b/addons/website_google_map/controllers/main.py
index 01a0cc3b85e..9de241a00fd 100644
--- a/addons/website_google_map/controllers/main.py
+++ b/addons/website_google_map/controllers/main.py
@@ -28,7 +28,7 @@ class google_map(http.Controller):
         return partner_obj.google_map_json(request.cr, openerp.SUPERUSER_ID,
                                            partner_ids, request.context)
 
-    @http.route(['/google_map/set_partner_position'], type='http', auth="public", website=True)
+    @http.route(['/google_map/set_partner_position'], type='http', methods=['POST'], auth="public", website=True)
     def google_map_set_partner_position(self, *arg, **post):
         partner_obj = request.registry['res.partner']
 

From 1ce14dbe6af78956b4f158e0cdc3b49a211ad104 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 14 May 2014 13:58:34 +0200
Subject: [PATCH 129/225] [FIX] survey route that is only accessed with POST
 verb

---
 addons/survey/controllers/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/survey/controllers/main.py b/addons/survey/controllers/main.py
index 0e708d96f43..2f65d92cd4c 100644
--- a/addons/survey/controllers/main.py
+++ b/addons/survey/controllers/main.py
@@ -234,7 +234,7 @@ class WebsiteSurvey(http.Controller):
 
     # AJAX submission of a page
     @http.route(['/survey/submit/<model("survey.survey"):survey>'],
-                type='http', auth='public', multilang=True, website=True)
+                type='http', methods=['POST'], auth='public', multilang=True, website=True)
     def submit(self, survey, **post):
         _logger.debug('Incoming data: %s', post)
         page_id = int(post['page_id'])

From a5311e690000d371e886a30ea1557d24ee0186b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 14 May 2014 14:30:26 +0200
Subject: [PATCH 130/225] [MOV] crm: moved css / js related to salesteam to
 sales_team module; sale_crm: moved data and demo data into sale and
 sales_team module.

---
 addons/crm/__openerp__.py                     |   1 -
 addons/crm/static/src/css/Makefile            |   2 -
 addons/crm/static/src/css/crm.css             |  62 ---------
 addons/crm/views/crm.xml                      |  13 --
 addons/sale/sale_data.xml                     |  18 ++-
 addons/sale/sale_demo.xml                     | 103 ++++++++++++++
 addons/sale_crm/__openerp__.py                |   3 +-
 addons/sale_crm/sale_crm_data.xml             |  22 ---
 addons/sale_crm/sale_crm_demo.xml             | 130 ------------------
 addons/sales_team/sales_team.xml              |  12 +-
 addons/sales_team/static/src/css/Makefile     |   2 +
 .../static/src/css/sales_team.sass}           |   0
 .../static/src/js/sales_team.js}              |   0
 13 files changed, 134 insertions(+), 234 deletions(-)
 delete mode 100644 addons/crm/static/src/css/Makefile
 delete mode 100644 addons/crm/static/src/css/crm.css
 delete mode 100644 addons/crm/views/crm.xml
 delete mode 100644 addons/sale_crm/sale_crm_data.xml
 delete mode 100644 addons/sale_crm/sale_crm_demo.xml
 create mode 100644 addons/sales_team/static/src/css/Makefile
 rename addons/{crm/static/src/css/crm.sass => sales_team/static/src/css/sales_team.sass} (100%)
 rename addons/{crm/static/src/js/crm_case_section.js => sales_team/static/src/js/sales_team.js} (100%)

diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 1bf4c611be6..15544dc3dff 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -92,7 +92,6 @@ Dashboard for CRM will include:
         'base_partner_merge_view.xml',
 
         'sales_team_view.xml',
-        'views/crm.xml',
     ],
     'demo': [
         'crm_demo.xml',
diff --git a/addons/crm/static/src/css/Makefile b/addons/crm/static/src/css/Makefile
deleted file mode 100644
index a2ced24a13d..00000000000
--- a/addons/crm/static/src/css/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-crm.css: crm.sass
-    sass --trace -t expanded crm.sass:crm.css
diff --git a/addons/crm/static/src/css/crm.css b/addons/crm/static/src/css/crm.css
deleted file mode 100644
index 8999f758e41..00000000000
--- a/addons/crm/static/src/css/crm.css
+++ /dev/null
@@ -1,62 +0,0 @@
-@charset "utf-8";
-.openerp .oe_kanban_view .oe_kanban_crm_salesteams {
-  /* Customize width and height of kanban according bootstrap3 */
-  width: 357px;
-  min-height: 254px !important;
-  /* End of customize */
-  cursor: default;
-}
-.openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_items_list {
-  position: relative;
-  /* Improved margin to set alignment of list items according bootstrap3 */
-  margin: 10px 0 10px 9px;
-  min-height: 10px;
-}
-.openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_items_list div {
-  width: 160px;
-  height: 22px;
-  margin: 0 !important;
-  position: relative;
-  display: inline-block;
-  float: left;
-}
-.openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_items_list div a:nth-child(2n) {
-  position: absolute;
-  left: 90px;
-  top: 0;
-}
-.openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_items_list div:nth-child(2n) a:nth-child(2n) {
-  left: 110px;
-}
-.openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_items_list a:hover {
-  text-decoration: underline !important;
-}
-.openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_center {
-  text-align: center;
-  margin: 3px 0;
-}
-.openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_center .oe_sum {
-  margin: 0;
-  font-size: 40px;
-}
-.openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_center .oe_subsum {
-  font-size: 10px;
-}
-.openerp .oe_kanban_view .oe_salesteams_help {
-  display: inline-block;
-}
-.openerp .oe_kanban_view .oe_kanban_salesteams_avatars {
-  margin-top: 20px;
-}
-.openerp .oe_kanban_view .oe_kanban_salesteams_avatars img {
-  width: 30px;
-  height: 30px;
-  padding-left: 0px;
-  margin-top: 3px;
-  -moz-border-radius: 2px;
-  -webkit-border-radius: 2px;
-  border-radius: 2px;
-  -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
-  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
-  -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
-}
diff --git a/addons/crm/views/crm.xml b/addons/crm/views/crm.xml
deleted file mode 100644
index c28ba723d24..00000000000
--- a/addons/crm/views/crm.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- vim:fdn=3:
--->
-<openerp>
-    <data>
-        <template id="assets_backend" name="crm assets" inherit_id="web.assets_backend">
-            <xpath expr="." position="inside">
-                <link rel="stylesheet" href="/crm/static/src/css/crm.css"/>
-                <script type="text/javascript" src="/crm/static/src/js/crm_case_section.js"></script>
-            </xpath>
-        </template>
-    </data>
-</openerp>
diff --git a/addons/sale/sale_data.xml b/addons/sale/sale_data.xml
index 443895631a9..4c5347cf1d0 100644
--- a/addons/sale/sale_data.xml
+++ b/addons/sale/sale_data.xml
@@ -29,7 +29,7 @@
             <field name="body"><![CDATA[<p>This application lets you create and send quotations and process your sales orders; from delivery to invoicing.</p>
 <p>If you need to manage your sales pipeline (leads, opportunities, phonecalls), the <i>CRM</i> application may be useful. Use the Settings menu to install it.</p>]]></field>
         </record>
-        
+
         <!-- Sale-related subtypes for messaging / Chatter -->
         <record id="mt_order_sent" model="mail.message.subtype">
             <field name="name">Quotation sent</field>
@@ -44,5 +44,21 @@
             <field name="description">Quotation confirmed</field>
         </record>
 
+        <!-- Salesteam-related subtypes for messaging / Chatter -->
+        <record id="mt_salesteam_order_sent" model="mail.message.subtype">
+            <field name="name">Quotation Send</field>
+            <field name="sequence">20</field>
+            <field name="res_model">crm.case.section</field>
+            <field name="parent_id" eval="ref('sale.mt_order_sent')"/>
+            <field name="relation_field">section_id</field>
+        </record>
+        <record id="mt_salesteam_order_confirmed" model="mail.message.subtype">
+            <field name="name">Sales Order Confirmed</field>
+            <field name="sequence">21</field>
+            <field name="res_model">crm.case.section</field>
+            <field name="parent_id" eval="ref('sale.mt_order_confirmed')"/>
+            <field name="relation_field">section_id</field>
+        </record>
+
     </data>
 </openerp>
diff --git a/addons/sale/sale_demo.xml b/addons/sale/sale_demo.xml
index 2e0019598f7..bcb69f9a7a3 100644
--- a/addons/sale/sale_demo.xml
+++ b/addons/sale/sale_demo.xml
@@ -2,12 +2,24 @@
 <openerp>
     <data noupdate="1">
 
+        <record model="crm.case.section" id="sales_team.section_sales_department">
+            <field name="invoiced_forecast">52700</field>
+            <field name="invoiced_target">60000</field>
+        </record>
+        
+        <record model="crm.case.section" id="sales_team.crm_case_section_1">
+            <field name="invoiced_forecast">36000</field>
+            <field name="invoiced_target">40000</field>
+        </record>
+
         <record id="sale_order_1" model="sale.order">
             <field name="partner_id" ref="base.res_partner_2"/>
             <field name="partner_invoice_id" ref="base.res_partner_2"/>
             <field name="partner_shipping_id" ref="base.res_partner_2"/>
             <field name="user_id" ref="base.user_demo"/>
             <field name="pricelist_id" ref="product.list0"/>
+            <field name="section_id" ref="sales_team.section_sales_department"/>
+            <field name="date_order" eval="(DateTime.today() - relativedelta(months=1)).strftime('%Y-%m-%d %H:%M')"/>
         </record>
 
         <record id="sale_order_line_1" model="sale.order.line">
@@ -47,6 +59,8 @@
             <field name="user_id" ref="base.user_root"/>
             <field name="pricelist_id" ref="product.list0"/>
             <field name="order_policy">manual</field>
+            <field name="section_id" ref="sales_team.section_sales_department"/>
+            <field name="date_order" eval="(DateTime.today() - relativedelta(months=1)).strftime('%Y-%m-%d %H:%M')"/>
         </record>
 
         <record id="sale_order_line_4" model="sale.order.line">
@@ -76,6 +90,7 @@
             <field name="user_id" ref="base.user_root"/>
             <field name="pricelist_id" ref="product.list0"/>
             <field name="order_policy">manual</field>
+            <field name="section_id" ref="sales_team.section_sales_department"/>
         </record>
 
         <record id="sale_order_line_6" model="sale.order.line">
@@ -104,6 +119,7 @@
             <field name="partner_shipping_id" ref="base.res_partner_address_25"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="pricelist_id" ref="product.list0"/>
+            <field name="section_id" ref="sales_team.section_sales_department"/>
         </record>
 
         <record id="sale_order_line_8" model="sale.order.line">
@@ -152,6 +168,8 @@
             <field name="partner_shipping_id" ref="base.res_partner_2"/>
             <field name="user_id" ref="base.user_demo"/>
             <field name="pricelist_id" ref="product.list0"/>
+            <field name="section_id" ref="sales_team.crm_case_section_1"/>
+            <field name="date_order" eval="(DateTime.today() - relativedelta(months=1)).strftime('%Y-%m-%d %H:%M')"/>
         </record>
 
         <record id="sale_order_line_12" model="sale.order.line">
@@ -190,6 +208,7 @@
             <field name="partner_shipping_id" ref="base.res_partner_18"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="pricelist_id" ref="product.list0"/>
+            <field name="section_id" ref="sales_team.crm_case_section_1"/>
         </record>
 
         <record id="sale_order_line_15" model="sale.order.line">
@@ -209,6 +228,8 @@
             <field name="user_id" ref="base.user_root"/>
             <field name="pricelist_id" ref="product.list0"/>
             <field name="order_policy">manual</field>
+            <field name="section_id" ref="sales_team.section_sales_department"/>
+            <field name="date_confirm" eval="(DateTime.today() - relativedelta(months=1)).strftime('%Y-%m-%d %H:%M')"/>
         </record>
 
         <record id="sale_order_line_16" model="sale.order.line">
@@ -259,6 +280,7 @@
             <field name="user_id" ref="base.user_demo"/>
             <field name="pricelist_id" ref="product.list0"/>
             <field name="order_policy">manual</field>
+            <field name="section_id" ref="sales_team.crm_case_section_1"/>
         </record>
 
         <record id="sale_order_line_20" model="sale.order.line">
@@ -335,5 +357,86 @@ Thanks!</field>
             <field eval="[(4, ref('base.group_sale_salesman'))]" name="groups_id"/>
         </record>
 
+        <!-- coming from sale_crm -->
+        <record id="test_crm_sale_invoice_1" model="account.invoice">
+            <field name="currency_id" ref="base.EUR"/>
+            <field name="company_id" ref="base.main_company"/>
+            <field name="partner_id" ref="base.res_partner_1"/>
+            <field name="journal_id" ref="account.sales_journal"/>
+            <field name="section_id" ref="sales_team.section_sales_department"/>
+            <field name="state">draft</field>
+            <field name="type">in_invoice</field>
+            <field name="account_id" ref="account.a_recv"/>
+            <field name="name">Test invoice 1</field>
+        </record>
+        <record id="test_crm_sale_invoice_1_line_1" model="account.invoice.line">
+            <field name="name">Basic computer with Dvorak keyboard and left-handed mouse</field>
+            <field name="invoice_id" ref="test_crm_sale_invoice_1"/>
+            <field name="price_unit">250</field>
+            <field name="quantity">1</field>
+            <field name="account_id" ref="account.a_sale"/>
+        </record>
+        <record id="test_crm_sale_invoice_1_line_2" model="account.invoice.line">
+            <field name="name">Little server with raid 1 and 512ECC ram</field>
+            <field name="invoice_id" ref="test_crm_sale_invoice_1"/>
+            <field name="price_unit">800</field>
+            <field name="quantity">2</field>
+            <field name="account_id" ref="account.a_sale"/>
+        </record>
+        <record id="test_crm_sale_invoice_1_line_2" model="account.invoice.line">
+            <field name="name">Server with raid 10 and 2048ECC ram</field>
+            <field name="invoice_id" ref="test_crm_sale_invoice_1"/>
+            <field name="price_unit">4800</field>
+            <field name="quantity">4</field>
+            <field name="account_id" ref="account.a_sale"/>
+        </record>
+        <workflow action="invoice_open" model="account.invoice" ref="test_crm_sale_invoice_1"/>
+        <function model="account.invoice" name="pay_and_reconcile">
+            <!-- ids = -->                    <value eval="[ref('test_crm_sale_invoice_1')]"/>
+            <!-- pay_amount = -->            <value eval="1850"/>
+            <!-- pay_account_id = -->        <value eval="ref('account.cash')"/>
+            <!-- period_id = -->            <value eval="ref('account.period_' + str(int(time.strftime('%m'))))"/>
+            <!-- pay_journal_id = -->        <value eval="ref('account.bank_journal')"/>
+            <!-- writeoff_acc_id = -->        <value eval="ref('account.cash')"/>
+            <!-- writeoff_period_id = -->    <value eval="ref('account.period_' + str(int(time.strftime('%m'))))"/>
+            <!-- writeoff_journal_id = -->    <value eval="ref('account.bank_journal')"/>
+            <!-- context = -->              <value eval="{}"/>
+            <!-- name = -->                 <value eval="str('Payment from ASUStek')"/>
+        </function>
+
+        <!-- Invoice for Indirect Marketing -->
+
+        <record id="test_crm_sale_invoice_2" model="account.invoice">
+            <field name="currency_id" ref="base.EUR"/>
+            <field name="company_id" ref="base.main_company"/>
+            <field name="partner_id" ref="base.res_partner_1"/>
+            <field name="journal_id" ref="account.sales_journal"/>
+            <field name="section_id" ref="sales_team.crm_case_section_1"/>
+            <field name="state">draft</field>
+            <field name="type">out_invoice</field>
+            <field name="account_id" ref="account.a_recv"/>
+            <field name="name">Test invoice 1</field>
+        </record>
+        <record id="test_crm_sale_invoice_2_line_1" model="account.invoice.line">
+            <field name="name">Basic formation with Dvorak</field>
+            <field name="invoice_id" ref="test_crm_sale_invoice_2"/>
+            <field name="price_unit">500</field>
+            <field name="quantity">1</field>
+            <field name="account_id" ref="account.a_sale"/>
+        </record>
+        <workflow action="invoice_open" model="account.invoice" ref="test_crm_sale_invoice_2"/>
+        <function model="account.invoice" name="pay_and_reconcile">
+            <!-- ids = -->                    <value eval="[ref('test_crm_sale_invoice_2')]"/>
+            <!-- pay_amount = -->            <value eval="500"/>
+            <!-- pay_account_id = -->        <value eval="ref('account.cash')"/>
+            <!-- period_id = -->            <value eval="ref('account.period_' + str(int(time.strftime('%m'))))"/>
+            <!-- pay_journal_id = -->        <value eval="ref('account.bank_journal')"/>
+            <!-- writeoff_acc_id = -->        <value eval="ref('account.cash')"/>
+            <!-- writeoff_period_id = -->    <value eval="ref('account.period_' + str(int(time.strftime('%m'))))"/>
+            <!-- writeoff_journal_id = -->    <value eval="ref('account.bank_journal')"/>
+            <!-- context = -->              <value eval="{}"/>
+            <!-- name = -->                 <value eval="str('Payment from ASUStek')"/>
+        </function>
+
     </data>
 </openerp>
diff --git a/addons/sale_crm/__openerp__.py b/addons/sale_crm/__openerp__.py
index 37059458acd..251c4746a86 100644
--- a/addons/sale_crm/__openerp__.py
+++ b/addons/sale_crm/__openerp__.py
@@ -41,11 +41,10 @@ modules.
     'data': [
         'wizard/crm_make_sale_view.xml',
         'sale_crm_view.xml',
-        'sale_crm_data.xml',
         'security/sale_crm_security.xml',
         'security/ir.model.access.csv',
     ],
-    'demo': ['sale_crm_demo.xml'],
+    'demo': [],
     'test': ['test/sale_crm.yml'],
     'installable': True,
     'auto_install': True,
diff --git a/addons/sale_crm/sale_crm_data.xml b/addons/sale_crm/sale_crm_data.xml
deleted file mode 100644
index 1996f367202..00000000000
--- a/addons/sale_crm/sale_crm_data.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data noupdate="1">
-
-        <!-- Salesteam-related subtypes for messaging / Chatter -->
-        <record id="mt_salesteam_order_sent" model="mail.message.subtype">
-            <field name="name">Quotation Send</field>
-            <field name="sequence">20</field>
-            <field name="res_model">crm.case.section</field>
-            <field name="parent_id" eval="ref('sale.mt_order_sent')"/>
-            <field name="relation_field">section_id</field>
-        </record>
-        <record id="mt_salesteam_order_confirmed" model="mail.message.subtype">
-            <field name="name">Sales Order Confirmed</field>
-            <field name="sequence">21</field>
-            <field name="res_model">crm.case.section</field>
-            <field name="parent_id" eval="ref('sale.mt_order_confirmed')"/>
-            <field name="relation_field">section_id</field>
-        </record>
-
-    </data>
-</openerp>
diff --git a/addons/sale_crm/sale_crm_demo.xml b/addons/sale_crm/sale_crm_demo.xml
deleted file mode 100644
index 4af287b0587..00000000000
--- a/addons/sale_crm/sale_crm_demo.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <record model="crm.case.section" id="sales_team.section_sales_department">
-            <field name="invoiced_forecast">52700</field>
-            <field name="invoiced_target">60000</field>
-        </record>
-        
-        <record model="crm.case.section" id="sales_team.crm_case_section_1">
-            <field name="name">Indirect Sales</field>
-            <field name="code">IM</field>
-            <field name="invoiced_forecast">36000</field>
-            <field name="invoiced_target">40000</field>
-        </record>
-
-        <!-- Invoice for Direct Marketing -->
-
-        <record id="test_crm_sale_invoice_1" model="account.invoice">
-            <field name="currency_id" ref="base.EUR"/>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="partner_id" ref="base.res_partner_1"/>
-            <field name="journal_id" ref="account.sales_journal"/>
-            <field name="section_id" ref="sales_team.section_sales_department"/>
-            <field name="state">draft</field>
-            <field name="type">in_invoice</field>
-            <field name="account_id" ref="account.a_recv"/>
-            <field name="name">Test invoice 1</field>
-        </record>
-        <record id="test_crm_sale_invoice_1_line_1" model="account.invoice.line">
-            <field name="name">Basic computer with Dvorak keyboard and left-handed mouse</field>
-            <field name="invoice_id" ref="test_crm_sale_invoice_1"/>
-            <field name="price_unit">250</field>
-            <field name="quantity">1</field>
-            <field name="account_id" ref="account.a_sale"/>
-        </record>
-        <record id="test_crm_sale_invoice_1_line_2" model="account.invoice.line">
-            <field name="name">Little server with raid 1 and 512ECC ram</field>
-            <field name="invoice_id" ref="test_crm_sale_invoice_1"/>
-            <field name="price_unit">800</field>
-            <field name="quantity">2</field>
-            <field name="account_id" ref="account.a_sale"/>
-        </record>
-        <record id="test_crm_sale_invoice_1_line_2" model="account.invoice.line">
-            <field name="name">Server with raid 10 and 2048ECC ram</field>
-            <field name="invoice_id" ref="test_crm_sale_invoice_1"/>
-            <field name="price_unit">4800</field>
-            <field name="quantity">4</field>
-            <field name="account_id" ref="account.a_sale"/>
-        </record>
-        <workflow action="invoice_open" model="account.invoice" ref="test_crm_sale_invoice_1"/>
-        <function model="account.invoice" name="pay_and_reconcile">
-            <!-- ids = -->                    <value eval="[ref('test_crm_sale_invoice_1')]"/>
-            <!-- pay_amount = -->            <value eval="1850"/>
-            <!-- pay_account_id = -->        <value eval="ref('account.cash')"/>
-            <!-- period_id = -->            <value eval="ref('account.period_' + str(int(time.strftime('%m'))))"/>
-            <!-- pay_journal_id = -->        <value eval="ref('account.bank_journal')"/>
-            <!-- writeoff_acc_id = -->        <value eval="ref('account.cash')"/>
-            <!-- writeoff_period_id = -->    <value eval="ref('account.period_' + str(int(time.strftime('%m'))))"/>
-            <!-- writeoff_journal_id = -->    <value eval="ref('account.bank_journal')"/>
-            <!-- context = -->              <value eval="{}"/>
-            <!-- name = -->                 <value eval="str('Payment from ASUStek')"/>
-        </function>
-
-        <!-- Invoice for Indirect Marketing -->
-
-        <record id="test_crm_sale_invoice_2" model="account.invoice">
-            <field name="currency_id" ref="base.EUR"/>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="partner_id" ref="base.res_partner_1"/>
-            <field name="journal_id" ref="account.sales_journal"/>
-            <field name="section_id" ref="sales_team.crm_case_section_1"/>
-            <field name="state">draft</field>
-            <field name="type">out_invoice</field>
-            <field name="account_id" ref="account.a_recv"/>
-            <field name="name">Test invoice 1</field>
-        </record>
-        <record id="test_crm_sale_invoice_2_line_1" model="account.invoice.line">
-            <field name="name">Basic formation with Dvorak</field>
-            <field name="invoice_id" ref="test_crm_sale_invoice_2"/>
-            <field name="price_unit">500</field>
-            <field name="quantity">1</field>
-            <field name="account_id" ref="account.a_sale"/>
-        </record>
-        <workflow action="invoice_open" model="account.invoice" ref="test_crm_sale_invoice_2"/>
-        <function model="account.invoice" name="pay_and_reconcile">
-            <!-- ids = -->                    <value eval="[ref('test_crm_sale_invoice_2')]"/>
-            <!-- pay_amount = -->            <value eval="500"/>
-            <!-- pay_account_id = -->        <value eval="ref('account.cash')"/>
-            <!-- period_id = -->            <value eval="ref('account.period_' + str(int(time.strftime('%m'))))"/>
-            <!-- pay_journal_id = -->        <value eval="ref('account.bank_journal')"/>
-            <!-- writeoff_acc_id = -->        <value eval="ref('account.cash')"/>
-            <!-- writeoff_period_id = -->    <value eval="ref('account.period_' + str(int(time.strftime('%m'))))"/>
-            <!-- writeoff_journal_id = -->    <value eval="ref('account.bank_journal')"/>
-            <!-- context = -->              <value eval="{}"/>
-            <!-- name = -->                 <value eval="str('Payment from ASUStek')"/>
-        </function>
-
-
-        <record id="sale.sale_order_1" model="sale.order">
-            <field name="section_id" ref="sales_team.section_sales_department"/>
-            <field name="date_order" eval="(DateTime.today() - relativedelta(months=1)).strftime('%Y-%m-%d %H:%M')"/>
-        </record>
-        <record id="sale.sale_order_2" model="sale.order">
-            <field name="section_id" ref="sales_team.section_sales_department"/>
-            <field name="date_order" eval="(DateTime.today() - relativedelta(months=1)).strftime('%Y-%m-%d %H:%M')"/>
-        </record>
-        <record id="sale.sale_order_3" model="sale.order">
-            <field name="section_id" ref="sales_team.section_sales_department"/>
-        </record>
-        <record id="sale.sale_order_4" model="sale.order">
-            <field name="section_id" ref="sales_team.section_sales_department"/>
-        </record>
-        <record id="sale.sale_order_5" model="sale.order">
-            <field name="section_id" ref="sales_team.crm_case_section_1"/>
-            <field name="date_order" eval="(DateTime.today() - relativedelta(months=1)).strftime('%Y-%m-%d %H:%M')"/>
-        </record>
-        <record id="sale.sale_order_6" model="sale.order">
-            <field name="section_id" ref="sales_team.crm_case_section_1"/>
-        </record>
-        <record id="sale.sale_order_7" model="sale.order">
-            <field name="section_id" ref="sales_team.section_sales_department"/>
-            <field name="date_confirm" eval="(DateTime.today() - relativedelta(months=1)).strftime('%Y-%m-%d %H:%M')"/>
-        </record>
-        <record id="sale.sale_order_8" model="sale.order">
-            <field name="section_id" ref="sales_team.crm_case_section_1"/>
-        </record>
-
-    </data>
-</openerp>
diff --git a/addons/sales_team/sales_team.xml b/addons/sales_team/sales_team.xml
index 95fcb6f3078..67907c38c7e 100644
--- a/addons/sales_team/sales_team.xml
+++ b/addons/sales_team/sales_team.xml
@@ -195,6 +195,16 @@
                 </p>
             </field>
         </record>
-    <menuitem id="sales_team.menu_sales_team_act" action="crm_case_section_salesteams_act" sequence="1" parent="base.menu_sales" groups="base.group_multi_salesteams"/>
+
+        <menuitem id="sales_team.menu_sales_team_act" action="crm_case_section_salesteams_act" sequence="1" parent="base.menu_sales" groups="base.group_multi_salesteams"/>
+
+        <!-- add css / js -->
+        <template id="assets_backend" name="sales_team assets" inherit_id="web.assets_backend">
+            <xpath expr="." position="inside">
+                <link rel="stylesheet" href="/sales_team/static/src/css/sales_team.css"/>
+                <script type="text/javascript" src="/sales_team/static/src/js/sales_team.js"></script>
+            </xpath>
+        </template>
+
     </data>
 </openerp>
diff --git a/addons/sales_team/static/src/css/Makefile b/addons/sales_team/static/src/css/Makefile
new file mode 100644
index 00000000000..523f4a1e81e
--- /dev/null
+++ b/addons/sales_team/static/src/css/Makefile
@@ -0,0 +1,2 @@
+sales_team.css: sales_team.sass
+    sass --trace -t expanded sales_team.sass:sales_team.css
diff --git a/addons/crm/static/src/css/crm.sass b/addons/sales_team/static/src/css/sales_team.sass
similarity index 100%
rename from addons/crm/static/src/css/crm.sass
rename to addons/sales_team/static/src/css/sales_team.sass
diff --git a/addons/crm/static/src/js/crm_case_section.js b/addons/sales_team/static/src/js/sales_team.js
similarity index 100%
rename from addons/crm/static/src/js/crm_case_section.js
rename to addons/sales_team/static/src/js/sales_team.js

From ce5ba45d45062f444b772deaa3828c7366f6c2fe Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 14 May 2014 15:41:38 +0200
Subject: [PATCH 131/225] [IMP] gamification: avoid fetching function field
 while we could reuse the cache system of the browse records (avoid memory
 errors when updating a large number of records)

---
 addons/gamification/models/goal.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/gamification/models/goal.py b/addons/gamification/models/goal.py
index b4a47a0d07a..904e6fafa36 100644
--- a/addons/gamification/models/goal.py
+++ b/addons/gamification/models/goal.py
@@ -349,8 +349,8 @@ class gamification_goal(osv.Model):
                 goal = all_goals[goal_id]
 
                 # check goal target reached
-                if (goal.definition_condition == 'higher' and value.get('current', goal.current) >= goal.target_goal) \
-                  or (goal.definition_condition == 'lower' and value.get('current', goal.current) <= goal.target_goal):
+                if (goal.definition_id.condition == 'higher' and value.get('current', goal.current) >= goal.target_goal) \
+                  or (goal.definition_id.condition == 'lower' and value.get('current', goal.current) <= goal.target_goal):
                     value['state'] = 'reached'
 
                 # check goal failure

From a20ccfc7d4328642a50bd8eaab297b7f0f809bbe Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 14 May 2014 15:48:51 +0200
Subject: [PATCH 132/225] [FIX] lazy sitemap with generators

---
 addons/website/controllers/main.py         | 23 ++++++++++++++--------
 addons/website/views/website_templates.xml |  3 ++-
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py
index 5068d7d0e74..c064fdcbcd9 100644
--- a/addons/website/controllers/main.py
+++ b/addons/website/controllers/main.py
@@ -4,6 +4,7 @@ import contextlib
 import hashlib
 import json
 import logging
+import math
 import os
 import datetime
 import re
@@ -75,12 +76,14 @@ class Website(openerp.addons.web.controllers.main.Home):
 
     @http.route('/sitemap.xml', type='http', auth="public", website=True)
     def sitemap_xml_index(self):
-        pages = list(request.website.enumerate_pages())
-        if len(pages)<=LOC_PER_SITEMAP:
-            return self.__sitemap_xml(pages, 0)
+        count = 0
+        for loc in request.website.enumerate_pages():
+            count += 1
+        if count <= LOC_PER_SITEMAP:
+            return self.__sitemap_xml(0)
         # Sitemaps must be split in several smaller files with a sitemap index
         values = {
-            'pages': range(len(pages)/LOC_PER_SITEMAP+1),
+            'pages': range(int(math.ceil(float(count) / LOC_PER_SITEMAP))),
             'url_root': request.httprequest.url_root
         }
         headers = {
@@ -90,12 +93,16 @@ class Website(openerp.addons.web.controllers.main.Home):
 
     @http.route('/sitemap-<int:page>.xml', type='http', auth="public", website=True)
     def sitemap_xml(self, page):
-        pages = list(request.website.enumerate_pages())
-        return self.__sitemap_xml(pages, page)
+        return self.__sitemap_xml(page)
 
-    def __sitemap_xml(self, pages, index=0):
+    def __sitemap_xml(self, index=0):
+        locs = request.website.enumerate_pages()
+        feed = index * LOC_PER_SITEMAP
+        for i in xrange(feed):
+            locs.next()
         values = {
-            'pages': pages[index*LOC_PER_SITEMAP:(index+1)*LOC_PER_SITEMAP],
+            'locs': locs,
+            'iter': xrange(LOC_PER_SITEMAP),
             'url_root': request.httprequest.url_root.rstrip('/')
         }
         headers = {
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index b9f33ef1c6b..d79dcbcd32a 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -699,7 +699,8 @@ Sitemap: <t t-esc="url_root"/>sitemap.xml
 
 <template id="sitemap_xml">&lt;?xml version="1.0" encoding="UTF-8"?&gt;
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
-  <url t-foreach="pages" t-as="page">
+  <url t-foreach="iter" t-as="i">
+    <t t-set="page" t-value="locs.next()"/>
     <loc><t t-esc="url_root"/><t t-esc="page['loc']"/></loc><t t-if="page.get('lastmod', False)">
     <lastmod t-esc="page['lastmod']"/></t><t t-if="page.get('priority', False)">
     <priority t-esc="page['priority']"/></t><t t-if="page.get('changefreq', False)">

From 8145c52dea43c51c3997fc5aa8740dccfaadf5d0 Mon Sep 17 00:00:00 2001
From: "Richard Mathot (OpenERP)" <rim@openerp.com>
Date: Wed, 14 May 2014 16:11:46 +0200
Subject: [PATCH 133/225] [FIX] website_blog: display blog posts in
 anti-chronological order

---
 addons/website_blog/controllers/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_blog/controllers/main.py b/addons/website_blog/controllers/main.py
index 133a95d0c8a..59914df884b 100644
--- a/addons/website_blog/controllers/main.py
+++ b/addons/website_blog/controllers/main.py
@@ -122,7 +122,7 @@ class WebsiteBlog(http.Controller):
         blog_url = QueryURL('', ['blog', 'tag'], blog=blog, tag=tag, date_begin=date_begin, date_end=date_end)
         post_url = QueryURL('', ['blogpost'], tag_id=tag and tag.id or None, date_begin=date_begin, date_end=date_end)
 
-        blog_post_ids = blog_post_obj.search(cr, uid, domain, order="create_date asc", context=context)
+        blog_post_ids = blog_post_obj.search(cr, uid, domain, order="create_date desc", context=context)
         blog_posts = blog_post_obj.browse(cr, uid, blog_post_ids, context=context)
 
         pager = request.website.pager(

From 8f2bbf73ae5943a0cd35de3f3f48482575f4fe2c Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 14 May 2014 16:15:18 +0200
Subject: [PATCH 134/225] [FIX] gamification: avoid sending reports for
 non-reported challenges

---
 addons/gamification/models/challenge.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/gamification/models/challenge.py b/addons/gamification/models/challenge.py
index 9612cf4a05e..ed6016b9665 100644
--- a/addons/gamification/models/challenge.py
+++ b/addons/gamification/models/challenge.py
@@ -324,7 +324,7 @@ class gamification_challenge(osv.Model):
                     ('end_date', '<=', challenge.last_report_date)
                 ])
 
-                if fields.date.today() >= challenge.next_report_date:
+                if challenge.next_report_date and fields.date.today() >= challenge.next_report_date:
                     self.report_progress(cr, uid, challenge, context=context)
 
                 elif len(closed_goals_to_report) > 0:

From 6130ed3ce0fbc6da5dea27ca2a005fc8d4445588 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 14 May 2014 16:32:36 +0200
Subject: [PATCH 135/225] [IMP] website: refactor website_image controller (and
 placeholder), move to model to make it reusable

It is "almost" reusable because it still depends on the global `request` variable,
this could be solved by making it an explicit parameter.
---
 addons/website/controllers/main.py |  82 +----------------------
 addons/website/models/website.py   | 100 +++++++++++++++++++++++++++++
 2 files changed, 103 insertions(+), 79 deletions(-)

diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py
index c064fdcbcd9..79e5dfb0147 100644
--- a/addons/website/controllers/main.py
+++ b/addons/website/controllers/main.py
@@ -1,18 +1,12 @@
 # -*- coding: utf-8 -*-
 import cStringIO
-import contextlib
-import hashlib
 import json
 import logging
 import math
-import os
-import datetime
 import re
 
 from sys import maxint
 
-import werkzeug
-import werkzeug.exceptions
 import werkzeug.utils
 import werkzeug.wrappers
 from PIL import Image
@@ -336,13 +330,7 @@ class Website(openerp.addons.web.controllers.main.Home):
         return request.website.kanban_col(**post)
 
     def placeholder(self, response):
-        # file_open may return a StringIO. StringIO can be closed but are
-        # not context managers in Python 2 though that is fixed in 3
-        with contextlib.closing(openerp.tools.misc.file_open(
-                os.path.join('web', 'static', 'src', 'img', 'placeholder.png'),
-                mode='rb')) as f:
-            response.data = f.read()
-            return response.make_conditional(request.httprequest)
+        return request.registry['website']._image_placeholder(response)
 
     @http.route([
         '/website/image',
@@ -366,74 +354,10 @@ class Website(openerp.addons.web.controllers.main.Home):
         The requested field is assumed to be base64-encoded image data in
         all cases.
         """
-        Model = request.registry[model]
-
         response = werkzeug.wrappers.Response()
+        return request.registry['website']._image(
+                    request.cr, request.uid, model, id, field, response)
 
-        id = int(id)
-
-        ids = Model.search(request.cr, request.uid,
-                           [('id', '=', id)], context=request.context)
-        if not ids and 'website_published' in Model._all_columns:
-            ids = Model.search(request.cr, openerp.SUPERUSER_ID,
-                               [('id', '=', id), ('website_published', '=', True)], context=request.context)
-
-        if not ids:
-            return self.placeholder(response)
-
-        presized = '%s_big' % field
-        concurrency = '__last_update'
-        [record] = Model.read(request.cr, openerp.SUPERUSER_ID, [id],
-                              [concurrency, field, presized],
-                              context=request.context)
-
-        if concurrency in record:
-            server_format = openerp.tools.misc.DEFAULT_SERVER_DATETIME_FORMAT
-            try:
-                response.last_modified = datetime.datetime.strptime(
-                    record[concurrency], server_format + '.%f')
-            except ValueError:
-                # just in case we have a timestamp without microseconds
-                response.last_modified = datetime.datetime.strptime(
-                    record[concurrency], server_format)
-
-        # Field does not exist on model or field set to False
-        if not record.get(field):
-            # FIXME: maybe a field which does not exist should be a 404?
-            return self.placeholder(response)
-
-        response.set_etag(hashlib.sha1(record[field]).hexdigest())
-        response.make_conditional(request.httprequest)
-
-        # conditional request match
-        if response.status_code == 304:
-            return response
-
-        data = (record.get(presized) or record[field]).decode('base64')
-
-        image = Image.open(cStringIO.StringIO(data))
-        response.mimetype = Image.MIME[image.format]
-
-        # record provides a pre-resized version of the base field, use that
-        # directly
-        if record.get(presized):
-            response.data = data
-            return response
-
-        fit = int(max_width), int(max_height)
-        w, h = image.size
-        max_w, max_h = fit
-
-        if w < max_w and h < max_h:
-            response.data = data
-        else:
-            image.thumbnail(fit, Image.ANTIALIAS)
-            image.save(response.stream, image.format)
-            # invalidate content-length computed by make_conditional as
-            # writing to response.stream does not do it (as of werkzeug 0.9.3)
-            del response.headers['Content-Length']
-
-        return response
 
     #------------------------------------------------------
     # Server actions
diff --git a/addons/website/models/website.py b/addons/website/models/website.py
index 584dc4b6105..e0aac6dbbbf 100644
--- a/addons/website/models/website.py
+++ b/addons/website/models/website.py
@@ -1,13 +1,20 @@
 # -*- coding: utf-8 -*-
+import cStringIO
+import contextlib
+import datetime
 import hashlib
 import inspect
 import itertools
 import logging
 import math
 import mimetypes
+import os
 import re
 import urlparse
 
+from PIL import Image
+from sys import maxint
+
 import werkzeug
 import werkzeug.exceptions
 import werkzeug.utils
@@ -472,6 +479,99 @@ class website(osv.osv):
             html += request.website._render(template, {'object_id': object_id})
         return html
 
+    def _image_placeholder(self, response):
+        # file_open may return a StringIO. StringIO can be closed but are
+        # not context managers in Python 2 though that is fixed in 3
+        with contextlib.closing(openerp.tools.misc.file_open(
+                os.path.join('web', 'static', 'src', 'img', 'placeholder.png'),
+                mode='rb')) as f:
+            response.data = f.read()
+            return response.make_conditional(request.httprequest)
+
+    def _image(self, cr, uid, model, id, field, response, max_width=maxint, max_height=maxint, context=None):
+        """ Fetches the requested field and ensures it does not go above
+        (max_width, max_height), resizing it if necessary.
+
+        Resizing is bypassed if the object provides a $field_big, which will
+        be interpreted as a pre-resized version of the base field.
+
+        If the record is not found or does not have the requested field,
+        returns a placeholder image via :meth:`~._image_placeholder`.
+
+        Sets and checks conditional response parameters:
+        * :mailheader:`ETag` is always set (and checked)
+        * :mailheader:`Last-Modified is set iif the record has a concurrency
+          field (``__last_update``)
+
+        The requested field is assumed to be base64-encoded image data in
+        all cases.
+        """
+        Model = self.pool[model]
+        id = int(id)
+
+        ids = Model.search(cr, uid,
+                           [('id', '=', id)], context=context)
+        if not ids and 'website_published' in Model._all_columns:
+            ids = Model.search(cr, openerp.SUPERUSER_ID,
+                               [('id', '=', id), ('website_published', '=', True)], context=context)
+        if not ids:
+            return self._image_placeholder(response)
+
+        presized = '%s_big' % field
+        concurrency = '__last_update'
+        [record] = Model.read(cr, openerp.SUPERUSER_ID, [id],
+                              [concurrency, field, presized],
+                              context=context)
+
+        if concurrency in record:
+            server_format = openerp.tools.misc.DEFAULT_SERVER_DATETIME_FORMAT
+            try:
+                response.last_modified = datetime.datetime.strptime(
+                    record[concurrency], server_format + '.%f')
+            except ValueError:
+                # just in case we have a timestamp without microseconds
+                response.last_modified = datetime.datetime.strptime(
+                    record[concurrency], server_format)
+
+        # Field does not exist on model or field set to False
+        if not record.get(field):
+            # FIXME: maybe a field which does not exist should be a 404?
+            return self._image_placeholder(response)
+
+        response.set_etag(hashlib.sha1(record[field]).hexdigest())
+        response.make_conditional(request.httprequest)
+
+        # conditional request match
+        if response.status_code == 304:
+            return response
+
+        data = (record.get(presized) or record[field]).decode('base64')
+
+        image = Image.open(cStringIO.StringIO(data))
+        response.mimetype = Image.MIME[image.format]
+
+        # record provides a pre-resized version of the base field, use that
+        # directly
+        if record.get(presized):
+            response.data = data
+            return response
+
+        fit = int(max_width), int(max_height)
+        w, h = image.size
+        max_w, max_h = fit
+
+        if w < max_w and h < max_h:
+            response.data = data
+        else:
+            image.thumbnail(fit, Image.ANTIALIAS)
+            image.save(response.stream, image.format)
+            # invalidate content-length computed by make_conditional as
+            # writing to response.stream does not do it (as of werkzeug 0.9.3)
+            del response.headers['Content-Length']
+
+        return response
+        
+
 class website_menu(osv.osv):
     _name = "website.menu"
     _description = "Website Menu"

From 230a9c34b1609bfed3ab5853fdee0e9d28a2a893 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 14 May 2014 16:32:54 +0200
Subject: [PATCH 136/225] [FIX] website_forum: fix controllers losing paging
 and query params, allow to see own profile even without karma, add avatar
 controller to make the images public

---
 addons/website_forum/controllers/main.py     | 42 ++++++++++++++++----
 addons/website_forum/views/website_forum.xml | 13 +++---
 2 files changed, 41 insertions(+), 14 deletions(-)

diff --git a/addons/website_forum/controllers/main.py b/addons/website_forum/controllers/main.py
index 332cfd4bb41..78c47603e7c 100644
--- a/addons/website_forum/controllers/main.py
+++ b/addons/website_forum/controllers/main.py
@@ -2,6 +2,7 @@
 
 from datetime import datetime
 import werkzeug.urls
+import werkzeug.wrappers
 import simplejson
 
 from openerp import tools
@@ -87,7 +88,8 @@ class WebsiteForum(http.Controller):
 
     @http.route(['/forum/<model("forum.forum"):forum>',
                  '/forum/<model("forum.forum"):forum>/page/<int:page>',
-                 '''/forum/<model("forum.forum"):forum>/tag/<model("forum.tag", "[('forum_id','=',forum[0])]"):tag>/questions'''
+                 '''/forum/<model("forum.forum"):forum>/tag/<model("forum.tag", "[('forum_id','=',forum[0])]"):tag>/questions''',
+                 '''/forum/<model("forum.forum"):forum>/tag/<model("forum.tag", "[('forum_id','=',forum[0])]"):tag>/questions/page/<int:page>''',
                  ], type='http', auth="public", website=True, multilang=True)
     def questions(self, forum, tag=None, page=1, filters='all', sorting='date', search='', **post):
         cr, uid, context = request.cr, request.uid, request.context
@@ -115,7 +117,21 @@ class WebsiteForum(http.Controller):
             order = 'write_date desc'
 
         question_count = Post.search(cr, uid, domain, count=True, context=context)
-        pager = request.website.pager(url="/forum/%s" % slug(forum), total=question_count, page=page, step=self._post_per_page, scope=self._post_per_page)
+        if tag:
+            url = "/forum/%s/%s/questions" % (slug(forum), slug(tag))
+        else:
+            url = "/forum/%s" % slug(forum)
+        
+        url_args = {}
+        if search:
+            url_args['search'] = search
+        if filters:
+            url_args['filters'] = filters
+        if sorting:
+            url_args['sorting'] = sorting
+        pager = request.website.pager(url=url, total=question_count, page=page,
+                                      step=self._post_per_page, scope=self._post_per_page,
+                                      url_args=url_args)
 
         obj_ids = Post.search(cr, uid, domain, limit=self._post_per_page, offset=pager['offset'], order=order, context=context)
         question_ids = Post.browse(cr, uid, obj_ids, context=context)
@@ -418,14 +434,16 @@ class WebsiteForum(http.Controller):
     # User
     # --------------------------------------------------
 
-    @http.route('/forum/<model("forum.forum"):forum>/users', type='http', auth="public", website=True, multilang=True)
+    @http.route(['/forum/<model("forum.forum"):forum>/users',
+                 '/forum/<model("forum.forum"):forum>/users/page/<int:page>'],
+                type='http', auth="public", website=True, multilang=True)
     def users(self, forum, page=1, **searches):
         cr, uid, context = request.cr, request.uid, request.context
         User = request.registry['res.users']
 
         step = 30
         tag_count = User.search(cr, SUPERUSER_ID, [('karma', '>', 1)], count=True, context=context)
-        pager = request.website.pager(url="/forum/users", total=tag_count, page=page, step=step, scope=30)
+        pager = request.website.pager(url="/forum/%s/users" % slug(forum), total=tag_count, page=page, step=step, scope=30)
 
         obj_ids = User.search(cr, SUPERUSER_ID, [('karma', '>', 1)], limit=step, offset=pager['offset'], order='karma DESC', context=context)
         users = User.browse(cr, SUPERUSER_ID, obj_ids, context=context)
@@ -451,6 +469,17 @@ class WebsiteForum(http.Controller):
                 return werkzeug.utils.redirect("/forum/%s/user/%d" % (slug(forum), partner.user_ids[0].id))
         return werkzeug.utils.redirect("/forum/%s" % slug(forum))
 
+    @http.route(['/forum/user/<int:user_id>/avatar'], type='http', auth="public", website=True, multilang=True)
+    def user_avatar(self, user_id=0, **post):
+        cr, uid, context = request.cr, request.uid, request.context
+        response = werkzeug.wrappers.Response()
+        User = request.registry['res.users']
+        Website = request.registry['website']
+        user = User.browse(cr, SUPERUSER_ID, user_id, context=context)
+        if not user.exists() or (user_id != request.session.uid and user.karma < 1):
+            return Website._image_placeholder(response)
+        return Website._image(cr, SUPERUSER_ID, 'res.users', user.id, 'image', response)
+
     @http.route(['/forum/<model("forum.forum"):forum>/user/<int:user_id>'], type='http', auth="public", website=True, multilang=True)
     def open_user(self, forum, user_id=0, **post):
         cr, uid, context = request.cr, request.uid, request.context
@@ -461,10 +490,9 @@ class WebsiteForum(http.Controller):
         Followers = request.registry['mail.followers']
         Data = request.registry["ir.model.data"]
 
-        user_id = User.search(cr, SUPERUSER_ID, [('id', '=', user_id), ('karma', '>', '1')], context=context)
-        if not user_id:
+        user = User.browse(cr, SUPERUSER_ID, user_id, context=context)
+        if not user.exists() or (user_id != request.session.uid and user.karma < 1): 
             return werkzeug.utils.redirect("/forum/%s" % slug(forum))
-        user = User.browse(cr, SUPERUSER_ID, user_id[0], context=context)
 
         # questions and answers by user
         user_questions, user_answers = [], []
diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml
index 0e0ada6df48..60175620dc4 100644
--- a/addons/website_forum/views/website_forum.xml
+++ b/addons/website_forum/views/website_forum.xml
@@ -501,7 +501,7 @@
                         </ul>
                     </div>
                     <div>
-                        <span t-field="question.create_uid.image" t-field-options='{"widget": "image", "class":"pull-left img img-circle img-avatar"}'/>
+                        <img class="pull-left img img-circle img-avatar" t-attf-src="/forum/user/#{question.create_uid.id}/avatar"/>
                         <div>
                             <a t-attf-href="/forum/#{ slug(forum) }/user/#{ question.create_uid.id }"
                                 t-field="question.create_uid"
@@ -557,7 +557,7 @@
                                 </t>
                             </li>
                         </ul>
-                        <span t-field="answer.create_uid.image" t-field-options='{"widget": "image", "class":"pull-left img img-circle img-avatar"}'/>
+                        <img class="pull-left img img-circle img-avatar" t-attf-src="/forum/user/#{answer.create_uid.id}/avatar"/>
                         <div>
                             <a t-attf-href="/forum/#{ slug(forum) }/user/#{ answer.create_uid.id }"
                                 t-field="answer.create_uid"
@@ -692,7 +692,7 @@
         </h4>
         <div class="row">
             <div class="col-sm-3 mt16" t-foreach="users" t-as="user">
-                <span t-field="user.image" t-field-options='{"widget": "image", "class":"pull-left img img-circle img-avatar"}'/>
+                <img class="pull-left img img-circle img-avatar" t-attf-src="/forum/user/#{user.id}/avatar"/>
                 <div>
                     <a t-attf-href="/forum/#{slug(forum)}/user/#{user.id}" t-field="user.name"/>
                 </div>
@@ -705,7 +705,7 @@
     <t t-call="website_forum.header">
         <div class="row">
             <div t-foreach="users" t-as="user" class="col-sm-4">
-                <span t-field="user.image" t-field-options='{"widget": "image", "class":"pull-left img img-circle img-avatar"}'/>
+                <img class="pull-left img img-circle img-avatar" t-attf-src="/forum/user/#{user.id}/avatar"/>
                 <div>
                     <a t-attf-href="/forum/#{slug(forum)}/user/#{user.id}" t-field="user.name"/>
                     <t t-if="user.country_id">
@@ -736,7 +736,7 @@
     <t t-call="website_forum.header">
         <h3>Edit Profile </h3>
             <div class="col-md-2">
-                <span t-field="user.image" t-field-options='{"widget": "image", "class": "img img-responsive img-circle"}'/>
+                <img class="img img-responsive img-circle" t-attf-src="/forum/user/#{user.id}/avatar"/>
             </div>
             <form t-attf-action="/forum/#{slug(forum)}/user/#{slug(user)}/save" method="post" role="form" class="form-horizontal">
                 <input name="user_id" t-att-value="user.id" type="hidden"/>
@@ -786,8 +786,7 @@
         </h1>
         <div class="row">
             <div class="col-sm-2">
-                <span t-field="user.image"
-                    t-field-options='{"widget": "image", "class": "img img-responsive img-circle"}'/>
+                <img class="img img-responsive img-circle" t-attf-src="/forum/user/#{user.id}/avatar"/>
             </div>
             <div class="col-sm-10">
                 <table class="table table-condensed">

From 2e0e242c82dfd9a8a386cbb7a9cc02202a97a1a7 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 14 May 2014 17:11:16 +0200
Subject: [PATCH 137/225] [REV] Revert lazy sitemap

---
 addons/website/controllers/main.py         | 23 ++++++++--------------
 addons/website/views/website_templates.xml |  3 +--
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py
index 79e5dfb0147..a002abc8c88 100644
--- a/addons/website/controllers/main.py
+++ b/addons/website/controllers/main.py
@@ -2,7 +2,6 @@
 import cStringIO
 import json
 import logging
-import math
 import re
 
 from sys import maxint
@@ -70,14 +69,12 @@ class Website(openerp.addons.web.controllers.main.Home):
 
     @http.route('/sitemap.xml', type='http', auth="public", website=True)
     def sitemap_xml_index(self):
-        count = 0
-        for loc in request.website.enumerate_pages():
-            count += 1
-        if count <= LOC_PER_SITEMAP:
-            return self.__sitemap_xml(0)
+        pages = list(request.website.enumerate_pages())
+        if len(pages)<=LOC_PER_SITEMAP:
+            return self.__sitemap_xml(pages, 0)
         # Sitemaps must be split in several smaller files with a sitemap index
         values = {
-            'pages': range(int(math.ceil(float(count) / LOC_PER_SITEMAP))),
+            'pages': range(len(pages)/LOC_PER_SITEMAP+1),
             'url_root': request.httprequest.url_root
         }
         headers = {
@@ -87,16 +84,12 @@ class Website(openerp.addons.web.controllers.main.Home):
 
     @http.route('/sitemap-<int:page>.xml', type='http', auth="public", website=True)
     def sitemap_xml(self, page):
-        return self.__sitemap_xml(page)
+        pages = list(request.website.enumerate_pages())
+        return self.__sitemap_xml(pages, page)
 
-    def __sitemap_xml(self, index=0):
-        locs = request.website.enumerate_pages()
-        feed = index * LOC_PER_SITEMAP
-        for i in xrange(feed):
-            locs.next()
+    def __sitemap_xml(self, pages, index=0):
         values = {
-            'locs': locs,
-            'iter': xrange(LOC_PER_SITEMAP),
+            'pages': pages[index*LOC_PER_SITEMAP:(index+1)*LOC_PER_SITEMAP],
             'url_root': request.httprequest.url_root.rstrip('/')
         }
         headers = {
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index d79dcbcd32a..b9f33ef1c6b 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -699,8 +699,7 @@ Sitemap: <t t-esc="url_root"/>sitemap.xml
 
 <template id="sitemap_xml">&lt;?xml version="1.0" encoding="UTF-8"?&gt;
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
-  <url t-foreach="iter" t-as="i">
-    <t t-set="page" t-value="locs.next()"/>
+  <url t-foreach="pages" t-as="page">
     <loc><t t-esc="url_root"/><t t-esc="page['loc']"/></loc><t t-if="page.get('lastmod', False)">
     <lastmod t-esc="page['lastmod']"/></t><t t-if="page.get('priority', False)">
     <priority t-esc="page['priority']"/></t><t t-if="page.get('changefreq', False)">

From 9b0b918ed6a95da62642f5efff01e4166a45f719 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 14 May 2014 17:34:17 +0200
Subject: [PATCH 138/225] [FIX] website_sale: removed now unnecessary
 dependency towards crm for website-sale, as sales_team module is a dependancy
 of sale.

Also reverted some changes in comments.
---
 addons/website_sale/__openerp__.py      | 2 +-
 addons/website_sale/controllers/main.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/website_sale/__openerp__.py b/addons/website_sale/__openerp__.py
index acfdca4c32f..68556cd8081 100644
--- a/addons/website_sale/__openerp__.py
+++ b/addons/website_sale/__openerp__.py
@@ -9,7 +9,7 @@ OpenERP E-Commerce
 
         """,
     'author': 'OpenERP SA',
-    'depends': ['website', 'sale', 'payment', 'crm'],
+    'depends': ['website', 'sale', 'payment'],
     'data': [
         'data/data.xml',
         'views/views.xml',
diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index 55c170bc939..7bc2eb13712 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -253,7 +253,7 @@ class website_sale(http.Controller):
     def checkout_redirection(self, order):
         cr, uid, context, registry = request.cr, request.uid, request.context, request.registry
 
-        # must have a draft state of sale order with lines at this point, otherwise reset
+        # must have a draft sale order with lines at this point, otherwise reset
         if not order or order.state != 'draft':
             request.website_sale_reset(cr, uid, context=context)
             return request.redirect('/shop')
@@ -454,7 +454,7 @@ class website_sale(http.Controller):
         """ Payment step. This page proposes several payment means based on available
         payment.acquirer. State at this point :
 
-         - a draft state sale order with lines; otherwise, clean context / session and
+         - a draft sale order with lines; otherwise, clean context / session and
            back to the shop
          - no transaction in context / session, or only a draft one, if the customer
            did go to a payment.acquirer website but closed the tab without

From 37ccbada848cf42561d2c0bb68dbee06a1d62170 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 14 May 2014 17:34:43 +0200
Subject: [PATCH 139/225] [FIX] website_sale, website_crm: website salesteam
 value in correct module.

---
 addons/website_crm/data/website_crm_data.xml | 1 +
 addons/website_sale/data/data.xml            | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_crm/data/website_crm_data.xml b/addons/website_crm/data/website_crm_data.xml
index fa1c310f4f6..ba131d22f34 100644
--- a/addons/website_crm/data/website_crm_data.xml
+++ b/addons/website_crm/data/website_crm_data.xml
@@ -17,6 +17,7 @@
             <field name="code">WS</field>
             <field name="member_ids" eval="[(4, ref('base.user_root'))]"/>
             <field name="use_leads">True</field>
+            <field name="use_opportunities" eval="False"/>
         </record>
 
     </data>
diff --git a/addons/website_sale/data/data.xml b/addons/website_sale/data/data.xml
index 398128e0aff..5d0f33bd3a2 100644
--- a/addons/website_sale/data/data.xml
+++ b/addons/website_sale/data/data.xml
@@ -36,7 +36,6 @@
             <field name="name">Website Sales</field>
             <field name="code">WS</field>
             <field name="member_ids" eval="[(4, ref('base.user_root'))]"/>
-            <field name="use_opportunities" eval="False"/>
             <field name="use_quotations" eval="False"/>
         </record>
 

From 4e2fe7998ebb813dc53e471f6ce89a436c797082 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 14 May 2014 18:31:16 +0200
Subject: [PATCH 140/225] [FIX] website_forum: display it as some kind of table
 for better display

---
 addons/website_forum/views/website_forum.xml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml
index 60175620dc4..6bc5f02d5e9 100644
--- a/addons/website_forum/views/website_forum.xml
+++ b/addons/website_forum/views/website_forum.xml
@@ -703,8 +703,11 @@
 
 <template id="users">
     <t t-call="website_forum.header">
-        <div class="row">
-            <div t-foreach="users" t-as="user" class="col-sm-4">
+        <t t-foreach="users" t-as="user">
+            <t t-if="user_index % 3 == 0">
+                <div class="row"></div>
+            </t>
+            <div class="col-sm-4">
                 <img class="pull-left img img-circle img-avatar" t-attf-src="/forum/user/#{user.id}/avatar"/>
                 <div>
                     <a t-attf-href="/forum/#{slug(forum)}/user/#{user.id}" t-field="user.name"/>
@@ -725,7 +728,7 @@
                     <t t-raw="0"/>
                 </div>
             </div>
-        </div>
+        </t>
         <div class="pull-left">
             <t t-call="website.pager"/>
         </div>

From f38161608b867b125e2ce56f40aa34239f8d8e58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 14 May 2014 18:36:58 +0200
Subject: [PATCH 141/225] [FIX] website_forum: fixed commit 9426: values were
 badly computed for the link_button template leading to most buttons being
 buggy on the forum.

---
 addons/website_forum/views/website_forum.xml | 59 ++++++++++----------
 1 file changed, 29 insertions(+), 30 deletions(-)

diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml
index 6bc5f02d5e9..fd45d9ce5a3 100644
--- a/addons/website_forum/views/website_forum.xml
+++ b/addons/website_forum/views/website_forum.xml
@@ -441,9 +441,9 @@
                     </p>
                     <div t-if="question.state == 'close' and user.karma&gt;=500" class="mb24 text-center">
                         <t t-call="website_forum.link_button">
-                            <t t-set="url"><t t-escf="/forum/#{ slug(forum) }/question/#{slug(question)}/reopen"/></t>
-                            <t t-set="label"> Reopen</t>
-                            <t t-set="classes">fa-arrow-right</t>
+                            <t t-set="url" t-value="'/forum/' + slug(forum) + '/question/' + slug(question) + '/reopen'"/>
+                            <t t-set="label" t-value="'Reopen'"/>
+                            <t t-set="classes" t-value="'fa-arrow-right'"/>
                         </t>
                     </div>
                 </div>
@@ -465,37 +465,37 @@
                             </li>
                             <li t-if="question.state != 'close' and ((user.id == question.create_uid.id and can_close_own) or can_close_all)">
                                 <t t-call="website_forum.link_button">
-                                    <t t-set="url"><t t-escf="/forum/#{ slug(forum) }/question/#{slug(question)}/ask_for_close"/></t>
-                                    <t t-set="label"> Close</t>
-                                    <t t-set="classes">text-muted fa-times</t>
+                                    <t t-set="url" t-value="'/forum/' + slug(forum) +'/question/' + slug(question) + '/ask_for_close'"/>
+                                    <t t-set="label" t-value="'Close'"/>
+                                    <t t-set="classes" t-vaoue="'text-muted fa-times'"/>
                                 </t>
                             </li>
                             <li t-if="question.state == 'close' and ((user.id == question.create_uid.id and can_close_own) or can_close_all)">
                                 <t t-call="website_forum.link_button">
-                                    <t t-set="url"><t t-escf="/forum/#{ slug(forum) }/question/#{slug(question)}/reopen"/></t>
-                                    <t t-set="label"> Reopen</t>
-                                    <t t-set="classes">text-muted fa-undo</t>
+                                    <t t-set="url" t-value="'/forum/' + slug(forum) +'/question/' + slug(question) + '/reopen'"/>
+                                    <t t-set="label" t-value="'Reopen'"/>
+                                    <t t-set="classes" t-value="'text-muted fa-undo'"/>
                                 </t>
                             </li>
                             <li t-if="(user.id == question.create_uid.id and can_edit_own) or can_edit_all">
                                 <t t-call="website_forum.link_button">
-                                    <t t-set="url"><t t-escf="/forum/#{ slug(forum) }/post/#{slug(question)}/edit"/></t>
-                                    <t t-set="label"> Edit</t>
-                                    <t t-set="classes">text-muted fa-edit</t>
+                                    <t t-set="url" t-value="'/forum/' + slug(forum) +'/question/' + slug(question) + '/edit'"/>
+                                    <t t-set="label" t-value="'Edit'"/>
+                                    <t t-set="classes" t-value="'text-muted fa-edit'"/>
                                 </t>
                             </li>
                             <li t-if="question.active and ((user.id == question.create_uid.id and can_unlink_own) or can_unlink_all)">
                                 <t t-call="website_forum.link_button">
-                                    <t t-set="url"><t t-escf="/forum/#{ slug(forum) }/question/#{slug(question)}/delete"/></t>
-                                    <t t-set="label"> Delete</t>
-                                    <t t-set="classes">text-muted fa-trash-o</t>
+                                    <t t-set="url" t-value="'/forum/' + slug(forum) +'/question/' + slug(question) + '/delete'"/>
+                                    <t t-set="label" t-value="'Delete'"/>
+                                    <t t-set="classes" t-value="'text-muted fa-trash-o'"/>
                                 </t>
                             </li>
                             <li t-if="not question.active and ((user.id == question.create_uid.id and can_unlink_own) or can_unlink_all)">
                                 <t t-call="website_forum.link_button">
-                                    <t t-set="url"><t t-escf="/forum/#{ slug(forum) }/question/#{slug(question)}/undelete"/></t>
-                                    <t t-set="label"> Undelete</t>
-                                    <t t-set="classes">text-muted fa-trash-o</t>
+                                    <t t-set="url" t-value="'/forum/' + slug(forum) +'/question/' + slug(question) + '/undelete'"/>
+                                    <t t-set="label" t-value="'Undelete'"/>
+                                    <t t-set="classes" t-value="'text-muted fa-trash-o'"/>
                                 </t>
                             </li>
                         </ul>
@@ -544,16 +544,16 @@
                             </li>
                             <li t-if="(user.id == answer.create_uid.id and can_unlink_own) or can_unlink_all">
                                 <t t-call="website_forum.link_button">
-                                    <t t-set="url"><t t-escf="/forum/#{slug(forum)}/post/#{slug(answer)}/delete"/></t>
-                                    <t t-set="label"> Delete</t>
-                                    <t t-set="classes">text-muted fa-trash-o</t>
+                                    <t t-set="url" t-value="'/forum/' + slug(forum) + '/post/' + slug(answer) + '/delete'"/>
+                                    <t t-set="label" t-value="'Delete'"/>
+                                    <t t-set="classes" t-value="'text-muted fa-trash-o'"/>
                                 </t>
                             </li>
                             <li t-if="user.id == answer.create_uid.id">
                                 <t t-call="website_forum.link_button">
-                                    <t t-set="url"><t t-escf="/forum/#{slug(forum)}/post/#{slug(answer)}/convert_to_comment"/></t>
-                                    <t t-set="label">Convert as a comment</t>
-                                    <t t-set="classes">text-muted fa-magic</t>
+                                    <t t-set="url" t-value="'/forum/' + slug(forum) + '/post/' + slug(answer) + '/convert_to_comment'"/>
+                                    <t t-set="label" t-value="'Convert as a comment'"/>
+                                    <t t-set="classes" t-value="'text-muted fa-magic'"/>
                                 </t>
                             </li>
                         </ul>
@@ -593,16 +593,15 @@
                         t-attf-data-href="/forum/#{slug(forum)}/post/#{slug(object)}/comment/#{slug(message)}/delete"
                         class="close comment_delete">&amp;times;</button>
                     <span t-field="message.body"/>
+                    <t t-call="website_forum.link_button">
+                        <t t-set="url" t-value="'/forum/' + slug(forum) + '/post/' + slug(object) + '/comment/' + slug(message) + '/convert_to_answer'"/>
+                        <t t-set="label" t-value="'Convert as an answer'"/>
+                        <t t-set="classes" t-value="'text-muted fa-magic pull-right'"/>
+                    </t>
                     <a t-attf-href="/forum/#{slug(forum)}/partner/#{message.author_id.id}"
                         t-field="message.author_id" t-field-options='{"widget": "contact", "country_image": true, "fields": ["name", "country_id"]}'
                         style="display: inline-block;"/>
                     on <span t-field="message.date" t-field-options='{"format":"short"}'/>
-
-                    <t t-call="website_forum.link_button">
-                        <t t-set="url"><t t-escf="/forum/#{slug(forum)}/post/#{slug(object)}/comment/#{slug(message)}/convert_to_answer"/></t>
-                        <t t-set="label"> Convert as an answer</t>
-                        <t t-set="classes">text-muted fa-magic pull-right</t>
-                    </t>
                 </small>
             </div>
             <div class="css_editable_mode_hidden">

From 2bcbebb0d5d4223f0bfd727a2f418468b302877c Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Wed, 14 May 2014 21:36:34 +0200
Subject: [PATCH 142/225] [FIX] account_analysis_account: Keep price_unit to
 0.0 if passed

---
 addons/account_analytic_analysis/account_analytic_analysis.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index 785d7cd6db0..513c42e9ef6 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -73,7 +73,7 @@ class account_analytic_invoice_line(osv.osv):
 
         result = {}
         res = self.pool.get('product.product').browse(cr, uid, product, context=context)
-        result.update({'name': name or res.description or False,'uom_id': uom_id or res.uom_id.id or False, 'price_unit': price_unit or res.list_price or 0.0})
+        result.update({'name': name or res.description or False,'uom_id': uom_id or res.uom_id.id or False, 'price_unit': price_unit if price_unit is not False else (res.list_price or 0.0)})
 
         res_final = {'value':result}
         if result['uom_id'] != res.uom_id.id:

From cfefd04871487ff9b4714d0714f6f9702c440674 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Wed, 14 May 2014 23:51:18 +0200
Subject: [PATCH 143/225] [FIX] account_analytic_analysis: recurring invoices,
 product_id_change wasnt returning the price get from the pricelist

---
 .../account_analytic_analysis.py                       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index 513c42e9ef6..2f4147cd45c 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -62,22 +62,22 @@ class account_analytic_invoice_line(osv.osv):
         context = context or {}
         uom_obj = self.pool.get('product.uom')
         company_id = company_id or False
-        context.update({'company_id': company_id, 'force_company': company_id, 'pricelist_id': pricelist_id})
+        local_context = dict(context, company_id=company_id, force_company=company_id, pricelist=pricelist_id)
 
         if not product:
             return {'value': {'price_unit': 0.0}, 'domain':{'product_uom':[]}}
         if partner_id:
-            part = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
+            part = self.pool.get('res.partner').browse(cr, uid, partner_id, context=local_context)
             if part.lang:
                 context.update({'lang': part.lang})
 
         result = {}
-        res = self.pool.get('product.product').browse(cr, uid, product, context=context)
-        result.update({'name': name or res.description or False,'uom_id': uom_id or res.uom_id.id or False, 'price_unit': price_unit if price_unit is not False else (res.list_price or 0.0)})
+        res = self.pool.get('product.product').browse(cr, uid, product, context=local_context)
+        result.update({'name': name or res.description or False,'uom_id': uom_id or res.uom_id.id or False, 'price_unit': price_unit if price_unit is not False else (res.price or res.list_price)})
 
         res_final = {'value':result}
         if result['uom_id'] != res.uom_id.id:
-            selected_uom = uom_obj.browse(cr, uid, result['uom_id'], context=context)
+            selected_uom = uom_obj.browse(cr, uid, result['uom_id'], context=local_context)
             new_price = uom_obj._compute_price(cr, uid, res.uom_id.id, res_final['value']['price_unit'], result['uom_id'])
             res_final['value']['price_unit'] = new_price
         return res_final

From 1501c7e64b74e5a9afd3c8076d9febce3a1781ad Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 15 May 2014 00:43:38 +0200
Subject: [PATCH 144/225] [FIX] website_partner remove controller, add support
 for negative ids

---
 .../controllers/main.py                       | 23 +++++++++--------
 addons/website_customer/controllers/main.py   | 23 ++++++++++-------
 .../website_partner/controllers/__init__.py   |  1 -
 addons/website_partner/controllers/main.py    | 25 -------------------
 4 files changed, 27 insertions(+), 45 deletions(-)
 delete mode 100644 addons/website_partner/controllers/__init__.py
 delete mode 100644 addons/website_partner/controllers/main.py

diff --git a/addons/website_crm_partner_assign/controllers/main.py b/addons/website_crm_partner_assign/controllers/main.py
index bf54968e9ae..83474a798c7 100644
--- a/addons/website_crm_partner_assign/controllers/main.py
+++ b/addons/website_crm_partner_assign/controllers/main.py
@@ -1,12 +1,11 @@
 # -*- coding: utf-8 -*-
+import re
 
 import werkzeug
 
-import openerp
+from openerp import SUPERUSER_ID
 from openerp.addons.web import http
-from openerp.tools.translate import _
 from openerp.addons.web.http import request
-from openerp.addons.website_partner.controllers import main as website_partner
 
 class WebsiteCrmPartnerAssign(http.Controller):
     _references_per_page = 20
@@ -106,10 +105,14 @@ class WebsiteCrmPartnerAssign(http.Controller):
         return request.website.render("website_crm_partner_assign.index", values)
 
     # Do not use semantic controller due to SUPERUSER_ID
-    @http.route(['/partners/<int:partner_id>', '/partners/<partner_name>-<int:partner_id>'], type='http', auth="public", website=True, multilang=True)
-    def partners_ref(self, partner_id, partner_name='', **post):
-        values = website_partner.get_partner_template_value(partner_id)
-        if not values:
-            return self.partners(**post)
-        values['main_object'] = values['partner']
-        return request.website.render("website_crm_partner_assign.partner", values)
+    @http.route(['/partners/<partner_id>'], type='http', auth="public", website=True, multilang=True)
+    def partners_detail(self, partner_id, partner_name='', **post):
+        mo = re.search('-([-0-9]+)$', str(partner_id))
+        if mo:
+            partner_id = int(mo.group(1))
+            partner = request.registry['res.partner'].browse(request.cr, SUPERUSER_ID, partner_id, context=request.context)
+            if partner.exists() and partner.website_published:
+                values = {}
+                values['main_object'] = values['partner'] = partner
+                return request.website.render("website_crm_partner_assign.partner", values)
+        return self.partners(**post)
diff --git a/addons/website_customer/controllers/main.py b/addons/website_customer/controllers/main.py
index 2caf8c74373..09db80c8908 100644
--- a/addons/website_customer/controllers/main.py
+++ b/addons/website_customer/controllers/main.py
@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
+import re
 
 import openerp
+from openerp import SUPERUSER_ID
 from openerp.addons.web import http
 from openerp.tools.translate import _
 from openerp.addons.web.http import request
-from openerp.addons.website_partner.controllers import main as website_partner
 import werkzeug.urls
 
 class WebsiteCustomer(http.Controller):
@@ -80,11 +81,15 @@ class WebsiteCustomer(http.Controller):
         }
         return request.website.render("website_customer.index", values)
 
-    @http.route(['/customers/<int:partner_id>', '/customers/<partner_name>-<int:partner_id>'], type='http', auth="public", website=True, multilang=True)
-    def customer(self, partner_id, partner_name='', **post):
-        values = website_partner.get_partner_template_value(partner_id)
-        if not values:
-            return self.customers(**post)
-
-        values['main_object'] = values['partner']
-        return request.website.render("website_customer.details", values)
+    # Do not use semantic controller due to SUPERUSER_ID
+    @http.route(['/customers/<partner_id>'], type='http', auth="public", website=True, multilang=True)
+    def partners_detail(self, partner_id, **post):
+        mo = re.search('-([-0-9]+)$', str(partner_id))
+        if mo:
+            partner_id = int(mo.group(1))
+            partner = request.registry['res.partner'].browse(request.cr, SUPERUSER_ID, partner_id, context=request.context)
+            if partner.exists() and partner.website_published:
+                values = {}
+                values['main_object'] = values['partner'] = partner
+                return request.website.render("website_customer.details", values)
+        return self.customers(**post)
diff --git a/addons/website_partner/controllers/__init__.py b/addons/website_partner/controllers/__init__.py
deleted file mode 100644
index 8ee9bae18d9..00000000000
--- a/addons/website_partner/controllers/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-import main
diff --git a/addons/website_partner/controllers/main.py b/addons/website_partner/controllers/main.py
deleted file mode 100644
index c92ddac8189..00000000000
--- a/addons/website_partner/controllers/main.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import werkzeug
-
-from openerp import SUPERUSER_ID
-from openerp.addons.web import http
-from openerp.addons.web.http import request
-
-def get_partner_template_value(partner_id):
-    partner = request.registry['res.partner'].browse(request.cr, SUPERUSER_ID, partner_id, context=request.context)
-    if not partner.exists() or not partner.website_published:
-        return None
-    return {
-        'partner': partner,
-    }
-
-class WebsitePartner(http.Controller):
-    @http.route(['/partners/<int:partner_id>', '/partners/<partner_name>-<int:partner_id>'], type='http', auth="public", website=True, multilang=True)
-    def partner(self, partner_id, partner_name='', **post):
-        """ Route for displaying a single partner / customer. """
-        values = get_partner_template_value(partner_id)
-        if not values:
-            raise werkzeug.exceptions.NotFound()
-
-        return request.website.render("website_partner.partner_page", values)

From d64c1fb1119811dcda378532726535cead0f084c Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Thu, 15 May 2014 05:51:59 +0000
Subject: [PATCH 145/225] Launchpad automatic translations update.

---
 addons/auth_signup/i18n/de.po | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/auth_signup/i18n/de.po b/addons/auth_signup/i18n/de.po
index 756a19cdf8f..c6e8f777d80 100644
--- a/addons/auth_signup/i18n/de.po
+++ b/addons/auth_signup/i18n/de.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-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-19 14:58+0000\n"
-"Last-Translator: Ferdinand <Unknown>\n"
+"PO-Revision-Date: 2014-05-14 11:25+0000\n"
+"Last-Translator: Claudia Haida <claudia.haida@initos.com>\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: 2014-04-22 07:50+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-05-15 05:51+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: auth_signup
 #: field:res.partner,signup_type:0

From 69e2614641d21183eae98f0a8d84f1e4ece2ad35 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Thu, 15 May 2014 06:10:38 +0000
Subject: [PATCH 146/225] Launchpad automatic translations update.

---
 openerp/addons/base/i18n/nb.po | 92 ++++++++++++++++++++--------------
 1 file changed, 54 insertions(+), 38 deletions(-)

diff --git a/openerp/addons/base/i18n/nb.po b/openerp/addons/base/i18n/nb.po
index 8f4cfa5853b..e6c676b6d1a 100644
--- a/openerp/addons/base/i18n/nb.po
+++ b/openerp/addons/base/i18n/nb.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:35+0000\n"
-"PO-Revision-Date: 2014-05-12 17:21+0000\n"
+"PO-Revision-Date: 2014-05-14 23:06+0000\n"
 "Last-Translator: Kenneth Aalberg <kenneaal@gmail.com>\n"
 "Language-Team: Norwegian Bokmal <nb@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: 2014-05-13 06:27+0000\n"
-"X-Generator: Launchpad (build 17002)\n"
+"X-Launchpad-Export-Date: 2014-05-15 06:10+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -8891,7 +8891,7 @@ msgstr "1cm 28cm 20cm 28cm"
 #. module: base
 #: field:ir.module.module,maintainer:0
 msgid "Maintainer"
-msgstr ""
+msgstr "Vedlikeholdes av"
 
 #. module: base
 #: field:ir.sequence,suffix:0
@@ -8913,7 +8913,7 @@ msgstr "Etiketter"
 msgid ""
 "Select this if you want to set company's address information  for this "
 "contact"
-msgstr ""
+msgstr "Velg dette hvis du vil sette en firmaadresse for denne kontakten"
 
 #. module: base
 #: field:ir.default,field_name:0
@@ -8923,17 +8923,17 @@ msgstr "Objektfelt"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (PE) / Español (PE)"
-msgstr "Spanish (PE) / Español (PE)"
+msgstr "Spansk (PE) / Español (PE)"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "French (CH) / Français (CH)"
-msgstr "French (CH) / Français (CH)"
+msgstr "Fransk (CH) / Français (CH)"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_13
 msgid "Distributor"
-msgstr ""
+msgstr "Distributør"
 
 #. module: base
 #: help:ir.actions.server,subject:0
@@ -8942,6 +8942,9 @@ msgid ""
 "the same values as those available in the condition field, e.g. `Hello [[ "
 "object.partner_id.name ]]`"
 msgstr ""
+"Epost emne, kan inneholde uttrykk i doble braketter basert på samme verdier "
+"som er tilgjengelige i alternativfeltet, f. eks 'Hallo "
+"[[object.partner_id.name]]'"
 
 #. module: base
 #: help:res.partner,image:0
@@ -8949,6 +8952,8 @@ msgid ""
 "This field holds the image used as avatar for this contact, limited to "
 "1024x1024px"
 msgstr ""
+"Dette feltet inneholder bildet som brukes som avatar for denne kontakten, "
+"begrenset til 1024x1024 piksler"
 
 #. module: base
 #: model:res.country,name:base.to
@@ -8962,11 +8967,13 @@ msgid ""
 "serialization field, instead of having its own database column. This cannot "
 "be changed after creation."
 msgstr ""
+"Hvis satt, vil dette feltet bli lagret i serialiseringsfeltet istedet for en "
+"egen databasekolonne. Dette kan ikke endres etter opprettelse."
 
 #. module: base
 #: view:res.partner.bank:0
 msgid "Bank accounts belonging to one of your companies"
-msgstr ""
+msgstr "Bankkontoer som tilhører en av dine firmaer"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_analytic_plans
@@ -9028,22 +9035,22 @@ msgstr ""
 #. module: base
 #: view:base.language.export:0
 msgid "POEdit"
-msgstr ""
+msgstr "POEdit"
 
 #. module: base
 #: view:ir.values:0
 msgid "Client Actions"
-msgstr ""
+msgstr "Klienthandlinger"
 
 #. module: base
 #: field:res.partner.bank.type,field_ids:0
 msgid "Type Fields"
-msgstr ""
+msgstr "Typefelt"
 
 #. module: base
 #: model:ir.module.module,summary:base.module_hr_recruitment
 msgid "Jobs, Recruitment, Applications, Job Interviews"
-msgstr ""
+msgstr "Jobber, rekruttering, søknader, jobbintervju"
 
 #. module: base
 #: code:addons/base/module/module.py:539
@@ -9052,8 +9059,8 @@ msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
 "But this module is not available in your system."
 msgstr ""
-"You try to upgrade a module that depends on the module: %s.\n"
-"But this module is not available in your system."
+"Du prøvde å oppgrade en modul som er avhengig av en annen modul, %s,\n"
+"men den modulen er ikke installert på systemet ditt."
 
 #. module: base
 #: model:ir.module.module,description:base.module_portal_project_long_term
@@ -9065,13 +9072,19 @@ msgid ""
 "================\n"
 "    "
 msgstr ""
+"\n"
+"Denne modulen legger til nødvendige sikkerhetsregler og tilgangsrettigheter "
+"for prosjekter og portal.\n"
+"============================================================================="
+"================\n"
+"    "
 
 #. module: base
 #: help:res.currency,position:0
 msgid ""
 "Determines where the currency symbol should be placed after or before the "
 "amount."
-msgstr ""
+msgstr "Skal valutasymbolet vises før eller etter beløpet?"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_pad_project
@@ -9086,7 +9099,7 @@ msgstr "base.update.translations"
 #. module: base
 #: view:ir.rule:0
 msgid "Full Access Right"
-msgstr ""
+msgstr "Full tilgang"
 
 #. module: base
 #: field:res.partner.category,parent_id:0
@@ -9101,7 +9114,7 @@ msgstr "Finland"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_shortcuts
 msgid "Web Shortcuts"
-msgstr ""
+msgstr "Websnarveier"
 
 #. module: base
 #: view:res.partner:0
@@ -9114,7 +9127,7 @@ msgstr "Kontakt"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_at
 msgid "Austria - Accounting"
-msgstr ""
+msgstr "Sveits - Regnskapsføring"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_ui_menu
@@ -9124,7 +9137,7 @@ msgstr "ir.ui.menu"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_project
 msgid "Project Management"
-msgstr ""
+msgstr "Prosjektstyring"
 
 #. module: base
 #: view:ir.module.module:0
@@ -9139,22 +9152,22 @@ msgstr "Kommunikasjon"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_analytic
 msgid "Analytic Accounting"
-msgstr ""
+msgstr "Analytisk bokføring"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_model_constraint
 msgid "ir.model.constraint"
-msgstr ""
+msgstr "ir.model.constraint"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_graph
 msgid "Graph Views"
-msgstr ""
+msgstr "Grafvisninger"
 
 #. module: base
 #: help:ir.model.relation,name:0
 msgid "PostgreSQL table name implementing a many2many relation."
-msgstr ""
+msgstr "PostgreSQL tabellnavn som implementerer en mange-til-mange relasjon"
 
 #. module: base
 #: model:ir.module.module,description:base.module_base
@@ -9163,6 +9176,9 @@ msgid ""
 "The kernel of OpenERP, needed for all installation.\n"
 "===================================================\n"
 msgstr ""
+"\n"
+"Kjernen av OpenERP, nødvendig for alle installasjoner.\n"
+"===================================================\n"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_server_object_lines
@@ -9172,12 +9188,12 @@ msgstr "ir.server.object.lines"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_be
 msgid "Belgium - Accounting"
-msgstr ""
+msgstr "Belgia - Regnskapsføring"
 
 #. module: base
 #: view:ir.model.access:0
 msgid "Access Control"
-msgstr ""
+msgstr "Tilgangskontroll"
 
 #. module: base
 #: model:res.country,name:base.kw
@@ -9187,13 +9203,13 @@ msgstr "Kuwait"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_followup
 msgid "Payment Follow-up Management"
-msgstr ""
+msgstr "Betalingsoppfølging"
 
 #. module: base
 #: code:addons/orm.py:5334
 #, python-format
 msgid "The value for the field '%s' already exists."
-msgstr ""
+msgstr "Verdien for feltet '%s' eksisterer allerede."
 
 #. module: base
 #: field:workflow.workitem,inst_id:0
@@ -9208,20 +9224,20 @@ msgid ""
 "with the object and time variables."
 msgstr ""
 "Dette er filnavnet til vedlegget som benyttes til å lagre resultatet av "
-"utskriften. Behold blankt for ikke å lagre utskrevne rapporter. Du kan "
-"benytte et python uttrykk på objektet og variabler for tid/dato."
+"utskriften. La det være blankt for å ikke lagre utskrevne rapporter. Du kan "
+"benytte et python-uttrykk på objektet, og variabler for tid/dato."
 
 #. module: base
 #: sql_constraint:ir.model.data:0
 msgid ""
 "You cannot have multiple records with the same external ID in the same "
 "module!"
-msgstr ""
+msgstr "Du kan ikke ha flere poster med samme eksterne ID i samme modul!"
 
 #. module: base
 #: selection:ir.property,type:0
 msgid "Many2One"
-msgstr ""
+msgstr "Mange-til-en"
 
 #. module: base
 #: model:res.country,name:base.ng
@@ -9232,27 +9248,27 @@ msgstr "Nigeria"
 #: code:addons/base/ir/ir_model.py:339
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
-msgstr ""
+msgstr "For utvalgsfelt må utvalgsalternativer velges!"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_base_iban
 msgid "IBAN Bank Accounts"
-msgstr ""
+msgstr "IBAN bankkontoer"
 
 #. module: base
 #: field:res.company,user_ids:0
 msgid "Accepted Users"
-msgstr ""
+msgstr "Godkjente brukere"
 
 #. module: base
 #: field:ir.ui.menu,web_icon_data:0
 msgid "Web Icon Image"
-msgstr ""
+msgstr "Webikon bilde"
 
 #. module: base
 #: field:ir.actions.server,wkf_model_id:0
 msgid "Target Object"
-msgstr ""
+msgstr "Målobjekt"
 
 #. module: base
 #: selection:ir.model.fields,select_level:0
@@ -9262,7 +9278,7 @@ msgstr "Alltid søkbar"
 #. module: base
 #: help:res.country.state,code:0
 msgid "The state code in max. three chars."
-msgstr ""
+msgstr "Statskode med maksimalt tre bokstaver."
 
 #. module: base
 #: model:res.country,name:base.hk

From 10db161454340cc070f65a919f2fb3fe9e465639 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Thu, 15 May 2014 06:10:52 +0000
Subject: [PATCH 147/225] Launchpad automatic translations update.

---
 addons/project_issue/i18n/mn.po | 4 ++--
 addons/stock/i18n/nl.po         | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/project_issue/i18n/mn.po b/addons/project_issue/i18n/mn.po
index badabe240d0..1436ef3b2d9 100644
--- a/addons/project_issue/i18n/mn.po
+++ b/addons/project_issue/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-14 06:20+0000\n"
-"X-Generator: Launchpad (build 17002)\n"
+"X-Launchpad-Export-Date: 2014-05-15 06:10+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: project_issue
 #: model:project.category,name:project_issue.project_issue_category_03
diff --git a/addons/stock/i18n/nl.po b/addons/stock/i18n/nl.po
index 3fb1f4079fc..ad5f42d7cfa 100644
--- a/addons/stock/i18n/nl.po
+++ b/addons/stock/i18n/nl.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2014-02-06 15:56+0000\n"
-"PO-Revision-Date: 2014-05-13 13:54+0000\n"
+"PO-Revision-Date: 2014-05-14 18:21+0000\n"
 "Last-Translator: Erwin van der Ploeg (BAS Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@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: 2014-05-14 06:20+0000\n"
-"X-Generator: Launchpad (build 17002)\n"
+"X-Launchpad-Export-Date: 2014-05-15 06:10+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -5128,7 +5128,7 @@ msgstr "Gekoppelde locatiesoort"
 #: help:stock.picking.in,min_date:0
 #: help:stock.picking.out,min_date:0
 msgid "Scheduled time for the shipment to be processed"
-msgstr "Geplande tijd, wanneer de uitgaande levering wordt verwerkt"
+msgstr "Geplande tijd, wanneer de levering wordt verwerkt"
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0

From ca08f5d6745a2d886739d59ca55e9f6f98532706 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 15 May 2014 09:54:13 +0200
Subject: [PATCH 148/225] [FIX] website_membership support negative ids

---
 addons/website_membership/controllers/main.py | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/addons/website_membership/controllers/main.py b/addons/website_membership/controllers/main.py
index 810fd7dac14..24e0ed2dd5b 100644
--- a/addons/website_membership/controllers/main.py
+++ b/addons/website_membership/controllers/main.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
+import re
 
 from openerp import SUPERUSER_ID
 from openerp.addons.web import http
 from openerp.addons.web.http import request
-from openerp.addons.website_partner.controllers import main as website_partner
 from openerp.tools.translate import _
 
 import werkzeug.urls
@@ -102,10 +102,15 @@ class WebsiteMembership(http.Controller):
         }
         return request.website.render("website_membership.index", values)
 
-    @http.route(['/members/<int:partner_id>', '/members/<partner_name>-<int:partner_id>'], type='http', auth="public", website=True, multilang=True)
-    def partners_ref(self, partner_id, **post):
-        values = website_partner.get_partner_template_value(partner_id)
-        if not values:
-            return self.members(**post)
-        values['main_object'] = values['partner']
-        return request.website.render("website_membership.partner", values)
+    # Do not use semantic controller due to SUPERUSER_ID
+    @http.route(['/members/<partner_id>'], type='http', auth="public", website=True, multilang=True)
+    def partners_detail(self, partner_id, **post):
+        mo = re.search('-([-0-9]+)$', str(partner_id))
+        if mo:
+            partner_id = int(mo.group(1))
+            partner = request.registry['res.partner'].browse(request.cr, SUPERUSER_ID, partner_id, context=request.context)
+            if partner.exists() and partner.website_published:
+                values = {}
+                values['main_object'] = values['partner'] = partner
+                return request.website.render("website_membership.partner", values)
+        return self.customers(**post)

From cada6437d564ad2525574bf3b4246cffd4a73eeb Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 15 May 2014 10:25:18 +0200
Subject: [PATCH 149/225] [REM] temporary disable sitemap

---
 addons/website/controllers/main.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py
index a002abc8c88..be13b5c7f1f 100644
--- a/addons/website/controllers/main.py
+++ b/addons/website/controllers/main.py
@@ -69,6 +69,7 @@ class Website(openerp.addons.web.controllers.main.Home):
 
     @http.route('/sitemap.xml', type='http', auth="public", website=True)
     def sitemap_xml_index(self):
+        return request.not_found() # Temporary disable sitemap
         pages = list(request.website.enumerate_pages())
         if len(pages)<=LOC_PER_SITEMAP:
             return self.__sitemap_xml(pages, 0)

From 87615ac65d009cd890b980ebf5f45272f008b94b Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 15 May 2014 11:25:33 +0200
Subject: [PATCH 150/225] [FIX] website_crm_partner assign import

---
 addons/website_crm_partner_assign/controllers/main.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/website_crm_partner_assign/controllers/main.py b/addons/website_crm_partner_assign/controllers/main.py
index 83474a798c7..168e0ab3d52 100644
--- a/addons/website_crm_partner_assign/controllers/main.py
+++ b/addons/website_crm_partner_assign/controllers/main.py
@@ -3,6 +3,7 @@ import re
 
 import werkzeug
 
+import openerp
 from openerp import SUPERUSER_ID
 from openerp.addons.web import http
 from openerp.addons.web.http import request

From 70f29d774892f0256e3e7e773b9abe95c233a9a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 15 May 2014 11:27:14 +0200
Subject: [PATCH 151/225] [FIX] website_forum: fixed link to edit a question

---
 addons/website_forum/views/website_forum.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml
index fd45d9ce5a3..7cefe20e860 100644
--- a/addons/website_forum/views/website_forum.xml
+++ b/addons/website_forum/views/website_forum.xml
@@ -479,7 +479,7 @@
                             </li>
                             <li t-if="(user.id == question.create_uid.id and can_edit_own) or can_edit_all">
                                 <t t-call="website_forum.link_button">
-                                    <t t-set="url" t-value="'/forum/' + slug(forum) +'/question/' + slug(question) + '/edit'"/>
+                                    <t t-set="url" t-value="'/forum/' + slug(forum) +'/post/' + slug(question) + '/edit'"/>
                                     <t t-set="label" t-value="'Edit'"/>
                                     <t t-set="classes" t-value="'text-muted fa-edit'"/>
                                 </t>

From 1fbc5c1cfbf5ad41960c2c9e5e48ee54d323f081 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 15 May 2014 11:38:00 +0200
Subject: [PATCH 152/225] [FIX] website_forum: fixed issues with images in
 question / answers, now limited in width + auto height. Improved rule for
 img-avatar to avoid being overriden by the default img rule.

---
 .../static/src/css/website_forum.css          | 19 ++++++++++++++-----
 .../static/src/css/website_forum.sass         | 17 +++++++++++++----
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/addons/website_forum/static/src/css/website_forum.css b/addons/website_forum/static/src/css/website_forum.css
index 75befd62b1c..54a7f47380f 100644
--- a/addons/website_forum/static/src/css/website_forum.css
+++ b/addons/website_forum/static/src/css/website_forum.css
@@ -24,16 +24,25 @@
 .question .badge-active {
   background-color: #428bca;
 }
+.question img {
+  max-width: 600px;
+  height: auto !important;
+}
+
+.forum_answer img {
+  max-width: 600px;
+  height: auto !important;
+}
+
+img.img-avatar {
+  max-width: 50px;
+  margin-right: 10px;
+}
 
 .oe_grey {
   background-color: #eeeeee;
 }
 
-.img-avatar {
-  max-width: 50px;
-  margin-right: 10px;
-}
-
 .badge-gold {
   color: #ffcc00;
 }
diff --git a/addons/website_forum/static/src/css/website_forum.sass b/addons/website_forum/static/src/css/website_forum.sass
index d800d293de8..4a16f48e77e 100644
--- a/addons/website_forum/static/src/css/website_forum.sass
+++ b/addons/website_forum/static/src/css/website_forum.sass
@@ -19,14 +19,23 @@
     margin-left: 4px
   .badge-active
     background-color: #428bca
+  img
+    max-width: 600px
+    height: auto !important
+
+.forum_answer
+  img
+    max-width: 600px
+    height: auto !important
+
+img.img-avatar
+  max-width: 50px
+  margin-right: 10px
+
 
 .oe_grey
   background-color: #eeeeee
 
-.img-avatar
-  max-width: 50px
-  margin-right: 10px
-
 .badge-gold
   color: #ffcc00
 

From f0c1eb17866f2d378bc4353247653ec58386a789 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 15 May 2014 10:57:51 +0200
Subject: [PATCH 153/225] [FIX] website_forum: execute the change of number of
 views in SQL instead of using the orm

Using sql will be faster (doing a write in a read is never a good idea for performances) and will not update the write_date (which is used for the last activity filter)
---
 addons/website_forum/models/forum.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/website_forum/models/forum.py b/addons/website_forum/models/forum.py
index 061b9e55eb8..b1de4c001a5 100644
--- a/addons/website_forum/models/forum.py
+++ b/addons/website_forum/models/forum.py
@@ -269,8 +269,7 @@ class Post(osv.Model):
         return {'vote_count': self._get_vote_count(cr, uid, ids, None, None, context=context)[ids[0]]}
 
     def set_viewed(self, cr, uid, ids, context=None):
-        for post in self.browse(cr, uid, ids, context=context):
-            self.write(cr, uid, [post.id], {'views': post.views + 1}, context=context)
+        cr.execute("""UPDATE forum_post SET views = views+1 WHERE id IN %s""", (tuple(ids),))
         return True
 
 

From a2edf9520b8cde67549fe409063a1d7403bb5a02 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 15 May 2014 11:23:11 +0200
Subject: [PATCH 154/225] [ADD] website_forum: adding the 'Newest' filter on
 the forum to sort by create date

---
 addons/website_forum/controllers/main.py     | 6 ++++--
 addons/website_forum/views/website_forum.xml | 4 ++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/addons/website_forum/controllers/main.py b/addons/website_forum/controllers/main.py
index 78c47603e7c..69a420be320 100644
--- a/addons/website_forum/controllers/main.py
+++ b/addons/website_forum/controllers/main.py
@@ -112,9 +112,11 @@ class WebsiteForum(http.Controller):
             order = 'child_count desc'
         elif sorting == 'vote':
             order = 'vote_count desc'
-        else:
-            sorting = 'date'
+        elif sorting == 'date':
             order = 'write_date desc'
+        else:
+            sorting = 'creation'
+            order = 'create_date desc'
 
         question_count = Post.search(cr, uid, domain, count=True, context=context)
         if tag:
diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml
index 7cefe20e860..66b13026335 100644
--- a/addons/website_forum/views/website_forum.xml
+++ b/addons/website_forum/views/website_forum.xml
@@ -229,6 +229,7 @@
                   <t t-if="filters == 'followed'">Followed</t>
                   <t t-if="tag"><span t-field="tag.name"/></t>
                   <t t-if="sorting == 'date'"> by activity date</t>
+                  <t t-if="sorting == 'creation'"> by creation date</t>
                   <t t-if="sorting == 'answered'"> by most answered</t>
                   <t t-if="sorting == 'vote'"> by most voted</t>
                   <b class="caret"/>
@@ -252,6 +253,9 @@
                   <li t-att-class="sorting == 'date' and 'active' or '' ">
                       <a t-att-href="url_for('') + '?' + keep_query( 'search', 'filters', sorting='date')">Last activity date</a>
                   </li>
+                  <li t-att-class="sorting == 'creation' and 'active' or '' ">
+                      <a t-att-href="url_for('') + '?' + keep_query( 'search', 'filters', sorting='creation')">Newest</a>
+                  </li>
                   <li t-att-class="sorting == 'answered' and 'active' or '' ">
                       <a t-att-href="url_for('') + '?' + keep_query( 'search', 'filters', sorting='answered')">Most answered</a>
                   </li>

From 6a5fd8e6afc3b91e77a451bb13a6953deb5dd3f1 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 15 May 2014 11:36:08 +0200
Subject: [PATCH 155/225] [FIX] website_crm_partner_assign: fix import issues

---
 .../controllers/main.py                          | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/website_crm_partner_assign/controllers/main.py b/addons/website_crm_partner_assign/controllers/main.py
index 168e0ab3d52..486d10e6ef6 100644
--- a/addons/website_crm_partner_assign/controllers/main.py
+++ b/addons/website_crm_partner_assign/controllers/main.py
@@ -3,10 +3,10 @@ import re
 
 import werkzeug
 
-import openerp
 from openerp import SUPERUSER_ID
 from openerp.addons.web import http
 from openerp.addons.web.http import request
+from openerp.tools.translate import _
 
 class WebsiteCrmPartnerAssign(http.Controller):
     _references_per_page = 20
@@ -45,10 +45,10 @@ class WebsiteCrmPartnerAssign(http.Controller):
 
         # group by country
         countries = partner_obj.read_group(
-            request.cr, openerp.SUPERUSER_ID, partner_domain, ["id", "country_id"],
+            request.cr, SUPERUSER_ID, partner_domain, ["id", "country_id"],
             groupby="country_id", orderby="country_id", context=request.context)
         countries_partners = partner_obj.search(
-            request.cr, openerp.SUPERUSER_ID, partner_domain,
+            request.cr, SUPERUSER_ID, partner_domain,
             context=request.context, count=True)
 
         if country_id:
@@ -68,23 +68,23 @@ class WebsiteCrmPartnerAssign(http.Controller):
 
         # format pager
         partner_count = partner_obj.search_count(
-            request.cr, openerp.SUPERUSER_ID, partner_domain,
+            request.cr, SUPERUSER_ID, partner_domain,
             context=request.context)
         pager = request.website.pager(url="/partners", total=partner_count, page=page, step=self._references_per_page, scope=7, url_args=post)
 
-        partner_ids = partner_obj.search(request.cr, openerp.SUPERUSER_ID, partner_domain,
+        partner_ids = partner_obj.search(request.cr, SUPERUSER_ID, partner_domain,
                                          offset=pager['offset'], limit=self._references_per_page,
                                          order="grade_id DESC, partner_weight DESC",
                                          context=request.context)
         google_map_partner_ids = ','.join(map(str, partner_ids))
-        partners = partner_obj.browse(request.cr, openerp.SUPERUSER_ID, partner_ids, request.context)
+        partners = partner_obj.browse(request.cr, SUPERUSER_ID, partner_ids, request.context)
 
         # group by grade
         grades = partner_obj.read_group(
-            request.cr, openerp.SUPERUSER_ID, base_partner_domain, ["id", "grade_id"],
+            request.cr, SUPERUSER_ID, base_partner_domain, ["id", "grade_id"],
             groupby="grade_id", orderby="grade_id DESC", context=request.context)
         grades_partners = partner_obj.search(
-            request.cr, openerp.SUPERUSER_ID, base_partner_domain,
+            request.cr, SUPERUSER_ID, base_partner_domain,
             context=request.context, count=True)
         grades.insert(0, {
             'grade_id_count': grades_partners,

From 4baccd7beea34c8421df20e181f4304374857fb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 15 May 2014 14:13:33 +0200
Subject: [PATCH 156/225] [IMP] mail: notifications: when having more than 500
 followers to mail use the email queue instead of directly sending
 notification emails.

---
 addons/mail/mail_followers.py | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/addons/mail/mail_followers.py b/addons/mail/mail_followers.py
index 0059df90530..0985b16f5ac 100644
--- a/addons/mail/mail_followers.py
+++ b/addons/mail/mail_followers.py
@@ -183,16 +183,20 @@ class mail_notification(osv.Model):
         references = message.parent_id.message_id if message.parent_id else False
 
         # create email values
-        mail_values = {
-            'mail_message_id': message.id,
-            'auto_delete': True,
-            'body_html': body_html,
-            'recipient_ids': [(4, id) for id in email_pids],
-            'references': references,
-        }
-        email_notif_id = self.pool.get('mail.mail').create(cr, uid, mail_values, context=context)
-        if force_send:
-            self.pool.get('mail.mail').send(cr, uid, [email_notif_id], context=context)
+        max_recipients = 100
+        chunks = [email_pids[x:x + max_recipients] for x in xrange(0, len(email_pids), max_recipients)]
+        email_ids = []
+        for chunk in chunks:
+            mail_values = {
+                'mail_message_id': message.id,
+                'auto_delete': True,
+                'body_html': body_html,
+                'recipient_ids': [(4, id) for id in chunk],
+                'references': references,
+            }
+            email_ids.append(self.pool.get('mail.mail').create(cr, uid, mail_values, context=context))
+        if force_send and len(chunks) < 6:  # for more than 500 followers, use the queue system
+            self.pool.get('mail.mail').send(cr, uid, email_ids, context=context)
         return True
 
     def _notify(self, cr, uid, message_id, partners_to_notify=None, context=None,

From 584fd2cbf748a4c27e0d8b2b936351ae75469884 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Thu, 15 May 2014 18:46:06 +0530
Subject: [PATCH 157/225] [IMP]: Improve l10n_fr_hr_payroll report. add some
 div with bootstrap css class instead of inline css.

---
 .../views/report_l10nfrfichepaye.xml          | 52 +++++++++++--------
 1 file changed, 29 insertions(+), 23 deletions(-)

diff --git a/addons/l10n_fr_hr_payroll/views/report_l10nfrfichepaye.xml b/addons/l10n_fr_hr_payroll/views/report_l10nfrfichepaye.xml
index 6ee98168614..c39da57d091 100644
--- a/addons/l10n_fr_hr_payroll/views/report_l10nfrfichepaye.xml
+++ b/addons/l10n_fr_hr_payroll/views/report_l10nfrfichepaye.xml
@@ -7,16 +7,16 @@
             <t t-call="report.internal_layout">
                 <div class="page">
                     <div class="oe_structure"/>
-                    <div class="row">
+                    <div class="row">   
                         <div class="col-xs-4">
                             <h2>Bulletin de paie</h2>
                             <h4>Paie du <span t-esc="formatLang(o.date_from, date=True)"/> au <span t-esc="formatLang(o.date_to, date=True)"/></h4>
                         </div>
                         <div class="col-xs-4 pull-right">
-                            <table class="table table-bordered">
+                            <table class="table table-bordered" stype="border: 2px solid black;">
                                 <tr>
                                     <td>
-                                        <div t-field="o.employee_id.company_id.partner_id" 
+                                        <div t-field="o.employee_id.company_id.partner_id"  
                                     t-field-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": true}' />SIRET:
                                         <span t-esc="o.employee_id.company_id.siret or '_'"/> APE:
                                         <span t-esc="o.employee_id.company_id.ape or '_'"/>
@@ -67,16 +67,14 @@
                                 <th>Quantité / Base</th>
                                 <th>Taux</th>
                                 <th>Montant</th>
-                                <th>Charges Patronales</th>
+                                <th colspan="2">Charges Patronales</th>
                             </tr>
                         </thead>
                         <tbody>
                             <tr t-foreach="get_payslip_lines(o.line_ids)" t-as="p">
                                 <td>
                                     <span t-esc="p.code or ''"/>
-                                </td>
-                                <td>
-                                    <span t-esc="p.name or ''"/>
+                                     <span t-esc="p.name or ''" class="col-xs-offset-1"/>
                                 </td>
                                 <td>
                                     <t t-if="p.amount_select== 'percentage'">
@@ -96,25 +94,33 @@
                                 </td>
                                 <td>
                                     <span t-esc="get_employer_line(o, p) and get_employer_line(o, p).rate or ''"/>
-                                </td>
-                                <td>
-                                    <span t-esc="get_employer_line(o,p) and get_employer_line(o,p).total or ''"/>
+                                     <span t-esc="get_employer_line(o,p) and get_employer_line(o,p).total or ''"/>
                                 </td>
                             </tr>
                         </tbody>
                     </table>
-                    <table class="table table-condensed">
-                        <tr>
-                            <td>
-                                <strong>Mode de réglement</strong> : <span t-esc="o.payment_mode or ''"/><br/>
-                                <t t-if="o.paid is True"><strong>Payé</strong></t><br/>
-                                <strong>Conv. Coll.</strong> : <span t-esc="o.employee_id.company_id.conv_coll or ''"/>
-                            </td>
-                            <td><strong>Net à payer </strong>: <span t-esc="get_total_by_rule_category(o, 'NET')"/></td>
-                            <td><strong>Total Charges Patronales</strong> : <span t-esc="get_total_by_rule_category(o, 'COMP')"/></td>
-                        </tr>
-                    </table>
-                    <table class="table table-condensed text-center">
+                     <div class="row">
+                        <div class="col-xs-12">
+                            <table class="table  table-round-border">
+                                <tr>
+                                    <td>
+                                        <div class="pull-right">         
+                                        <strong>Net à payer </strong>: <span t-esc="get_total_by_rule_category(o, 'NET')"/>
+                                        <strong>Total Charges Patronales</strong> : <span t-esc="get_total_by_rule_category(o, 'COMP')"/>
+                                        </div>
+                                        <div class="mt15">
+                                             <strong>Mode de réglement</strong> : <span t-esc="o.payment_mode or ''"/> 
+                                        </div>
+                                        <div class="mt15">
+                                             <t t-if="o.paid is True"><strong>Payé</strong></t>
+                                        </div>
+                                        
+                                   </td>
+                                </tr>   
+                            </table>
+                        </div>
+                     </div>   
+                    <table class="table table-bordered text-center">
                         <thead>
                             <tr>
                                 <th>Salaire Brut</th>
@@ -137,7 +143,7 @@
                         </tbody>
                     </table>
 
-                    <p>DANS VOTRE INTERET ET POUR VOUS AIDER A FAIRE VALOIR VOS DROITS, CONSERVEZ CE 
+                    <p class="mt32">DANS VOTRE INTERET ET POUR VOUS AIDER A FAIRE VALOIR VOS DROITS, CONSERVEZ CE 
 BULLETIN DE PAIE SANS LIMITATION DE DUREE</p>
                 </div>
             </t>

From 07e4e15f4dc62819c7db53a1e019b9716cd82912 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 15 May 2014 16:25:51 +0200
Subject: [PATCH 158/225] [FIX] ir_model_fields: when adding a new custom
 column to a custom model, set a valid _rec_name to this model (otherwise
 would require a server restart to reinstanciate the model)

---
 openerp/addons/base/ir/ir_model.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/openerp/addons/base/ir/ir_model.py b/openerp/addons/base/ir/ir_model.py
index d71622727c5..9614e2d31cf 100644
--- a/openerp/addons/base/ir/ir_model.py
+++ b/openerp/addons/base/ir/ir_model.py
@@ -351,6 +351,8 @@ class ir_model_fields(osv.osv):
                 raise except_orm(_('Error'), _("Model %s does not exist!") % vals['relation'])
 
             if self.pool.get(vals['model']):
+                if vals['model'].startswith('x_') and vals['name'] == 'x_name':
+                    self.pool[vals['model']]._rec_name = 'x_name'
                 self.pool.get(vals['model']).__init__(self.pool, cr)
                 #Added context to _auto_init for special treatment to custom field for select_level
                 ctx = dict(context,

From 828b7aef2f66fbc15ed28e39e7adc9068e9c4fa7 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 15 May 2014 16:58:16 +0200
Subject: [PATCH 159/225] [WIP] sitemap

---
 addons/website/controllers/main.py         | 44 +++++++++++++++++-----
 addons/website/views/website_templates.xml |  2 +-
 2 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py
index be13b5c7f1f..fc8dca6d07f 100644
--- a/addons/website/controllers/main.py
+++ b/addons/website/controllers/main.py
@@ -1,7 +1,9 @@
 # -*- coding: utf-8 -*-
 import cStringIO
+from itertools import islice
 import json
 import logging
+import math
 import re
 
 from sys import maxint
@@ -22,6 +24,24 @@ logger = logging.getLogger(__name__)
 MAX_IMAGE_WIDTH, MAX_IMAGE_HEIGHT = IMAGE_LIMITS = (1024, 768)
 LOC_PER_SITEMAP = 45000
 
+import time
+
+from functools import wraps
+
+def timeit(f):
+    @wraps(f)
+    def wrapper(*args, **kw):
+        ts = time.time()
+        result = f(*args, **kw)
+        te = time.time()
+
+        print 'func:%r args:[%r, %r] took: %2.4f sec' % \
+          (f.__name__, args, kw, te-ts)
+        return result
+    return wrapper
+
+
+
 class Website(openerp.addons.web.controllers.main.Home):
     #------------------------------------------------------
     # View
@@ -67,15 +87,17 @@ class Website(openerp.addons.web.controllers.main.Home):
     def robots(self):
         return request.render('website.robots', {'url_root': request.httprequest.url_root}, mimetype='text/plain')
 
+    @timeit
     @http.route('/sitemap.xml', type='http', auth="public", website=True)
     def sitemap_xml_index(self):
-        return request.not_found() # Temporary disable sitemap
-        pages = list(request.website.enumerate_pages())
-        if len(pages)<=LOC_PER_SITEMAP:
-            return self.__sitemap_xml(pages, 0)
+        count = 0
+        for loc in request.website.enumerate_pages():
+            count += 1
+        if count <= LOC_PER_SITEMAP:
+            return self.__sitemap_xml(0)
         # Sitemaps must be split in several smaller files with a sitemap index
         values = {
-            'pages': range(len(pages)/LOC_PER_SITEMAP+1),
+            'pages': range(int(math.ceil(float(count) / LOC_PER_SITEMAP))),
             'url_root': request.httprequest.url_root
         }
         headers = {
@@ -85,18 +107,20 @@ class Website(openerp.addons.web.controllers.main.Home):
 
     @http.route('/sitemap-<int:page>.xml', type='http', auth="public", website=True)
     def sitemap_xml(self, page):
-        pages = list(request.website.enumerate_pages())
-        return self.__sitemap_xml(pages, page)
+        return self.__sitemap_xml(page)
 
-    def __sitemap_xml(self, pages, index=0):
+    @timeit
+    def __sitemap_xml(self, index=0):
+        start = index * LOC_PER_SITEMAP
+        locs = islice(request.website.enumerate_pages(), start , start + LOC_PER_SITEMAP)
         values = {
-            'pages': pages[index*LOC_PER_SITEMAP:(index+1)*LOC_PER_SITEMAP],
+            'locs': locs,
             'url_root': request.httprequest.url_root.rstrip('/')
         }
         headers = {
             'Content-Type': 'application/xml;charset=utf-8',
         }
-        return request.render('website.sitemap_xml', values, headers=headers)
+        return request.render('website.sitemap_xml', values, headers=headers).flatten()
 
     #------------------------------------------------------
     # Edit
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index b9f33ef1c6b..3611645cbf5 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -699,7 +699,7 @@ Sitemap: <t t-esc="url_root"/>sitemap.xml
 
 <template id="sitemap_xml">&lt;?xml version="1.0" encoding="UTF-8"?&gt;
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
-  <url t-foreach="pages" t-as="page">
+  <url t-foreach="locs" t-as="page">
     <loc><t t-esc="url_root"/><t t-esc="page['loc']"/></loc><t t-if="page.get('lastmod', False)">
     <lastmod t-esc="page['lastmod']"/></t><t t-if="page.get('priority', False)">
     <priority t-esc="page['priority']"/></t><t t-if="page.get('changefreq', False)">

From 66484dbbc8e0f68c9fc5eaee0016ceb2c013d8e1 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 15 May 2014 17:08:29 +0200
Subject: [PATCH 160/225] [FIX] website_twitter: use HTTPS profile URLs to be
 safe on HTTPS websites

---
 addons/website_twitter/static/src/xml/website.twitter.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_twitter/static/src/xml/website.twitter.xml b/addons/website_twitter/static/src/xml/website.twitter.xml
index 25c6121e166..3a58fc4f43d 100644
--- a/addons/website_twitter/static/src/xml/website.twitter.xml
+++ b/addons/website_twitter/static/src/xml/website.twitter.xml
@@ -4,7 +4,7 @@
     <t t-name="website.Twitter.Tweet">
         <div class="tweet" t-attf-data-url="http://twitter.com/#{tweet.user.screen_name}/status/#{tweet.id_str}" t-attf-data-tweet-id="#{tweet.id_str}">
           <div class="left">
-              <img t-att-src="tweet.user.profile_image_url"/>
+              <img t-att-src="tweet.user.profile_image_url_https"/>
           </div>
           <div class="right">
               <div class="top">

From 3d881b1a0c30e74e965511c5b64c98e42945cbc3 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 15 May 2014 17:26:37 +0200
Subject: [PATCH 161/225] [REM] debuggin stuff

---
 addons/website/controllers/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py
index fc8dca6d07f..b1e414c8a33 100644
--- a/addons/website/controllers/main.py
+++ b/addons/website/controllers/main.py
@@ -120,7 +120,7 @@ class Website(openerp.addons.web.controllers.main.Home):
         headers = {
             'Content-Type': 'application/xml;charset=utf-8',
         }
-        return request.render('website.sitemap_xml', values, headers=headers).flatten()
+        return request.render('website.sitemap_xml', values, headers=headers)
 
     #------------------------------------------------------
     # Edit

From e81306704170aeb62aefd716b4bbf511d3eb1f22 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Fri, 16 May 2014 06:43:51 +0000
Subject: [PATCH 162/225] Launchpad automatic translations update.

---
 addons/account_budget/i18n/it.po |  10 +-
 addons/stock/i18n/hr.po          | 240 ++++++++++++-------------------
 2 files changed, 100 insertions(+), 150 deletions(-)

diff --git a/addons/account_budget/i18n/it.po b/addons/account_budget/i18n/it.po
index 90b54d479cc..babb30b80ae 100644
--- a/addons/account_budget/i18n/it.po
+++ b/addons/account_budget/i18n/it.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2014-05-15 08:00+0000\n"
+"Last-Translator: Davide Corio @ LS <davide.corio@lsweb.it>\n"
 "Language-Team: Italian <it@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: 2013-11-21 05:58+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-05-16 06:43+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
@@ -212,7 +212,7 @@ msgstr "Valore Effettivo"
 #: view:crossovered.budget:0
 #: field:crossovered.budget.lines,practical_amount:0
 msgid "Practical Amount"
-msgstr "Imporo effettivo"
+msgstr "Importo effettivo"
 
 #. module: account_budget
 #: field:crossovered.budget,date_to:0
diff --git a/addons/stock/i18n/hr.po b/addons/stock/i18n/hr.po
index f387ab46671..191bf94479e 100644
--- a/addons/stock/i18n/hr.po
+++ b/addons/stock/i18n/hr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2014-02-06 15:56+0000\n"
-"PO-Revision-Date: 2014-05-05 09:49+0000\n"
+"PO-Revision-Date: 2014-05-15 13:48+0000\n"
 "Last-Translator: Marko Carevic <Unknown>\n"
 "Language-Team: Croatian <hr@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: 2014-05-06 07:27+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-16 06:43+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -55,7 +55,7 @@ msgstr ""
 #. module: stock
 #: view:stock.picking.out:0
 msgid "Confirm & Deliver"
-msgstr "Potvrdi i isporuči"
+msgstr "Forsiraj dostupnost i  isporuči"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_view_change_product_quantity
@@ -125,8 +125,8 @@ msgid "Product Moves"
 msgstr "Product Moves"
 
 #. module: stock
-#: code:addons/stock/stock.py:2568
-#: code:addons/stock/stock.py:2629
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
 #, python-format
 msgid "Please provide proper quantity."
 msgstr "Molimo unesite ispravnu količinu"
@@ -145,13 +145,13 @@ msgstr ""
 "Interni broj za slučajeve kada se razlikuje od proizvođačeva serijskog broja"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_fill_inventory.py:63
+#: code:addons/stock/wizard/stock_fill_inventory.py:59
 #, python-format
 msgid "You cannot perform this operation on more than one Stock Inventories."
 msgstr "Nije oguće izvršiti ovu operaciju  na više od jednog skladišta"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:95
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #, python-format
 msgid "Quantity cannot be negative."
 msgstr "Količine nemogu biti negativne"
@@ -184,8 +184,6 @@ msgstr "npr. godišnja inventura"
 #: field:stock.partial.move.line,quantity:0
 #: field:stock.partial.picking.line,quantity:0
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 #: field:stock.report.prodlots,qty:0
 #: field:stock.report.tracklots,name:0
 #: field:stock.return.picking.memory,quantity:0
@@ -319,7 +317,7 @@ msgid "Reference"
 msgstr "Vezna oznaka"
 
 #. module: stock
-#: code:addons/stock/stock.py:1565
+#: code:addons/stock/stock.py:1548
 #, python-format
 msgid "Products to Process"
 msgstr "Artikli za obradu"
@@ -358,12 +356,12 @@ msgstr ""
 "da bi mogao biti ubačen u kanban pogled."
 
 #. module: stock
-#: code:addons/stock/stock.py:782
-#: code:addons/stock/stock.py:2517
-#: code:addons/stock/stock.py:2568
-#: code:addons/stock/stock.py:2629
-#: code:addons/stock/wizard/stock_change_product_qty.py:95
-#: code:addons/stock/wizard/stock_fill_inventory.py:128
+#: code:addons/stock/stock.py:768
+#: code:addons/stock/stock.py:2475
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
+#: code:addons/stock/wizard/stock_fill_inventory.py:124
 #: code:addons/stock/wizard/stock_inventory_merge.py:43
 #: code:addons/stock/wizard/stock_inventory_merge.py:63
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
@@ -371,9 +369,9 @@ msgstr ""
 #: code:addons/stock/wizard/stock_partial_picking.py:174
 #: code:addons/stock/wizard/stock_partial_picking.py:181
 #: code:addons/stock/wizard/stock_partial_picking.py:192
-#: code:addons/stock/wizard/stock_return_picking.py:102
-#: code:addons/stock/wizard/stock_return_picking.py:109
-#: code:addons/stock/wizard/stock_return_picking.py:212
+#: code:addons/stock/wizard/stock_return_picking.py:99
+#: code:addons/stock/wizard/stock_return_picking.py:106
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Warning!"
 msgstr "Upozorenje!"
@@ -492,9 +490,6 @@ msgstr ""
 #: selection:stock.move,state:0
 #: selection:stock.picking,state:0
 #: selection:stock.picking.in,state:0
-#: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 #: selection:stock.picking.out,state:0
 msgid "Waiting Availability"
 msgstr "Čeka dostupnost"
@@ -503,9 +498,6 @@ msgstr "Čeka dostupnost"
 #: selection:report.stock.inventory,state:0
 #: selection:report.stock.move,state:0
 #: selection:stock.move,state:0
-#: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 #: view:stock.production.lot:0
 #: field:stock.production.lot,stock_available:0
 msgid "Available"
@@ -578,7 +570,7 @@ msgstr ""
 "Ovo vrijeme jamčite kupcu kao rok isporuke."
 
 #. module: stock
-#: code:addons/stock/product.py:195
+#: code:addons/stock/product.py:196
 #, python-format
 msgid "Products: "
 msgstr "Proizvodi: "
@@ -595,7 +587,7 @@ msgid "Draft Physical Inventories"
 msgstr "Nacrti fizičkih inventura"
 
 #. module: stock
-#: code:addons/stock/stock.py:1806
+#: code:addons/stock/stock.py:1777
 #, python-format
 msgid ""
 "Quantities, Units of Measure, Products and Locations cannot be modified on "
@@ -643,7 +635,7 @@ msgid "Item Labels"
 msgstr "Labela"
 
 #. module: stock
-#: code:addons/stock/stock.py:1373
+#: code:addons/stock/stock.py:1356
 #, python-format
 msgid "Back order <em>%s</em> has been <b>created</b>."
 msgstr ""
@@ -724,8 +716,6 @@ msgstr "Količina za serijski broj %d  %s je veća od dostupne količine (%d)!"
 
 #. module: stock
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 msgid "Order(Origin)"
 msgstr "Nalog(Izvor)"
 
@@ -765,7 +755,6 @@ msgid "Destination Address "
 msgstr "Odredišna adresa "
 
 #. module: stock
-#: view:product.product:0
 #: field:product.product,reception_count:0
 msgid "Reception"
 msgstr "Zaprimanje"
@@ -816,8 +805,6 @@ msgstr "Planirana godina"
 #: view:stock.picking.in:0
 #: field:stock.picking.in,state:0
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 #: field:stock.picking.out,state:0
 msgid "Status"
 msgstr "Status"
@@ -915,7 +902,7 @@ msgstr ""
 "which entries will be automatically posted when stock moves are processed."
 
 #. module: stock
-#: code:addons/stock/stock.py:2296
+#: code:addons/stock/stock.py:2252
 #, python-format
 msgid ""
 "Please define stock output account for this product or its category: \"%s\" "
@@ -943,7 +930,7 @@ msgid "Reference must be unique per Company!"
 msgstr "Oznaka mora biti jedinstvena unuar organizacije"
 
 #. module: stock
-#: code:addons/stock/product.py:448
+#: code:addons/stock/product.py:447
 #, python-format
 msgid "Future Receptions"
 msgstr "Budući prijemi"
@@ -982,8 +969,6 @@ msgstr "- ažuriraj"
 
 #. module: stock
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 msgid "Weight"
 msgstr "Težina"
 
@@ -1027,7 +1012,7 @@ msgid "December"
 msgstr "Prosinac"
 
 #. module: stock
-#: code:addons/stock/stock.py:1204
+#: code:addons/stock/stock.py:1190
 #, python-format
 msgid ""
 "You cannot cancel the picking as some moves have been done. You should "
@@ -1052,7 +1037,7 @@ msgid "Change Product Quantity"
 msgstr "Promjeni količinu proizvoda"
 
 #. module: stock
-#: code:addons/stock/product.py:464
+#: code:addons/stock/product.py:463
 #, python-format
 msgid "Future P&L"
 msgstr "Budući P&L"
@@ -1089,7 +1074,7 @@ msgid "You must assign a serial number for this product."
 msgstr "Morate dodijeliti serijski broj za ovaj proizvod"
 
 #. module: stock
-#: code:addons/stock/stock.py:2299
+#: code:addons/stock/stock.py:2255
 #, python-format
 msgid "Please define journal on the product category: \"%s\" (id: %d)"
 msgstr "Definirajte dnevnik za kategoriju proizvoda: \"%s\" (id: %d)"
@@ -1136,8 +1121,6 @@ msgstr "Valuta"
 #: view:stock.picking:0
 #: view:stock.picking.in:0
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 msgid "Journal"
 msgstr "Dnevnik"
 
@@ -1216,7 +1199,7 @@ msgid ""
 msgstr "Molim izaberite višestruke fizičke zalihe za spajanje u popis."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:109
+#: code:addons/stock/wizard/stock_return_picking.py:106
 #, python-format
 msgid ""
 "No products to return (only lines in Done state and not fully returned yet "
@@ -1345,7 +1328,7 @@ msgid "Author"
 msgstr "Autor"
 
 #. module: stock
-#: code:addons/stock/stock.py:1851
+#: code:addons/stock/stock.py:1822
 #, python-format
 msgid ""
 "You are moving %.2f %s but only %.2f %s available for this serial number."
@@ -1353,8 +1336,6 @@ msgstr ""
 
 #. module: stock
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 msgid "Internal Shipment :"
 msgstr "Interni prijenosi:"
 
@@ -1382,7 +1363,7 @@ msgid "Supplier"
 msgstr "Dobavljač"
 
 #. module: stock
-#: code:addons/stock/stock.py:2908
+#: code:addons/stock/stock.py:2859
 #, python-format
 msgid ""
 "In order to cancel this inventory, you must first unpost related journal "
@@ -1493,8 +1474,6 @@ msgstr "Skl. prijenos utroška"
 
 #. module: stock
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 msgid "Delivery Order :"
 msgstr "Otpremnica"
 
@@ -1588,7 +1567,7 @@ msgstr ""
 "otpremnice koja utječe na prosječnu cijenu proizvoda."
 
 #. module: stock
-#: code:addons/stock/stock.py:1919
+#: code:addons/stock/stock.py:1890
 #, python-format
 msgid "Warning: No Back Order"
 msgstr ""
@@ -1610,13 +1589,13 @@ msgid "To be refunded/invoiced"
 msgstr "Kreiraj fakturu"
 
 #. module: stock
-#: code:addons/stock/stock.py:2492
+#: code:addons/stock/stock.py:2450
 #, python-format
 msgid "You can only delete draft moves."
 msgstr "Možete izbrisati samo transakcije u nacrtu."
 
 #. module: stock
-#: code:addons/stock/stock.py:1682
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "You cannot move product %s to a location of type view %s."
 msgstr ""
@@ -1655,7 +1634,7 @@ msgid "Additional Info"
 msgstr "Dodatni podaci"
 
 #. module: stock
-#: code:addons/stock/stock.py:2697
+#: code:addons/stock/stock.py:2648
 #, python-format
 msgid "Missing partial picking data for move #%s."
 msgstr ""
@@ -1671,7 +1650,7 @@ msgid "Incoming Shipments already processed"
 msgstr "Dolazne počiljke su već obrađene"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:102
+#: code:addons/stock/wizard/stock_return_picking.py:99
 #, python-format
 msgid "You may only return pickings that are Confirmed, Available or Done!"
 msgstr ""
@@ -1748,9 +1727,6 @@ msgstr ""
 #. module: stock
 #: field:stock.inventory,date:0
 #: field:stock.move,create_date:0
-#: field:stock.picking,date:0
-#: field:stock.picking.in,date:0
-#: field:stock.picking.out,date:0
 #: field:stock.production.lot,date:0
 #: field:stock.tracking,date:0
 msgid "Creation Date"
@@ -1840,7 +1816,7 @@ msgid "Order Date"
 msgstr "Datum naloga"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:96
+#: code:addons/stock/wizard/stock_change_product_qty.py:92
 #, python-format
 msgid "INV: %s"
 msgstr "INV: %s"
@@ -1878,7 +1854,7 @@ msgid "Stock Invoice Onshipping"
 msgstr "Račun nakon isporuke"
 
 #. module: stock
-#: code:addons/stock/stock.py:2517
+#: code:addons/stock/stock.py:2475
 #, python-format
 msgid "Please provide a positive quantity to scrap."
 msgstr ""
@@ -1943,8 +1919,6 @@ msgstr "Zaostala narudžba"
 
 #. module: stock
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 msgid "Incoming Shipment :"
 msgstr "Primka"
 
@@ -2030,7 +2004,7 @@ msgid "Shelf 2"
 msgstr "Shelf 2"
 
 #. module: stock
-#: code:addons/stock/stock.py:543
+#: code:addons/stock/stock.py:529
 #, python-format
 msgid "You cannot remove a lot line."
 msgstr ""
@@ -2054,7 +2028,7 @@ msgid "Localization"
 msgstr "Lokacija"
 
 #. module: stock
-#: code:addons/stock/product.py:460
+#: code:addons/stock/product.py:459
 #, python-format
 msgid "Delivered Qty"
 msgstr "Otpremljena kol."
@@ -2373,7 +2347,7 @@ msgid "Generate accounting entries per stock movement"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:450
+#: code:addons/stock/product.py:449
 #, python-format
 msgid "Received Qty"
 msgstr "Zaprimljena kol."
@@ -2413,8 +2387,6 @@ msgstr "Naziv"
 
 #. module: stock
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 msgid "Supplier Address :"
 msgstr "Adresa dobavljača :"
 
@@ -2449,8 +2421,8 @@ msgid "Customer Locations"
 msgstr "Lokacije kupca"
 
 #. module: stock
-#: code:addons/stock/stock.py:2492
-#: code:addons/stock/stock.py:2907
+#: code:addons/stock/stock.py:2449
+#: code:addons/stock/stock.py:2858
 #, python-format
 msgid "User Error!"
 msgstr "Greška korisnika!"
@@ -2681,7 +2653,7 @@ msgid "Warehouse board"
 msgstr "Kokpit skladišta"
 
 #. module: stock
-#: code:addons/stock/product.py:470
+#: code:addons/stock/product.py:469
 #, python-format
 msgid "Future Qty"
 msgstr "Buduće kol."
@@ -2747,7 +2719,7 @@ msgid "Products"
 msgstr "Proizvodi"
 
 #. module: stock
-#: code:addons/stock/stock.py:2287
+#: code:addons/stock/stock.py:2243
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Output Account of this product and Valuation "
@@ -2787,7 +2759,7 @@ msgid "Outgoing Products"
 msgstr "Izlazni proizvodi"
 
 #. module: stock
-#: code:addons/stock/stock.py:2293
+#: code:addons/stock/stock.py:2249
 #, python-format
 msgid ""
 "Please define stock input account for this product or its category: \"%s\" "
@@ -2809,7 +2781,7 @@ msgid "Move"
 msgstr "Temeljnica"
 
 #. module: stock
-#: code:addons/stock/product.py:466
+#: code:addons/stock/product.py:465
 #, python-format
 msgid "P&L Qty"
 msgstr "P&L kol."
@@ -2904,8 +2876,6 @@ msgstr "Izvor"
 #: field:stock.picking,location_id:0
 #: field:stock.picking.in,location_id:0
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 #: field:stock.picking.out,location_id:0
 #: field:stock.report.prodlots,location_id:0
 #: field:stock.report.tracklots,location_id:0
@@ -2929,7 +2899,7 @@ msgid "Cancel Move"
 msgstr "Otkaži prijenos"
 
 #. module: stock
-#: code:addons/stock/stock.py:2290
+#: code:addons/stock/stock.py:2246
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Input Account of this product and Valuation "
@@ -2953,7 +2923,7 @@ msgid "scrap"
 msgstr "otpis"
 
 #. module: stock
-#: code:addons/stock/stock.py:1920
+#: code:addons/stock/stock.py:1891
 #, python-format
 msgid ""
 "By changing the quantity here, you accept the new quantity as complete: "
@@ -3045,13 +3015,13 @@ msgid "Stock Journal"
 msgstr "Dnevnik zalihe"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:176
+#: code:addons/stock/wizard/stock_return_picking.py:171
 #, python-format
 msgid "%s-%s-return"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:86
+#: code:addons/stock/wizard/stock_change_product_qty.py:82
 #, python-format
 msgid "Active ID is not set in Context"
 msgstr "Aktivni ID nije u kontekstu"
@@ -3074,7 +3044,7 @@ msgid "Scrap Move"
 msgstr ""
 
 #. module: stock
-#: help:stock.move,prodlot_id:0
+#: help:stock.move,lot_id:0
 msgid "Serial number is used to put a serial number on the production"
 msgstr ""
 
@@ -3119,7 +3089,7 @@ msgid "Date of Completion"
 msgstr "Datum izvršenja"
 
 #. module: stock
-#: code:addons/stock/stock.py:1680
+#: code:addons/stock/stock.py:1663
 #, python-format
 msgid "You cannot move product %s from a location of type view %s."
 msgstr ""
@@ -3206,10 +3176,8 @@ msgstr "Datum revizije"
 
 #. module: stock
 #: view:report.stock.inventory:0
-#: field:report.stock.inventory,prodlot_id:0
+#: field:report.stock.inventory,lot_id:0
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 msgid "Lot"
 msgstr "Lot"
 
@@ -3238,8 +3206,6 @@ msgstr "Postavi raspoloživo"
 
 #. module: stock
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 msgid "Contact Address :"
 msgstr "Kontakt adresa :"
 
@@ -3431,7 +3397,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2545
+#: code:addons/stock/stock.py:2496
 #, python-format
 msgid "%s %s %s has been <b>moved to</b> scrap."
 msgstr ""
@@ -3450,9 +3416,6 @@ msgstr "Customers Packings"
 #: selection:stock.move,state:0
 #: view:stock.picking:0
 #: view:stock.picking.in:0
-#: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 msgid "Done"
 msgstr "Izvršeno"
 
@@ -3481,7 +3444,7 @@ msgid "Date done"
 msgstr "Datum izvršenja"
 
 #. module: stock
-#: code:addons/stock/stock.py:1135
+#: code:addons/stock/stock.py:1121
 #, python-format
 msgid ""
 "Please put a partner on the picking list if you want to generate invoice."
@@ -3556,7 +3519,7 @@ msgid "Stock"
 msgstr "Zaliha"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:226
+#: code:addons/stock/wizard/stock_return_picking.py:219
 #, python-format
 msgid "Returned Picking"
 msgstr ""
@@ -3634,7 +3597,7 @@ msgid "Assigned Internal Moves"
 msgstr "DOdjeljeni interni prijenosi"
 
 #. module: stock
-#: code:addons/stock/stock.py:804
+#: code:addons/stock/stock.py:790
 #, python-format
 msgid "You cannot process picking without stock moves."
 msgstr "Prijenosi za ovaj serijski broj"
@@ -3883,7 +3846,7 @@ msgid "Inventory Move"
 msgstr "Skladišni prijenos"
 
 #. module: stock
-#: code:addons/stock/product.py:476
+#: code:addons/stock/product.py:475
 #, python-format
 msgid "Future Productions"
 msgstr "Buduća proizvodnja"
@@ -4006,24 +3969,21 @@ msgstr "Inventar lotova"
 #: model:ir.model,name:stock.model_stock_production_lot
 #: model:ir.ui.menu,name:stock.menu_action_production_lot_form
 #: model:res.request.link,name:stock.req_link_tracking
-#: field:stock.change.product.qty,prodlot_id:0
+#: field:stock.change.product.qty,lot_id:0
 #: field:stock.inventory.line,prod_lot_id:0
 #: field:stock.inventory.line.split.lines,name:0
-#: field:stock.inventory.line.split.lines,prodlot_id:0
-#: field:stock.move,prodlot_id:0
+#: field:stock.inventory.line.split.lines,lot_id:0
+#: field:stock.move,lot_id:0
 #: view:stock.move.split:0
 #: field:stock.move.split.lines,name:0
-#: field:stock.move.split.lines,prodlot_id:0
-#: field:stock.partial.move.line,prodlot_id:0
-#: field:stock.partial.picking.line,prodlot_id:0
+#: field:stock.move.split.lines,lot_id:0
+#: field:stock.partial.move.line,lot_id:0
+#: field:stock.partial.picking.line,lot_id:0
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 #: view:stock.production.lot:0
 #: field:stock.production.lot,name:0
 #: field:stock.production.lot.revision,lot_id:0
-#: field:stock.report.prodlots,prodlot_id:0
-#: field:stock.return.picking.memory,prodlot_id:0
+#: field:stock.report.prodlots,lot_id:0
 msgid "Serial Number"
 msgstr "Serijski broj"
 
@@ -4082,7 +4042,7 @@ msgid "Non European Customers"
 msgstr "Klijenti izvan Europe"
 
 #. module: stock
-#: code:addons/stock/product.py:100
+#: code:addons/stock/product.py:96
 #: code:addons/stock/product.py:110
 #: code:addons/stock/product.py:113
 #: code:addons/stock/product.py:120
@@ -4090,19 +4050,18 @@ msgstr "Klijenti izvan Europe"
 #: code:addons/stock/product.py:167
 #: code:addons/stock/report/report_stock.py:78
 #: code:addons/stock/report/report_stock.py:134
-#: code:addons/stock/stock.py:543
-#: code:addons/stock/stock.py:804
-#: code:addons/stock/stock.py:1204
-#: code:addons/stock/stock.py:1213
-#: code:addons/stock/stock.py:2287
-#: code:addons/stock/stock.py:2290
-#: code:addons/stock/stock.py:2293
-#: code:addons/stock/stock.py:2296
-#: code:addons/stock/stock.py:2299
-#: code:addons/stock/stock.py:2302
-#: code:addons/stock/stock.py:2525
-#: code:addons/stock/stock.py:2634
-#: code:addons/stock/wizard/stock_fill_inventory.py:63
+#: code:addons/stock/stock.py:529
+#: code:addons/stock/stock.py:790
+#: code:addons/stock/stock.py:1190
+#: code:addons/stock/stock.py:1199
+#: code:addons/stock/stock.py:2243
+#: code:addons/stock/stock.py:2246
+#: code:addons/stock/stock.py:2249
+#: code:addons/stock/stock.py:2252
+#: code:addons/stock/stock.py:2255
+#: code:addons/stock/stock.py:2258
+#: code:addons/stock/stock.py:2585
+#: code:addons/stock/wizard/stock_fill_inventory.py:59
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:112
 #: code:addons/stock/wizard/stock_splitinto.py:53
 #, python-format
@@ -4199,7 +4158,7 @@ msgstr ""
 "je fiksna."
 
 #. module: stock
-#: code:addons/stock/stock.py:1882
+#: code:addons/stock/stock.py:1853
 #, python-format
 msgid ""
 "By changing this quantity here, you accept the new quantity as complete: "
@@ -4269,7 +4228,7 @@ msgid "Followers"
 msgstr "Pratitelji"
 
 #. module: stock
-#: code:addons/stock/stock.py:2634
+#: code:addons/stock/stock.py:2585
 #, python-format
 msgid "Cannot consume a move with negative or zero quantity."
 msgstr ""
@@ -4355,7 +4314,7 @@ msgstr ""
 "stock input account will be debited."
 
 #. module: stock
-#: code:addons/stock/stock.py:2860
+#: code:addons/stock/stock.py:2811
 #, python-format
 msgid "INV:"
 msgstr ""
@@ -4374,7 +4333,7 @@ msgid "Chaining Journal"
 msgstr "Dnevnik ulančavanja"
 
 #. module: stock
-#: code:addons/stock/stock.py:782
+#: code:addons/stock/stock.py:768
 #, python-format
 msgid "Not enough stock, unable to reserve the products."
 msgstr "Nedovoljna količina na zalihi, rezervacija artikla nije moguća."
@@ -4406,7 +4365,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:458
+#: code:addons/stock/product.py:457
 #, python-format
 msgid "Future Deliveries"
 msgstr "Buduće otpreme"
@@ -4429,7 +4388,7 @@ msgid "Auto Validate"
 msgstr "Automatska potvrda"
 
 #. module: stock
-#: code:addons/stock/stock.py:1850
+#: code:addons/stock/stock.py:1821
 #, python-format
 msgid "Insufficient Stock for Serial Number !"
 msgstr ""
@@ -4526,14 +4485,14 @@ msgid "Invoiced"
 msgstr "Fakturirano"
 
 #. module: stock
-#: code:addons/stock/stock.py:1881
+#: code:addons/stock/stock.py:1852
 #: view:product.template:0
 #, python-format
 msgid "Information"
 msgstr "Informacija"
 
 #. module: stock
-#: code:addons/stock/stock.py:1213
+#: code:addons/stock/stock.py:1199
 #, python-format
 msgid "You cannot remove the picking which is in %s state!"
 msgstr "Nije moguće ukloniti pošiljku koja je u statusu %s !"
@@ -4569,8 +4528,6 @@ msgstr "Auto-skladišnica"
 
 #. module: stock
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 msgid "Customer Address :"
 msgstr "Adresa kupca:"
 
@@ -4637,7 +4594,7 @@ msgid "Shelves (Y)"
 msgstr "Police (Y)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2302
+#: code:addons/stock/stock.py:2258
 #, python-format
 msgid ""
 "Please define inventory valuation account on the product category: \"%s\" "
@@ -4650,7 +4607,7 @@ msgid "Serial Number Revision"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:100
+#: code:addons/stock/product.py:96
 #, python-format
 msgid "Specify valuation Account for Product Category: %s."
 msgstr ""
@@ -4663,7 +4620,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:212
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Please specify at least one non-zero quantity."
 msgstr ""
@@ -4696,7 +4653,7 @@ msgid "November"
 msgstr "Studeni"
 
 #. module: stock
-#: code:addons/stock/product.py:472
+#: code:addons/stock/product.py:471
 #, python-format
 msgid "Unplanned Qty"
 msgstr "Neplanirana kol."
@@ -4707,7 +4664,7 @@ msgid "Chained Company"
 msgstr "Chained Company"
 
 #. module: stock
-#: view:stock.picking:0
+#: view:stock.picking.out:0
 msgid "Check Availability"
 msgstr "Provjeri dostupnost"
 
@@ -4732,7 +4689,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_fill_inventory.py:128
+#: code:addons/stock/wizard/stock_fill_inventory.py:124
 #, python-format
 msgid ""
 "No product in this location. Please select a location in the product form."
@@ -4749,14 +4706,14 @@ msgid "Move History (parent moves)"
 msgstr "Move History (parent moves)"
 
 #. module: stock
-#: code:addons/stock/product.py:454
+#: code:addons/stock/product.py:453
 #, python-format
 msgid "Future Stock"
 msgstr "Buduća zaliha"
 
 #. module: stock
-#: code:addons/stock/stock.py:1680
-#: code:addons/stock/stock.py:1682
+#: code:addons/stock/stock.py:1663
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "Error"
 msgstr "Greška"
@@ -4879,8 +4836,6 @@ msgstr "Kašnjenja"
 
 #. module: stock
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 msgid "Schedule Date"
 msgstr "Zakazani datum"
 
@@ -4918,8 +4873,6 @@ msgstr "Realan"
 #. module: stock
 #: field:stock.move,name:0
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 #: view:stock.production.lot.revision:0
 #: field:stock.production.lot.revision,description:0
 msgid "Description"
@@ -4943,7 +4896,6 @@ msgid "Deliver"
 msgstr "Otpremi"
 
 #. module: stock
-#: view:product.product:0
 #: field:product.product,delivery_count:0
 msgid "Delivery"
 msgstr "Otprema"
@@ -4965,7 +4917,7 @@ msgid "Location Content"
 msgstr "Location Content"
 
 #. module: stock
-#: code:addons/stock/product.py:478
+#: code:addons/stock/product.py:477
 #, python-format
 msgid "Produced Qty"
 msgstr "Proizvedena kol."
@@ -5172,8 +5124,6 @@ msgstr "Spremno za isporuku"
 
 #. module: stock
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 msgid "Warehouse Address :"
 msgstr "Adresa skladišta:"
 

From 9fc6ff1f55a9f79c43e9092880ac94c99fe1243c Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Fri, 16 May 2014 10:44:20 +0200
Subject: [PATCH 163/225] [FIX] website_event: when website_event is installed,
 event and event type should by readable (acl) by anyone

This means, public users, but all users that are neither public user nor event user
---
 addons/website_event/security/ir.model.access.csv | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/website_event/security/ir.model.access.csv b/addons/website_event/security/ir.model.access.csv
index 2d98213669f..b67e94c4ca5 100644
--- a/addons/website_event/security/ir.model.access.csv
+++ b/addons/website_event/security/ir.model.access.csv
@@ -1,3 +1,3 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_event_event_public,event.event.public,event.model_event_event,base.group_public,1,0,0,0
-access_event_type_public,event.type.public,event.model_event_type,base.group_public,1,0,0,0
+access_event_event_public,event.event.public,event.model_event_event,,1,0,0,0
+access_event_type_public,event.type.public,event.model_event_type,,1,0,0,0

From d3beae292108f9a1d8afe98a0f0beacbb2248f36 Mon Sep 17 00:00:00 2001
From: rim-odoo <>
Date: Fri, 16 May 2014 12:19:32 +0200
Subject: [PATCH 164/225] [FIX] website: make sure the hidden properties on
 website will not be overwritten by other properties

---
 addons/website/static/src/css/website.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index 94de70dc7dc..209d431ae8f 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -121,7 +121,7 @@ header a.navbar-brand img {
 
 /* ----- EDITOR ----- */
 .css_non_editable_mode_hidden {
-  display: none;
+  display: none !important;
 }
 
 /* ----- BOOTSTRAP FIX ----- */

From 97fd0d8ed8feeed5353306a50234416ca784e05a Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Fri, 16 May 2014 13:01:34 +0200
Subject: [PATCH 165/225] [FIX] auth_oauth: Replace OpenERP.com provider by
 Odoo.com provider

---
 addons/auth_oauth/auth_oauth_data.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/auth_oauth/auth_oauth_data.xml b/addons/auth_oauth/auth_oauth_data.xml
index 983549f9378..3889cf2d883 100644
--- a/addons/auth_oauth/auth_oauth_data.xml
+++ b/addons/auth_oauth/auth_oauth_data.xml
@@ -2,13 +2,13 @@
 <openerp>
     <data noupdate="1">
         <record id="provider_openerp" model="auth.oauth.provider">
-            <field name="name">OpenERP.com Accounts</field>
-            <field name="auth_endpoint">https://accounts.openerp.com/oauth2/auth</field>
+            <field name="name">Odoo.com Accounts</field>
+            <field name="auth_endpoint">https://accounts.odoo.com/oauth2/auth</field>
             <field name="scope">userinfo</field>
-            <field name="validation_endpoint">https://accounts.openerp.com/oauth2/tokeninfo</field>
+            <field name="validation_endpoint">https://accounts.odoo.com/oauth2/tokeninfo</field>
             <field name="data_endpoint"></field>
             <field name="css_class">zocial openerp</field>
-            <field name="body">Log in with OpenERP.com</field>
+            <field name="body">Log in with Odoo.com</field>
             <field name="enabled" eval="True"/>
         </record>
         <record id="provider_facebook" model="auth.oauth.provider">

From a54b9ffe36eca909ffebc67894184f364c78b136 Mon Sep 17 00:00:00 2001
From: "Richard Mathot (OpenERP)" <rim@openerp.com>
Date: Fri, 16 May 2014 13:54:50 +0200
Subject: [PATCH 166/225] [FIX] website_event: Increase number of displayed
 events

---
 addons/website_event/controllers/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_event/controllers/main.py b/addons/website_event/controllers/main.py
index 3e0a0729d92..70e7b0fbe91 100644
--- a/addons/website_event/controllers/main.py
+++ b/addons/website_event/controllers/main.py
@@ -139,7 +139,7 @@ class website_event(http.Controller):
             'country_id': ("all", _("All Countries"))
         })
 
-        step = 5
+        step = 10  # Number of events per page
         event_count = event_obj.search(
             request.cr, request.uid, dom_without("none"), count=True,
             context=request.context)

From 0fb14cbe0adbf03f2b8e53736a9d0021e130624a Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 16 May 2014 14:06:17 +0200
Subject: [PATCH 167/225] [FIX] point_of_sale: add product variant in the
 displayed name (opw 607456)

---
 addons/point_of_sale/static/src/js/db.js     | 3 +++
 addons/point_of_sale/static/src/js/models.js | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/point_of_sale/static/src/js/db.js b/addons/point_of_sale/static/src/js/db.js
index e0f4fd62b23..516637ab950 100644
--- a/addons/point_of_sale/static/src/js/db.js
+++ b/addons/point_of_sale/static/src/js/db.js
@@ -169,6 +169,9 @@ function openerp_pos_db(instance, module){
                 var product = products[i];
                 var search_string = this._product_search_string(product);
                 var categ_id = product.pos_categ_id ? product.pos_categ_id[0] : this.root_category_id;
+                if (product.variants){
+                    product.name = product.name+" ("+product.variants+")";
+                }
                 if(!stored_categories[categ_id]){
                     stored_categories[categ_id] = [];
                 }
diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js
index 6fe4db6211a..b7b36d05b4e 100644
--- a/addons/point_of_sale/static/src/js/models.js
+++ b/addons/point_of_sale/static/src/js/models.js
@@ -175,7 +175,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
 
                     return self.fetch(
                         'product.product', 
-                        ['name', 'list_price','price','pos_categ_id', 'taxes_id', 'ean13', 'default_code',
+                        ['name', 'list_price','price','pos_categ_id', 'taxes_id', 'ean13', 'default_code', 'variants',
                          'to_weight', 'uom_id', 'uos_id', 'uos_coeff', 'mes_type', 'description_sale', 'description'],
                         [['sale_ok','=',true],['available_in_pos','=',true]],
                         {pricelist: self.get('shop').pricelist_id[0]} // context for price

From fd15324d656bb71e4b5b184d1f5abfbb50810a53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 16 May 2014 14:16:56 +0200
Subject: [PATCH 168/225] [FIX] website_crm_partner_assign: clean and fix
 routes, pager, and grade / country search and propagation. Routes were still
 using an old int / str way of matching parameters. They have been converted
 into model-based routes. Also cleaned the way grades and countries are
 managed and displayed. Pager is now working, taking into account grade and
 country.

---
 .../controllers/main.py                       | 144 ++++++++++--------
 .../views/website_crm_partner_assign.xml      |  60 ++++----
 2 files changed, 107 insertions(+), 97 deletions(-)

diff --git a/addons/website_crm_partner_assign/controllers/main.py b/addons/website_crm_partner_assign/controllers/main.py
index 486d10e6ef6..c9621b7a0e9 100644
--- a/addons/website_crm_partner_assign/controllers/main.py
+++ b/addons/website_crm_partner_assign/controllers/main.py
@@ -6,97 +6,111 @@ import werkzeug
 from openerp import SUPERUSER_ID
 from openerp.addons.web import http
 from openerp.addons.web.http import request
+from openerp.addons.website.models.website import slug
 from openerp.tools.translate import _
 
+
 class WebsiteCrmPartnerAssign(http.Controller):
-    _references_per_page = 20
+    _references_per_page = 40
 
     @http.route([
         '/partners',
         '/partners/page/<int:page>',
 
-        '/partners/grade/<int:grade_id>',
-        '/partners/grade/<int:grade_id>/page/<int:page>',
+        '/partners/grade/<model("res.partner.grade"):grade>',
+        '/partners/grade/<model("res.partner.grade"):grade>/page/<int:page>',
 
-        '/partners/country/<int:country_id>',
-        '/partners/country/<country_name>-<int:country_id>',
-        '/partners/country/<int:country_id>/page/<int:page>',
-        '/partners/country/<country_name>-<int:country_id>/page/<int:page>',
-
-        '/partners/grade/<int:grade_id>/country/<int:country_id>',
-        '/partners/grade/<int:grade_id>/country/<country_name>-<int:country_id>',
-        '/partners/grade/<int:grade_id>/country/<int:country_id>/page/<int:page>',
-        '/partners/grade/<int:grade_id>/country/<country_name>-<int:country_id>/page/<int:page>',
+        '/partners/country/<model("res.country"):country>',
+        '/partners/country/<model("res.country"):country>/page/<int:page>',
 
+        '/partners/grade/<model("res.partner.grade"):grade>/country/<model("res.country"):country>',
+        '/partners/grade/<model("res.partner.grade"):grade>/country/<model("res.country"):country>/page/<int:page>',
     ], type='http', auth="public", website=True, multilang=True)
-    def partners(self, country_id=0, grade_id=0, page=0, country_name='', **post):
-        country_obj = request.registry['res.country']
+    def partners(self, country=None, grade=None, page=0, **post):
         partner_obj = request.registry['res.partner']
-        post_name = post.get('search', '')
-        country = None
+        search = post.get('search', '')
 
-        # format displayed membership lines domain
         base_partner_domain = [('is_company', '=', True), ('grade_id.website_published', '=', True), ('website_published', '=', True)]
-        partner_domain = list(base_partner_domain)
-        if post_name:
-            partner_domain += ['|', ('name', 'ilike', post_name), ('website_description', 'ilike', post_name)]
-        if grade_id and grade_id != "all":
-            partner_domain += [('grade_id', '=', int(grade_id))]  # try/catch int
+        if search:
+            base_partner_domain += ['|', ('name', 'ilike', search), ('website_description', 'ilike', search)]
 
-        # group by country
-        countries = partner_obj.read_group(
-            request.cr, SUPERUSER_ID, partner_domain, ["id", "country_id"],
-            groupby="country_id", orderby="country_id", context=request.context)
-        countries_partners = partner_obj.search(
-            request.cr, SUPERUSER_ID, partner_domain,
+        # group by grade
+        grade_domain = list(base_partner_domain)
+        if country:
+            grade_domain += [('country_id', '=', country.id)]
+        grades = partner_obj.read_group(
+            request.cr, SUPERUSER_ID, grade_domain, ["id", "grade_id"],
+            groupby="grade_id", orderby="grade_id DESC", context=request.context)
+        grades_partners = partner_obj.search(
+            request.cr, SUPERUSER_ID, grade_domain,
             context=request.context, count=True)
-
-        if country_id:
-            country = country_obj.browse(request.cr, request.uid, country_id, request.context)
-            partner_domain += [('country_id', '=', country_id)]
-            if not any(x['country_id'][0] == country_id for x in countries):
-                countries.append({
-                    'country_id_count': 0,
-                    'country_id': (country_id, country.name)
-                })
-                countries.sort(key=lambda d: d['country_id'][1])
-
-        countries.insert(0, {
-            'country_id_count': countries_partners,
-            'country_id': (0, _("All Countries"))
+        # flag active grade
+        for grade_dict in grades:
+            grade_dict['active'] = grade and grade_dict['grade_id'][0] == grade.id
+        grades.insert(0, {
+            'grade_id_count': grades_partners,
+            'grade_id': (0, _("All Categories")),
+            'active': bool(grade is None),
         })
 
-        # format pager
-        partner_count = partner_obj.search_count(
-            request.cr, SUPERUSER_ID, partner_domain,
-            context=request.context)
-        pager = request.website.pager(url="/partners", total=partner_count, page=page, step=self._references_per_page, scope=7, url_args=post)
+        # group by country
+        country_domain = list(base_partner_domain)
+        if grade:
+            country_domain += [('grade_id', '=', grade.id)]
+        countries = partner_obj.read_group(
+            request.cr, SUPERUSER_ID, country_domain, ["id", "country_id"],
+            groupby="country_id", orderby="country_id", context=request.context)
+        countries_partners = partner_obj.search(
+            request.cr, SUPERUSER_ID, country_domain,
+            context=request.context, count=True)
+        # flag active country
+        for country_dict in countries:
+            country_dict['active'] = country and country_dict['country_id'][0] == country.id
+        countries.insert(0, {
+            'country_id_count': countries_partners,
+            'country_id': (0, _("All Countries")),
+            'active': bool(country is None),
+        })
 
-        partner_ids = partner_obj.search(request.cr, SUPERUSER_ID, partner_domain,
-                                         offset=pager['offset'], limit=self._references_per_page,
-                                         order="grade_id DESC, partner_weight DESC",
-                                         context=request.context)
+        # current search
+        if grade:
+            base_partner_domain += [('grade_id', '=', grade.id)]
+        if country:
+            base_partner_domain += [('country_id', '=', country.id)]
+
+        # format pager
+        if grade and not country:
+            url = '/partners/grade/' + slug(grade)
+        elif country and not grade:
+            url = '/partners/country/' + slug(country)
+        elif country and grade:
+            url = '/partners/grade/' + slug(grade) + '/country/' + slug(country)
+        else:
+            url = '/partners'
+        url_args = {}
+        if search:
+            url_args['search'] = search
+        partner_count = partner_obj.search_count(
+            request.cr, SUPERUSER_ID, base_partner_domain,
+            context=request.context)
+        pager = request.website.pager(
+            url=url, total=partner_count, page=page, step=self._references_per_page, scope=7,
+            url_args=url_args)
+
+        # search partners matching current search parameters
+        partner_ids = partner_obj.search(
+            request.cr, SUPERUSER_ID, base_partner_domain,
+            offset=pager['offset'], limit=self._references_per_page,
+            order="grade_id DESC, partner_weight DESC",
+            context=request.context)
         google_map_partner_ids = ','.join(map(str, partner_ids))
         partners = partner_obj.browse(request.cr, SUPERUSER_ID, partner_ids, request.context)
 
-        # group by grade
-        grades = partner_obj.read_group(
-            request.cr, SUPERUSER_ID, base_partner_domain, ["id", "grade_id"],
-            groupby="grade_id", orderby="grade_id DESC", context=request.context)
-        grades_partners = partner_obj.search(
-            request.cr, SUPERUSER_ID, base_partner_domain,
-            context=request.context, count=True)
-        grades.insert(0, {
-            'grade_id_count': grades_partners,
-            'grade_id': (0, _("All Categories"))
-        })
-
         values = {
             'countries': countries,
-            'current_country_id': country_id,
             'current_country': country,
             'grades': grades,
-            'grade_id': grade_id,
+            'current_grade': grade,
             'partners': partners,
             'google_map_partner_ids': google_map_partner_ids,
             'pager': pager,
diff --git a/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
index 3e96bc12443..b43f7c1538a 100644
--- a/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
+++ b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
@@ -36,13 +36,13 @@
                 </h2>
             </div>
 
-            <div class="col-md-4 mb32" id="partner_left">
+            <div class="col-md-3 mb32" id="partner_left">
 
-                <ul class="nav nav-pills nav-stacked mt16">
-                    <li class="nav-header"><h3>Categories</h3></li>
+                <ul id="reseller_grades" class="nav nav-pills nav-stacked mt16">
+                    <li class="nav-header"><h3>Filter by Grade</h3></li>
                     <t t-foreach="grades" t-as="grade">
-                        <li t-if="grade['grade_id']" t-att-class="grade['grade_id'][0] == grade_id and 'active' or ''">
-                            <a t-attf-href="#{ grade['grade_id'][0] and '/partners/grade/%s' % grade['grade_id'][0] or '/partners' }#{ current_country_id and ('/country/%s' % current_country_id) or '' }#{ search_path }">
+                        <li t-att-class="grade['active'] and 'active' or ''">
+                            <a t-attf-href="/partners/#{ grade['grade_id'][0] and 'grade/%s/' % grade['grade_id'][0] or '' }#{ current_country and 'country/%s/' % slug(current_country) or '' }#{ search_path }">
                                 <span class="badge pull-right" t-esc="grade['grade_id_count'] or ''"/>
                                 <t t-esc="grade['grade_id'][1]"/> 
                             </a>
@@ -51,34 +51,26 @@
                 </ul>
 
                 <ul id="reseller_countries" class="nav nav-pills nav-stacked mt16">
-                    <li class="nav-header"><h3>Locations</h3></li>
-                    <t t-foreach="countries" t-as="country_dict">
-                        <t t-if="country_dict['country_id']">
-                            <li t-att-class="country_dict['country_id'][0] == current_country_id and 'active' or ''">
-                                <a t-attf-href="#{ country_dict['country_id'][0] and ('/partners/country/%s' % slug(country_dict['country_id'])) or '/partners' }#{ search_path }">
-                                    <span class="badge pull-right" t-esc="country_dict['country_id_count'] or ''"/>
-                                    <t t-esc="country_dict['country_id'][1]"/> 
-                                </a>
-                            </li>
-                        </t>
+                    <li class="nav-header"><h3>Filter by Country</h3></li>
+                    <t t-foreach="countries" t-as="country">
+                        <li t-att-class="country['active'] and 'active' or ''">
+                            <a t-attf-href="/partners/#{ current_grade and 'grade/%s/' % slug(current_grade) or ''}#{country['country_id'][0] and 'country/%s/' % country['country_id'][0] or '' }#{ search_path }">
+                                <span class="badge pull-right" t-esc="country['country_id_count'] or ''"/>
+                                <t t-esc="country['country_id'][1]"/> 
+                            </a>
+                        </li>
                     </t>
                 </ul>
 
             </div>
             
-            <div class="col-md-8" id="ref_content">
-                <div class='navbar'>
-                    <div>
-                        <t t-call="website.pager">
-                           <t t-set="classname">pull-left</t>
-                        </t>
-                        <form action="" method="get" class="navbar-search pull-right pagination form-inline">
-                            <div class="form-group">
-                                <input type="text" name="search" class="search-query col-md-2 mt4 form-control" placeholder="Search" t-att-value="searches.get('search', '')"/>
-                            </div>
-
-                        </form>
-                    </div>
+            <div class="col-md-9" id="ref_content">
+                <div class="pull-right">
+                    <form action="" method="get" class="navbar-search pull-right pagination form-inline">
+                        <div class="form-group">
+                            <input type="text" name="search" class="search-query col-md-2 mt4 form-control" placeholder="Search" t-att-value="searches.get('search', '')"/>
+                        </div>
+                    </form>
                 </div>
                 <div>
                     <p t-if="not partners">No result found</p>
@@ -94,7 +86,7 @@
                                t-field="partner.image_small"
                                t-field-options='{"widget": "image", "class": "media-object"}'
                             ></a>
-                            <div class="media-body" style="min-height: 64px;">
+                            <div class="media-body o_partner_body" style="min-height: 64px;">
                                 <a class="media-heading" t-attf-href="/partners/#{slug(partner)}">
                                     <span t-field="partner.display_name"/>
                                 </a>
@@ -102,7 +94,11 @@
                             </div>
                         </div>
                     </t>
-
+                </div>
+                <div class='navbar'>
+                    <t t-call="website.pager">
+                       <t t-set="classname">pull-left</t>
+                    </t>
                 </div>
             </div>
         </t>
@@ -113,8 +109,8 @@
     <xpath expr="//ul[@id='reseller_countries']" position="after">
         <h3>World Map</h3>
         <ul class="nav">
-            <iframe t-attf-src="/google_map/?width=320&amp;height=240&amp;partner_ids=#{ google_map_partner_ids }&amp;partner_url=/partners"
-                style="width:320px; height:260px; border:0; padding:0; margin:0;"></iframe>
+            <iframe t-attf-src="/google_map/?width=260&amp;height=240&amp;partner_ids=#{ google_map_partner_ids }&amp;partner_url=/partners"
+                style="width:260px; height:260px; border:0; padding:0; margin:0;"></iframe>
         </ul>
     </xpath>
 </template>

From 558063ed4c18b1955a0b6f85bf44c3428023141e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 16 May 2014 14:57:06 +0200
Subject: [PATCH 169/225] [IMP] website_customer: set explicit dependency to
 crvm_partner_assign; already present due to google_map, but explicit is
 better than implicit.

---
 addons/website_customer/__openerp__.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/website_customer/__openerp__.py b/addons/website_customer/__openerp__.py
index c0b620f78e1..c6d26dad04a 100644
--- a/addons/website_customer/__openerp__.py
+++ b/addons/website_customer/__openerp__.py
@@ -30,8 +30,9 @@ OpenERP Customer References
 """,
     'author': 'OpenERP SA',
     'depends': [
+        'crm_partner_assign',
         'website_partner',
-        'website_google_map'
+        'website_google_map',
     ],
     'demo': [
         'website_customer_demo.xml',

From e9ce6f6f743c463aa0d878617e412e2dfcdd6915 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 16 May 2014 14:57:44 +0200
Subject: [PATCH 170/225] [FIX] website_partner: css styling, add margin under
 partner image, before address

---
 addons/website_partner/views/website_partner_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_partner/views/website_partner_view.xml b/addons/website_partner/views/website_partner_view.xml
index 3a2466fb00b..32c1aa63bd3 100644
--- a/addons/website_partner/views/website_partner_view.xml
+++ b/addons/website_partner/views/website_partner_view.xml
@@ -23,7 +23,7 @@
     </t>
     <h1 class="col-md-12 text-center" id="partner_name" t-field="partner.display_name"/>
     <div class="col-md-4">
-        <div t-field="partner.image" t-field-options='{"widget": "image", "class": "center-block"}'/>
+        <div t-field="partner.image" t-field-options='{"widget": "image", "class": "center-block mb16"}'/>
         <address class="well">
              <div t-field="partner.self" t-field-options='{
                  "widget": "contact",

From 9530ff9fb5f9fdb798e93dde34676bd1420241b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 16 May 2014 14:58:11 +0200
Subject: [PATCH 171/225] [IMP] website_crm_partner_assign: moved search on top
 of page, added references block like for customers modules.

---
 .../views/website_crm_partner_assign.xml      | 43 +++++++++++++++----
 1 file changed, 35 insertions(+), 8 deletions(-)

diff --git a/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
index b43f7c1538a..aa617c266bf 100644
--- a/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
+++ b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
@@ -29,6 +29,12 @@
     <t t-call="website_crm_partner_assign.layout">
         <t t-set="ref_content">
             <div class="col-md-12">
+
+                <form action="" method="get" class="navbar-search pull-right pagination form-inline">
+                    <div class="form-group pull-right">
+                        <input type="text" name="search" class="search-query col-md-2 mt4 form-control" placeholder="Search" t-att-value="searches.get('search', '')"/>
+                    </div>
+                </form>
                 <h1 class="text-center">
                     Looking For a Local Store?
                 </h1><h2 class="text-center text-muted">
@@ -65,13 +71,6 @@
             </div>
             
             <div class="col-md-9" id="ref_content">
-                <div class="pull-right">
-                    <form action="" method="get" class="navbar-search pull-right pagination form-inline">
-                        <div class="form-group">
-                            <input type="text" name="search" class="search-query col-md-2 mt4 form-control" placeholder="Search" t-att-value="searches.get('search', '')"/>
-                        </div>
-                    </form>
-                </div>
                 <div>
                     <p t-if="not partners">No result found</p>
                     <t t-foreach="partners" t-as="partner">
@@ -91,6 +90,11 @@
                                     <span t-field="partner.display_name"/>
                                 </a>
                                 <div t-field="partner.website_short_description"/>
+                                <t t-if="any([p.website_published for p in partner.implemented_partner_ids])">
+                                    <small><a t-attf-href="/partners/#{slug(partner)}#right_column">
+                                        <t t-raw="len([p.website_published for p in partner.implemented_partner_ids])"/> reference(s)
+                                    </a></small>
+                                </t>
                             </div>
                         </div>
                     </t>
@@ -118,7 +122,11 @@
 <template id="partner" name="Partner Detail">
     <t t-call="website_crm_partner_assign.layout">
         <t t-set="ref_content">
-            <t t-call="website_partner.partner_detail"/>
+            <t t-call="website_partner.partner_detail">
+                <t t-set="right_column">
+                    <div id="right_column" class="mb16"><t t-call="website_customer.references_block"/></div>
+                </t>
+            </t>
         </t>
     </t>
 </template>
@@ -130,5 +138,24 @@
   </xpath>
 </template>
 
+<template id="references_block" name="Partner References Block">
+    <t t-if="any([p.website_published for p in partner.implemented_partner_ids])">
+        <h3 id="references">References</h3>
+        <div t-foreach="partner.implemented_partner_ids" t-as="reference" class="media">
+          <t t-if="reference.website_published">
+            <a class="pull-left" t-attf-href="/customers/#{slug(reference)}">
+                <span t-field="reference.image_small" t-field-options='{"widget": "image", "class": "center-block"}'/>
+            </a>
+            <div class="media-body" style="min-height: 64px;">
+                <a class="media-heading" t-attf-href="/customers/#{slug(reference)}">
+                    <span t-field="reference.self"/>
+                </a>
+                <div t-field='reference.website_short_description'/>
+            </div>
+          </t>
+        </div>
+    </t>
+</template>
+
 </data>
 </openerp>

From f90a37ea70f67f2a090c63c8b8d606640e89f8f3 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Fri, 16 May 2014 15:31:26 +0200
Subject: [PATCH 172/225] [IMP] sitemap caches it's output in ir.attachment

---
 addons/website/controllers/main.py         | 109 +++++++++++----------
 addons/website/views/website_templates.xml |  16 +--
 2 files changed, 68 insertions(+), 57 deletions(-)

diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py
index b1e414c8a33..df958d969dd 100644
--- a/addons/website/controllers/main.py
+++ b/addons/website/controllers/main.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 import cStringIO
+import datetime
 from itertools import islice
 import json
 import logging
-import math
 import re
 
 from sys import maxint
@@ -13,8 +13,6 @@ import werkzeug.wrappers
 from PIL import Image
 
 import openerp
-from openerp.osv import fields
-from openerp.addons.website.models import website
 from openerp.addons.web import http
 from openerp.http import request, Response
 
@@ -23,24 +21,7 @@ logger = logging.getLogger(__name__)
 # Completely arbitrary limits
 MAX_IMAGE_WIDTH, MAX_IMAGE_HEIGHT = IMAGE_LIMITS = (1024, 768)
 LOC_PER_SITEMAP = 45000
-
-import time
-
-from functools import wraps
-
-def timeit(f):
-    @wraps(f)
-    def wrapper(*args, **kw):
-        ts = time.time()
-        result = f(*args, **kw)
-        te = time.time()
-
-        print 'func:%r args:[%r, %r] took: %2.4f sec' % \
-          (f.__name__, args, kw, te-ts)
-        return result
-    return wrapper
-
-
+SITEMAP_CACHE_TIME = datetime.timedelta(hours=6)
 
 class Website(openerp.addons.web.controllers.main.Home):
     #------------------------------------------------------
@@ -87,40 +68,66 @@ class Website(openerp.addons.web.controllers.main.Home):
     def robots(self):
         return request.render('website.robots', {'url_root': request.httprequest.url_root}, mimetype='text/plain')
 
-    @timeit
     @http.route('/sitemap.xml', type='http', auth="public", website=True)
     def sitemap_xml_index(self):
-        count = 0
-        for loc in request.website.enumerate_pages():
-            count += 1
-        if count <= LOC_PER_SITEMAP:
-            return self.__sitemap_xml(0)
-        # Sitemaps must be split in several smaller files with a sitemap index
-        values = {
-            'pages': range(int(math.ceil(float(count) / LOC_PER_SITEMAP))),
-            'url_root': request.httprequest.url_root
-        }
-        headers = {
-            'Content-Type': 'application/xml;charset=utf-8',
-        }
-        return request.render('website.sitemap_index_xml', values, headers=headers)
+        cr, uid, context = request.cr, openerp.SUPERUSER_ID, request.context
+        ira = request.registry['ir.attachment']
+        iuv = request.registry['ir.ui.view']
+        mimetype ='application/xml;charset=utf-8'
+        content = None
 
-    @http.route('/sitemap-<int:page>.xml', type='http', auth="public", website=True)
-    def sitemap_xml(self, page):
-        return self.__sitemap_xml(page)
+        def create_map(url, content):
+            ira.create(cr, uid, dict(
+                datas=content.encode('base64'),
+                mimetype=mimetype,
+                type='binary',
+                name=url,
+                url=url,
+            ), context=context)
 
-    @timeit
-    def __sitemap_xml(self, index=0):
-        start = index * LOC_PER_SITEMAP
-        locs = islice(request.website.enumerate_pages(), start , start + LOC_PER_SITEMAP)
-        values = {
-            'locs': locs,
-            'url_root': request.httprequest.url_root.rstrip('/')
-        }
-        headers = {
-            'Content-Type': 'application/xml;charset=utf-8',
-        }
-        return request.render('website.sitemap_xml', values, headers=headers)
+        sitemap = ira.search_read(cr, uid, [('url', '=' , '/sitemap.xml'), ('type', '=', 'binary')], ('datas', 'create_date'), context=context)
+        if sitemap:
+            # Check if stored version is still valid
+            server_format = openerp.tools.misc.DEFAULT_SERVER_DATETIME_FORMAT
+            create_date = datetime.datetime.strptime(sitemap[0]['create_date'], server_format)
+            delta = datetime.datetime.now() - create_date
+            if delta < SITEMAP_CACHE_TIME:
+                content = sitemap[0]['datas'].decode('base64')
+
+        if not content:
+            # Remove all sitemaps in ir.attachments as we're going to regenerated them
+            sitemap_ids = ira.search(cr, uid, [('url', '=like' , '/sitemap%.xml'), ('type', '=', 'binary')], context=context)
+            if sitemap_ids:
+                ira.unlink(cr, uid, sitemap_ids, context=context)
+
+            pages = 0
+            first_page = None
+            locs = request.website.enumerate_pages()
+            while True:
+                start = pages * LOC_PER_SITEMAP
+                loc_slice = islice(locs, start, start + LOC_PER_SITEMAP)
+                urls = iuv.render(cr, uid, 'website.sitemap_locs', dict(locs=loc_slice), context=context)
+                if urls.strip():
+                    page = iuv.render(cr, uid, 'website.sitemap_xml', dict(content=urls), context=context)
+                    if not first_page:
+                        first_page = page
+                    pages += 1
+                    create_map('/sitemap-%d.xml' % pages, page)
+                else:
+                    break
+            if not pages:
+                return request.not_found()
+            elif pages == 1:
+                content = first_page
+            else:
+                # Sitemaps must be split in several smaller files with a sitemap index
+                content = iuv.render(cr, uid, 'website.sitemap_index_xml', dict(
+                    pages=range(1, pages + 1),
+                    url_root=request.httprequest.url_root,
+                ), context=context)
+            create_map('/sitemap.xml', content)
+
+        return request.make_response(content, [('Content-Type', mimetype)])
 
     #------------------------------------------------------
     # Edit
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index 3611645cbf5..c322528764a 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -697,14 +697,18 @@ User-agent: *
 Sitemap: <t t-esc="url_root"/>sitemap.xml
 </template>
 
+<template id="sitemap_locs">
+    <url t-foreach="locs" t-as="page">
+        <loc><t t-esc="url_root"/><t t-esc="page['loc']"/></loc><t t-if="page.get('lastmod', False)">
+        <lastmod t-esc="page['lastmod']"/></t><t t-if="page.get('priority', False)">
+        <priority t-esc="page['priority']"/></t><t t-if="page.get('changefreq', False)">
+        <changefreq t-esc="page['changefreq']"/></t>
+    </url>
+</template>
+
 <template id="sitemap_xml">&lt;?xml version="1.0" encoding="UTF-8"?&gt;
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
-  <url t-foreach="locs" t-as="page">
-    <loc><t t-esc="url_root"/><t t-esc="page['loc']"/></loc><t t-if="page.get('lastmod', False)">
-    <lastmod t-esc="page['lastmod']"/></t><t t-if="page.get('priority', False)">
-    <priority t-esc="page['priority']"/></t><t t-if="page.get('changefreq', False)">
-    <changefreq t-esc="page['changefreq']"/></t>
-  </url>
+    <t t-raw="content"/>
 </urlset>
 </template>
 

From 726fad8832b6258beb588861d003a7fc196d0519 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 16 May 2014 16:09:27 +0200
Subject: [PATCH 173/225] [IMP] res_partner: added a hook to be sure the
 website is correctly formated. Otherwise the website may consider the website
 field as local for address like www.odoo.com

---
 openerp/addons/base/res/res_partner.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index 6ed0a845dcf..13750611ba1 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -23,6 +23,7 @@ import datetime
 from lxml import etree
 import math
 import pytz
+import urlparse
 
 import openerp
 from openerp import SUPERUSER_ID
@@ -507,6 +508,14 @@ class res_partner(osv.osv, format_address):
             if not parent.is_company:
                 parent.write({'is_company': True})
 
+    def _clean_website(self, website):
+        (scheme, netloc, path, params, query, fragment) = urlparse.urlparse(website)
+        if not scheme:
+            if not netloc:
+                netloc, path = path, ''
+            website = urlparse.urlunparse(('http', netloc, path, params, query, fragment))
+        return website
+
     def write(self, cr, uid, ids, vals, context=None):
         if isinstance(ids, (int, long)):
             ids = [ids]
@@ -514,6 +523,8 @@ class res_partner(osv.osv, format_address):
         #is the same as the company of all users that inherit from this partner
         #(this is to allow the code from res_users to write to the partner!) or
         #if setting the company_id to False (this is compatible with any user company)
+        if vals.get('website'):
+            vals['website'] = self._clean_website(vals['website'])
         if vals.get('company_id'):
             for partner in self.browse(cr, uid, ids, context=context):
                 if partner.user_ids:
@@ -526,6 +537,8 @@ class res_partner(osv.osv, format_address):
         return result
 
     def create(self, cr, uid, vals, context=None):
+        if vals.get('website'):
+            vals['website'] = self._clean_website(vals['website'])
         new_id = super(res_partner, self).create(cr, uid, vals, context=context)
         partner = self.browse(cr, uid, new_id, context=context)
         self._fields_sync(cr, uid, partner, vals, context)

From 93c4e0da57511eaab1d441cb29ae4d4016cae8ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 16 May 2014 16:28:55 +0200
Subject: [PATCH 174/225] [IMP] crm_partner_assign: added computed field
 counting the number of references of a partner. This allows to order / filter
 / do whatever you want with the number of references.

---
 .../crm_partner_assign/crm_partner_assign.py  | 21 +++++++++++++++++++
 .../crm_partner_assign/res_partner_view.xml   |  1 +
 2 files changed, 22 insertions(+)

diff --git a/addons/crm_partner_assign/crm_partner_assign.py b/addons/crm_partner_assign/crm_partner_assign.py
index 046babccf73..317d1f289eb 100644
--- a/addons/crm_partner_assign/crm_partner_assign.py
+++ b/addons/crm_partner_assign/crm_partner_assign.py
@@ -53,6 +53,22 @@ class res_partner_activation(osv.osv):
 
 class res_partner(osv.osv):
     _inherit = "res.partner"
+
+    def _get_implemented_count(self, cr, uid, ids, field_name, arg, context):
+        res = dict.fromkeys(ids, 0)
+        for partner in self.browse(cr, uid, ids, context=context):
+            res[partner.id] = len(partner.implemented_partner_ids)
+        return res
+
+    def _get_partner_from_implementation(self, cr, uid, ids, context=None):
+        pids = set()
+        for partner in self.browse(cr, uid, ids, context=context):
+            pids.add(partner.id)
+            if partner.assigned_partner_id:
+                pids.add(partner.assigned_partner_id.id)
+            pids = pids | set([p.id for p in partner.implemented_partner_ids])
+        return list(pids)
+
     _columns = {
         'partner_weight': fields.integer('Grade Weight',
             help="Gives the probability to assign a lead to this partner. (0 means no assignation.)"),
@@ -71,6 +87,11 @@ class res_partner(osv.osv):
             'res.partner', 'assigned_partner_id',
             string='Implementation References',
         ),
+        'implemented_count': fields.function(
+            _get_implemented_count, string="Implementations", type='integer',
+            store={
+                'res.partner': (_get_partner_from_implementation, ['assigned_partner_id', 'implemented_partner_ids'], 10),
+            }),
     }
     _defaults = {
         'partner_weight': lambda *args: 0
diff --git a/addons/crm_partner_assign/res_partner_view.xml b/addons/crm_partner_assign/res_partner_view.xml
index c298832a2e6..67ac508ef00 100644
--- a/addons/crm_partner_assign/res_partner_view.xml
+++ b/addons/crm_partner_assign/res_partner_view.xml
@@ -112,6 +112,7 @@
                             <field name="grade_id" widget="selection"/>
                             <field name="activation" widget="selection"/>
                             <field name="partner_weight"/>
+                            <field name="assigned_partner_id"/>
                         </group>
                         <group>
                             <separator string="Partner Review" colspan="2"/>

From 2ed511855f41bf9f0780219abe5f540e859eea06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 16 May 2014 16:29:36 +0200
Subject: [PATCH 175/225] [IMP] website_partner_crm: display partners in a
 category ordered by descending number of references + some tweaking in the
 view.

---
 .../controllers/main.py                       |  2 +-
 .../views/website_crm_partner_assign.xml      | 22 +++++++++++--------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/addons/website_crm_partner_assign/controllers/main.py b/addons/website_crm_partner_assign/controllers/main.py
index c9621b7a0e9..86018ecd04d 100644
--- a/addons/website_crm_partner_assign/controllers/main.py
+++ b/addons/website_crm_partner_assign/controllers/main.py
@@ -101,7 +101,7 @@ class WebsiteCrmPartnerAssign(http.Controller):
         partner_ids = partner_obj.search(
             request.cr, SUPERUSER_ID, base_partner_domain,
             offset=pager['offset'], limit=self._references_per_page,
-            order="grade_id DESC, partner_weight DESC",
+            order="grade_id DESC, implemented_count DESC",
             context=request.context)
         google_map_partner_ids = ','.join(map(str, partner_ids))
         partners = partner_obj.browse(request.cr, SUPERUSER_ID, partner_ids, request.context)
diff --git a/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
index aa617c266bf..0dbfcdb15fc 100644
--- a/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
+++ b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
@@ -29,12 +29,6 @@
     <t t-call="website_crm_partner_assign.layout">
         <t t-set="ref_content">
             <div class="col-md-12">
-
-                <form action="" method="get" class="navbar-search pull-right pagination form-inline">
-                    <div class="form-group pull-right">
-                        <input type="text" name="search" class="search-query col-md-2 mt4 form-control" placeholder="Search" t-att-value="searches.get('search', '')"/>
-                    </div>
-                </form>
                 <h1 class="text-center">
                     Looking For a Local Store?
                 </h1><h2 class="text-center text-muted">
@@ -70,7 +64,17 @@
 
             </div>
             
-            <div class="col-md-9" id="ref_content">
+            <div class="col-md-8 col-md-offset-1" id="ref_content">
+                <div class='navbar'>
+                    <div>
+                        <t t-call="website.pager"/>
+                        <form action="" method="get" class="navbar-search pull-right pagination form-inline">
+                            <div class="form-group pull-right">
+                                <input type="text" name="search" class="search-query col-md-2 mt4 form-control" placeholder="Search" t-att-value="searches.get('search', '')"/>
+                            </div>
+                        </form>
+                    </div>
+                </div>
                 <div>
                     <p t-if="not partners">No result found</p>
                     <t t-foreach="partners" t-as="partner">
@@ -90,9 +94,9 @@
                                     <span t-field="partner.display_name"/>
                                 </a>
                                 <div t-field="partner.website_short_description"/>
-                                <t t-if="any([p.website_published for p in partner.implemented_partner_ids])">
+                                <t t-if="partner.implemented_count">
                                     <small><a t-attf-href="/partners/#{slug(partner)}#right_column">
-                                        <t t-raw="len([p.website_published for p in partner.implemented_partner_ids])"/> reference(s)
+                                        <t t-raw="partner.implemented_count"/> reference(s)
                                     </a></small>
                                 </t>
                             </div>

From 2ece5f9c4cd010108d16f008d9ef40e66ff1bc6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 16 May 2014 16:47:12 +0200
Subject: [PATCH 176/225] [IMP] website_customer: add an offset on the main
 content of customer display

---
 addons/website_customer/views/website_customer.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_customer/views/website_customer.xml b/addons/website_customer/views/website_customer.xml
index a2a5fc99c16..a41d5b77f5a 100644
--- a/addons/website_customer/views/website_customer.xml
+++ b/addons/website_customer/views/website_customer.xml
@@ -25,7 +25,7 @@
                 <div class="row">
                     <div class="col-md-3 mb32" id="ref_left_column">
                     </div>
-                    <div class="col-md-9" id="ref_content">
+                    <div class="col-md-8 col-md-offset-1" id="ref_content">
                         <div class='navbar mb0'>
                             <t t-call="website.pager">
                                <t t-set="classname" t-value="'pull-left'"/>

From e30aae504478f99b9244499ec69a583de2f7fb6d Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 16 May 2014 16:47:29 +0200
Subject: [PATCH 177/225] [FIX] website_quote: message_post expects the
 attachments to be NOT in base64 format (opw 607477)

---
 addons/website_quote/controllers/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_quote/controllers/main.py b/addons/website_quote/controllers/main.py
index a5f6ad2cfa6..6bb3b726edb 100644
--- a/addons/website_quote/controllers/main.py
+++ b/addons/website_quote/controllers/main.py
@@ -65,7 +65,7 @@ class sale_quote(http.Controller):
         order = order_obj.browse(request.cr, SUPERUSER_ID, order_id)
         if token != order.access_token:
             return request.website.render('website.404')
-        attachments=sign and [('signature.png', sign)] or []
+        attachments=sign and [('signature.png', sign.decode('base64'))] or []
         order_obj.signal_order_confirm(request.cr, SUPERUSER_ID, [order_id], context=request.context)
         message = _('Order signed by %s') % (signer,)
         self.__message_post(message, order_id, type='comment', subtype='mt_comment', attachments=attachments)

From a6b92693988b8ebe424417c325afd1bca4194cf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 16 May 2014 17:14:03 +0200
Subject: [PATCH 178/225] [REF] Achieved the same result with a sorting to
 avoid having to add a field in stable release

---
 .../crm_partner_assign/crm_partner_assign.py  | 39 ++++++++++---------
 .../controllers/main.py                       | 11 ++++--
 .../views/website_crm_partner_assign.xml      |  4 +-
 3 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/addons/crm_partner_assign/crm_partner_assign.py b/addons/crm_partner_assign/crm_partner_assign.py
index 317d1f289eb..dac23ecae32 100644
--- a/addons/crm_partner_assign/crm_partner_assign.py
+++ b/addons/crm_partner_assign/crm_partner_assign.py
@@ -54,20 +54,22 @@ class res_partner_activation(osv.osv):
 class res_partner(osv.osv):
     _inherit = "res.partner"
 
-    def _get_implemented_count(self, cr, uid, ids, field_name, arg, context):
-        res = dict.fromkeys(ids, 0)
-        for partner in self.browse(cr, uid, ids, context=context):
-            res[partner.id] = len(partner.implemented_partner_ids)
-        return res
+    # uncomment me in trunk
+    # def _get_implemented_count(self, cr, uid, ids, field_name, arg, context):
+    #     res = dict.fromkeys(ids, 0)
+    #     for partner in self.browse(cr, uid, ids, context=context):
+    #         res[partner.id] = len(partner.implemented_partner_ids)
+    #     return res
 
-    def _get_partner_from_implementation(self, cr, uid, ids, context=None):
-        pids = set()
-        for partner in self.browse(cr, uid, ids, context=context):
-            pids.add(partner.id)
-            if partner.assigned_partner_id:
-                pids.add(partner.assigned_partner_id.id)
-            pids = pids | set([p.id for p in partner.implemented_partner_ids])
-        return list(pids)
+    # uncomment me in trunk
+    # def _get_partner_from_implementation(self, cr, uid, ids, context=None):
+    #     pids = set()
+    #     for partner in self.browse(cr, uid, ids, context=context):
+    #         pids.add(partner.id)
+    #         if partner.assigned_partner_id:
+    #             pids.add(partner.assigned_partner_id.id)
+    #         pids = pids | set([p.id for p in partner.implemented_partner_ids])
+    #     return list(pids)
 
     _columns = {
         'partner_weight': fields.integer('Grade Weight',
@@ -87,11 +89,12 @@ class res_partner(osv.osv):
             'res.partner', 'assigned_partner_id',
             string='Implementation References',
         ),
-        'implemented_count': fields.function(
-            _get_implemented_count, string="Implementations", type='integer',
-            store={
-                'res.partner': (_get_partner_from_implementation, ['assigned_partner_id', 'implemented_partner_ids'], 10),
-            }),
+        # uncomment me in trunk
+        # 'implemented_count': fields.function(
+        #     _get_implemented_count, string="Implementations", type='integer',
+        #     store={
+        #         'res.partner': (_get_partner_from_implementation, ['assigned_partner_id', 'implemented_partner_ids'], 10),
+        #     }),
     }
     _defaults = {
         'partner_weight': lambda *args: 0
diff --git a/addons/website_crm_partner_assign/controllers/main.py b/addons/website_crm_partner_assign/controllers/main.py
index 86018ecd04d..3dd96798d09 100644
--- a/addons/website_crm_partner_assign/controllers/main.py
+++ b/addons/website_crm_partner_assign/controllers/main.py
@@ -100,11 +100,14 @@ class WebsiteCrmPartnerAssign(http.Controller):
         # search partners matching current search parameters
         partner_ids = partner_obj.search(
             request.cr, SUPERUSER_ID, base_partner_domain,
-            offset=pager['offset'], limit=self._references_per_page,
-            order="grade_id DESC, implemented_count DESC",
-            context=request.context)
-        google_map_partner_ids = ','.join(map(str, partner_ids))
+            order="grade_id DESC",
+            context=request.context)  # todo in trunk: order="grade_id DESC, implemented_count DESC", offset=pager['offset'], limit=self._references_per_page
         partners = partner_obj.browse(request.cr, SUPERUSER_ID, partner_ids, request.context)
+        # remove me in trunk
+        partners.sort(key=lambda x: (-1 * (x.grade_id and x.grade_id.id or 0), len(x.implemented_partner_ids)), reverse=True)
+        partners = partners[pager['offset']:pager['offset'] + self._references_per_page]
+
+        google_map_partner_ids = ','.join(map(str, [p.id for p in partners]))
 
         values = {
             'countries': countries,
diff --git a/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
index 0dbfcdb15fc..b215a14e6cb 100644
--- a/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
+++ b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
@@ -94,9 +94,9 @@
                                     <span t-field="partner.display_name"/>
                                 </a>
                                 <div t-field="partner.website_short_description"/>
-                                <t t-if="partner.implemented_count">
+                                <t t-if="any([p.website_published for p in partner.implemented_partner_ids])">
                                     <small><a t-attf-href="/partners/#{slug(partner)}#right_column">
-                                        <t t-raw="partner.implemented_count"/> reference(s)
+                                        <t t-raw="len([p for p in partner.implemented_partner_ids if p.website_published])"/> reference(s)
                                     </a></small>
                                 </t>
                             </div>

From d6e407d1ec7b39fd69c492484fe30a6aeade7d82 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Sat, 17 May 2014 06:42:08 +0000
Subject: [PATCH 179/225] Launchpad automatic translations update.

---
 openerp/addons/base/i18n/ab.po       |    4 +-
 openerp/addons/base/i18n/af.po       |    4 +-
 openerp/addons/base/i18n/am.po       |    4 +-
 openerp/addons/base/i18n/ar.po       |    4 +-
 openerp/addons/base/i18n/bg.po       |    6 +-
 openerp/addons/base/i18n/bn.po       |    4 +-
 openerp/addons/base/i18n/bs.po       |    4 +-
 openerp/addons/base/i18n/ca.po       |    4 +-
 openerp/addons/base/i18n/cs.po       |    4 +-
 openerp/addons/base/i18n/da.po       |    4 +-
 openerp/addons/base/i18n/de.po       |    4 +-
 openerp/addons/base/i18n/el.po       |    4 +-
 openerp/addons/base/i18n/en_GB.po    |    4 +-
 openerp/addons/base/i18n/es.po       |    6 +-
 openerp/addons/base/i18n/es_AR.po    |    4 +-
 openerp/addons/base/i18n/es_BO.po    |    4 +-
 openerp/addons/base/i18n/es_CL.po    |    4 +-
 openerp/addons/base/i18n/es_CR.po    |    4 +-
 openerp/addons/base/i18n/es_DO.po    |    4 +-
 openerp/addons/base/i18n/es_EC.po    |    4 +-
 openerp/addons/base/i18n/es_MX.po    |    4 +-
 openerp/addons/base/i18n/es_PE.po    |    4 +-
 openerp/addons/base/i18n/es_VE.po    |    4 +-
 openerp/addons/base/i18n/et.po       |    4 +-
 openerp/addons/base/i18n/eu.po       |    4 +-
 openerp/addons/base/i18n/fa.po       |    4 +-
 openerp/addons/base/i18n/fa_AF.po    |    4 +-
 openerp/addons/base/i18n/fi.po       |    4 +-
 openerp/addons/base/i18n/fr.po       |    4 +-
 openerp/addons/base/i18n/fr_CA.po    |    4 +-
 openerp/addons/base/i18n/gl.po       |    4 +-
 openerp/addons/base/i18n/gu.po       |    4 +-
 openerp/addons/base/i18n/he.po       |    4 +-
 openerp/addons/base/i18n/hi.po       |    4 +-
 openerp/addons/base/i18n/hr.po       |    4 +-
 openerp/addons/base/i18n/hu.po       |    4 +-
 openerp/addons/base/i18n/hy.po       |    4 +-
 openerp/addons/base/i18n/id.po       |    4 +-
 openerp/addons/base/i18n/is.po       |    4 +-
 openerp/addons/base/i18n/it.po       |    4 +-
 openerp/addons/base/i18n/ja.po       |    4 +-
 openerp/addons/base/i18n/ka.po       |    4 +-
 openerp/addons/base/i18n/kk.po       |    4 +-
 openerp/addons/base/i18n/ko.po       |    4 +-
 openerp/addons/base/i18n/lt.po       |    4 +-
 openerp/addons/base/i18n/lv.po       |    4 +-
 openerp/addons/base/i18n/mk.po       |    4 +-
 openerp/addons/base/i18n/mn.po       |    4 +-
 openerp/addons/base/i18n/nb.po       | 1718 ++++++++++++++++++--------
 openerp/addons/base/i18n/nl.po       |    4 +-
 openerp/addons/base/i18n/nl_BE.po    |    4 +-
 openerp/addons/base/i18n/pl.po       |    4 +-
 openerp/addons/base/i18n/pt.po       |    4 +-
 openerp/addons/base/i18n/pt_BR.po    |    4 +-
 openerp/addons/base/i18n/ro.po       |    4 +-
 openerp/addons/base/i18n/ru.po       |    4 +-
 openerp/addons/base/i18n/sk.po       |    4 +-
 openerp/addons/base/i18n/sl.po       |    4 +-
 openerp/addons/base/i18n/sq.po       |    4 +-
 openerp/addons/base/i18n/sr.po       |    4 +-
 openerp/addons/base/i18n/sr@latin.po |    4 +-
 openerp/addons/base/i18n/sv.po       |    4 +-
 openerp/addons/base/i18n/th.po       |    4 +-
 openerp/addons/base/i18n/tlh.po      |    4 +-
 openerp/addons/base/i18n/tr.po       |    4 +-
 openerp/addons/base/i18n/uk.po       |    4 +-
 openerp/addons/base/i18n/ur.po       |    4 +-
 openerp/addons/base/i18n/vi.po       |    4 +-
 openerp/addons/base/i18n/zh_CN.po    |    4 +-
 openerp/addons/base/i18n/zh_HK.po    |    4 +-
 openerp/addons/base/i18n/zh_TW.po    |    4 +-
 71 files changed, 1356 insertions(+), 646 deletions(-)

diff --git a/openerp/addons/base/i18n/ab.po b/openerp/addons/base/i18n/ab.po
index 870ebabd8e8..d86d1c67920 100644
--- a/openerp/addons/base/i18n/ab.po
+++ b/openerp/addons/base/i18n/ab.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-06 05:51+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-17 06:24+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/af.po b/openerp/addons/base/i18n/af.po
index 2b1994c5204..64c58334bc4 100644
--- a/openerp/addons/base/i18n/af.po
+++ b/openerp/addons/base/i18n/af.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-06 05:52+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-17 06:24+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/am.po b/openerp/addons/base/i18n/am.po
index 3b832b93201..d1cf924cd7c 100644
--- a/openerp/addons/base/i18n/am.po
+++ b/openerp/addons/base/i18n/am.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-06 05:52+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-17 06:25+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/ar.po b/openerp/addons/base/i18n/ar.po
index 7dd50a3426b..cc292c2e420 100644
--- a/openerp/addons/base/i18n/ar.po
+++ b/openerp/addons/base/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-06 05:52+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-17 06:25+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/bg.po b/openerp/addons/base/i18n/bg.po
index 9c3351be8d1..744c59fe980 100644
--- a/openerp/addons/base/i18n/bg.po
+++ b/openerp/addons/base/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-06 05:54+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-17 06:26+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -15398,7 +15398,7 @@ msgstr "Перспектива"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_stock_invoice_directly
 msgid "Invoice Picking Directly"
-msgstr ""
+msgstr "Фактуриране и директно натоварване"
 
 #. module: base
 #: selection:base.language.install,lang:0
diff --git a/openerp/addons/base/i18n/bn.po b/openerp/addons/base/i18n/bn.po
index 1cc50b2d26f..30d09be9f56 100644
--- a/openerp/addons/base/i18n/bn.po
+++ b/openerp/addons/base/i18n/bn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-06 05:53+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-17 06:26+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/bs.po b/openerp/addons/base/i18n/bs.po
index a84d31f1f79..14c7e5099a1 100644
--- a/openerp/addons/base/i18n/bs.po
+++ b/openerp/addons/base/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-06 05:53+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-17 06:26+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/ca.po b/openerp/addons/base/i18n/ca.po
index 635d5668296..20dee3e7115 100644
--- a/openerp/addons/base/i18n/ca.po
+++ b/openerp/addons/base/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-06 05:54+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-17 06:26+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/cs.po b/openerp/addons/base/i18n/cs.po
index 01f2d215a58..8343a9caf02 100644
--- a/openerp/addons/base/i18n/cs.po
+++ b/openerp/addons/base/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-09 06:46+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-17 06:27+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/da.po b/openerp/addons/base/i18n/da.po
index 9ded5f6234e..e3ae0cc437d 100644
--- a/openerp/addons/base/i18n/da.po
+++ b/openerp/addons/base/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-06 05:54+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-17 06:27+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/de.po b/openerp/addons/base/i18n/de.po
index 377d4dad7bd..76956519a17 100644
--- a/openerp/addons/base/i18n/de.po
+++ b/openerp/addons/base/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-06 05:56+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-17 06:29+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/el.po b/openerp/addons/base/i18n/el.po
index f900b4c480b..a5c960cd831 100644
--- a/openerp/addons/base/i18n/el.po
+++ b/openerp/addons/base/i18n/el.po
@@ -12,8 +12,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-06 05:57+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-17 06:29+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/openerp/addons/base/i18n/en_GB.po b/openerp/addons/base/i18n/en_GB.po
index 61720794a5a..0ff811d39a2 100644
--- a/openerp/addons/base/i18n/en_GB.po
+++ b/openerp/addons/base/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-06 06:09+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-17 06:39+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/es.po b/openerp/addons/base/i18n/es.po
index b43446b6735..92078c6ca2b 100644
--- a/openerp/addons/base/i18n/es.po
+++ b/openerp/addons/base/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-06 06:05+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-17 06:36+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -1333,7 +1333,7 @@ msgid ""
 msgstr ""
 "\n"
 "El genérico de OpenERP para la gestión de relaciones con el cliente (CRM)\n"
-"==========================================================\n"
+"=========================================================================\n"
 "\n"
 "Esta aplicación permite que grupo de personas gestione iniciativas de forma "
 "inteligente y eficaz, oportunidades, reuniones y llamadas.\n"
diff --git a/openerp/addons/base/i18n/es_AR.po b/openerp/addons/base/i18n/es_AR.po
index 957f73ecd8f..2f6604a371e 100644
--- a/openerp/addons/base/i18n/es_AR.po
+++ b/openerp/addons/base/i18n/es_AR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-06 06:09+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-17 06:38+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/es_BO.po b/openerp/addons/base/i18n/es_BO.po
index a267209314e..ca1a26eacdb 100644
--- a/openerp/addons/base/i18n/es_BO.po
+++ b/openerp/addons/base/i18n/es_BO.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-06 06:11+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-17 06:40+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/es_CL.po b/openerp/addons/base/i18n/es_CL.po
index aa18cb054f0..0845bb9ec3d 100644
--- a/openerp/addons/base/i18n/es_CL.po
+++ b/openerp/addons/base/i18n/es_CL.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-06 06:10+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-17 06:39+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/es_CR.po b/openerp/addons/base/i18n/es_CR.po
index 9b3c3326f63..96ae940fabb 100644
--- a/openerp/addons/base/i18n/es_CR.po
+++ b/openerp/addons/base/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-06 06:11+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-17 06:40+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 "Language: \n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/es_DO.po b/openerp/addons/base/i18n/es_DO.po
index 50a34a83553..5f51a8870cb 100644
--- a/openerp/addons/base/i18n/es_DO.po
+++ b/openerp/addons/base/i18n/es_DO.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-06 06:09+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-17 06:39+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/es_EC.po b/openerp/addons/base/i18n/es_EC.po
index 43f1df3dd38..3e4d5e24503 100644
--- a/openerp/addons/base/i18n/es_EC.po
+++ b/openerp/addons/base/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-06 06:12+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-17 06:41+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/es_MX.po b/openerp/addons/base/i18n/es_MX.po
index 7abdb2c86b2..4f74be977b7 100644
--- a/openerp/addons/base/i18n/es_MX.po
+++ b/openerp/addons/base/i18n/es_MX.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-06 06:12+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-17 06:41+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/es_PE.po b/openerp/addons/base/i18n/es_PE.po
index 2e60c55a006..7a55163ccd7 100644
--- a/openerp/addons/base/i18n/es_PE.po
+++ b/openerp/addons/base/i18n/es_PE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-06 06:13+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-17 06:41+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/es_VE.po b/openerp/addons/base/i18n/es_VE.po
index d6ae5a2953b..395bbad9552 100644
--- a/openerp/addons/base/i18n/es_VE.po
+++ b/openerp/addons/base/i18n/es_VE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-06 06:08+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-17 06:38+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/et.po b/openerp/addons/base/i18n/et.po
index 8ee1f403225..f06c92ff753 100644
--- a/openerp/addons/base/i18n/et.po
+++ b/openerp/addons/base/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-17 06:27+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/eu.po b/openerp/addons/base/i18n/eu.po
index d87146e16b5..43680dffd08 100644
--- a/openerp/addons/base/i18n/eu.po
+++ b/openerp/addons/base/i18n/eu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-06 05:53+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-17 06:25+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/fa.po b/openerp/addons/base/i18n/fa.po
index 3043750c2e7..1a6addde9a3 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: 2014-05-06 06:02+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-17 06:34+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 "X-Poedit-Country: IRAN, ISLAMIC REPUBLIC OF\n"
 "X-Poedit-Language: Persian\n"
 
diff --git a/openerp/addons/base/i18n/fa_AF.po b/openerp/addons/base/i18n/fa_AF.po
index a44e95bbd8d..6ff17e3986a 100644
--- a/openerp/addons/base/i18n/fa_AF.po
+++ b/openerp/addons/base/i18n/fa_AF.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-06 06:13+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-17 06:41+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/fi.po b/openerp/addons/base/i18n/fi.po
index 89aab204cfa..e3cf1ddf5da 100644
--- a/openerp/addons/base/i18n/fi.po
+++ b/openerp/addons/base/i18n/fi.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-17 06:28+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/fr.po b/openerp/addons/base/i18n/fr.po
index 34374b84746..8cd4927942a 100644
--- a/openerp/addons/base/i18n/fr.po
+++ b/openerp/addons/base/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-06 05:56+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-17 06:28+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/fr_CA.po b/openerp/addons/base/i18n/fr_CA.po
index 1b7eaedfeed..34a3dc0c6a3 100644
--- a/openerp/addons/base/i18n/fr_CA.po
+++ b/openerp/addons/base/i18n/fr_CA.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-06 06:10+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-17 06:39+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/gl.po b/openerp/addons/base/i18n/gl.po
index 08f05545ea0..a78699405b0 100644
--- a/openerp/addons/base/i18n/gl.po
+++ b/openerp/addons/base/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-06 05:56+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-17 06:29+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/gu.po b/openerp/addons/base/i18n/gu.po
index 300f118f81d..fe659adad5a 100644
--- a/openerp/addons/base/i18n/gu.po
+++ b/openerp/addons/base/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-06 05:57+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-17 06:29+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/he.po b/openerp/addons/base/i18n/he.po
index bfe52cdf813..b239d2ff1da 100644
--- a/openerp/addons/base/i18n/he.po
+++ b/openerp/addons/base/i18n/he.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-06 05:57+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-17 06:29+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/hi.po b/openerp/addons/base/i18n/hi.po
index cf0cfc899d8..5452c161091 100644
--- a/openerp/addons/base/i18n/hi.po
+++ b/openerp/addons/base/i18n/hi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-06 05:57+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-17 06:30+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/hr.po b/openerp/addons/base/i18n/hr.po
index 4b5f6ed9f86..9839e4732e1 100644
--- a/openerp/addons/base/i18n/hr.po
+++ b/openerp/addons/base/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-06 06:04+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-17 06:35+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 "Language: hr\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/hu.po b/openerp/addons/base/i18n/hu.po
index 42d7b106c42..f4e7144d762 100644
--- a/openerp/addons/base/i18n/hu.po
+++ b/openerp/addons/base/i18n/hu.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-06 05:58+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-17 06:30+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/hy.po b/openerp/addons/base/i18n/hy.po
index 147a284b9ea..26855811640 100644
--- a/openerp/addons/base/i18n/hy.po
+++ b/openerp/addons/base/i18n/hy.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: 2014-05-06 05:53+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-17 06:25+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/id.po b/openerp/addons/base/i18n/id.po
index b625569b991..07603d2cbae 100644
--- a/openerp/addons/base/i18n/id.po
+++ b/openerp/addons/base/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-06 05:58+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-17 06:31+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/is.po b/openerp/addons/base/i18n/is.po
index 9d2547d635d..10a3ef21d0e 100644
--- a/openerp/addons/base/i18n/is.po
+++ b/openerp/addons/base/i18n/is.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-06 05:58+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-17 06:30+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/it.po b/openerp/addons/base/i18n/it.po
index 58d43a9bed1..98e221b0006 100644
--- a/openerp/addons/base/i18n/it.po
+++ b/openerp/addons/base/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-06 05:58+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-17 06:31+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/ja.po b/openerp/addons/base/i18n/ja.po
index cb3fa29c6fc..7e3c44448f1 100644
--- a/openerp/addons/base/i18n/ja.po
+++ b/openerp/addons/base/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-06 05:59+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-17 06:31+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/ka.po b/openerp/addons/base/i18n/ka.po
index 4edb6cf0caf..6db5e4eb621 100644
--- a/openerp/addons/base/i18n/ka.po
+++ b/openerp/addons/base/i18n/ka.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-06 05:56+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-17 06:28+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/kk.po b/openerp/addons/base/i18n/kk.po
index 4384bd9c3d8..6e74293f732 100644
--- a/openerp/addons/base/i18n/kk.po
+++ b/openerp/addons/base/i18n/kk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-06 05:59+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-17 06:32+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/ko.po b/openerp/addons/base/i18n/ko.po
index 8eeedc7f946..6299bde3c9a 100644
--- a/openerp/addons/base/i18n/ko.po
+++ b/openerp/addons/base/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-06 05:59+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-17 06:32+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/lt.po b/openerp/addons/base/i18n/lt.po
index 0eb35eb5737..226a9008745 100644
--- a/openerp/addons/base/i18n/lt.po
+++ b/openerp/addons/base/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-06 06:00+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-17 06:33+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/lv.po b/openerp/addons/base/i18n/lv.po
index f83c0a497af..4d770c24f8b 100644
--- a/openerp/addons/base/i18n/lv.po
+++ b/openerp/addons/base/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-06 05:59+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-17 06:32+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/mk.po b/openerp/addons/base/i18n/mk.po
index 65d779a7115..2f6369f85c0 100644
--- a/openerp/addons/base/i18n/mk.po
+++ b/openerp/addons/base/i18n/mk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-06 06:00+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-17 06:33+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/mn.po b/openerp/addons/base/i18n/mn.po
index 54b9c4d0475..ce8e62607af 100644
--- a/openerp/addons/base/i18n/mn.po
+++ b/openerp/addons/base/i18n/mn.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-06 06:01+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-17 06:33+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/nb.po b/openerp/addons/base/i18n/nb.po
index 844264f47fb..cacc32b3efc 100644
--- a/openerp/addons/base/i18n/nb.po
+++ b/openerp/addons/base/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-06 06:01+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-17 06:33+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -25,6 +25,10 @@ msgid ""
 "================================================\n"
 "    "
 msgstr ""
+"\n"
+"Modul for sjekkskriving og sjekkprinting.\n"
+"===================================\n"
+"    "
 
 #. module: base
 #: model:res.country,name:base.sh
@@ -60,7 +64,7 @@ msgstr "Utsnittsoppbygging"
 #. module: base
 #: model:ir.module.module,summary:base.module_sale_stock
 msgid "Quotation, Sale Orders, Delivery & Invoicing Control"
-msgstr ""
+msgstr "Tilbud, salgsordre, leveranse og faktura-kontroll"
 
 #. module: base
 #: selection:ir.sequence,implementation:0
@@ -75,7 +79,7 @@ msgstr "Ungarsk / Magyar"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (PY) / Español (PY)"
-msgstr "Spanish (PY) / Español (PY)"
+msgstr "Spansk (PY) / Español (PY)"
 
 #. module: base
 #: model:ir.module.category,description:base.module_category_project_management
@@ -89,12 +93,12 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,summary:base.module_point_of_sale
 msgid "Touchscreen Interface for Shops"
-msgstr ""
+msgstr "Touchscreen grensesnitt for butikker"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_in_hr_payroll
 msgid "Indian Payroll"
-msgstr ""
+msgstr "Indisk lønningssystem"
 
 #. module: base
 #: help:ir.cron,model:0
@@ -124,11 +128,22 @@ msgid ""
 "    * Product Attributes\n"
 "    "
 msgstr ""
+"\n"
+"En modul som legger til produsenter og egenskaper på produkt skjemaet.\n"
+"===================================================================\n"
+"\n"
+"Du kan nå definere disse feltene for et produkt:\n"
+"-------------------------------------------------\n"
+"    * Produsent\n"
+"    * Produsentens produktnavn\n"
+"    * Produsentens produktkode\n"
+"    * Produktegenskaper\n"
+"    "
 
 #. module: base
 #: field:ir.actions.client,params:0
 msgid "Supplementary arguments"
-msgstr ""
+msgstr "Tilleggsargumenter"
 
 #. module: base
 #: model:ir.module.module,description:base.module_google_base_account
@@ -137,11 +152,14 @@ msgid ""
 "The module adds google user in res user.\n"
 "========================================\n"
 msgstr ""
+"\n"
+"Denne modulen legger til google-bruker i res.user.\n"
+"=========================================\n"
 
 #. module: base
 #: help:res.partner,employee:0
 msgid "Check this box if this contact is an Employee."
-msgstr ""
+msgstr "Kryss av her hvis kontakten er en ansatt"
 
 #. module: base
 #: help:ir.model.fields,domain:0
@@ -150,6 +168,9 @@ msgid ""
 "specified as a Python expression defining a list of triplets. For example: "
 "[('color','=','red')]"
 msgstr ""
+"Domenet (valgfritt) for å begrense mulige verdier for relasjonsfelt, "
+"spesifisert som en Python-setning som definerer en liste med trillinger. For "
+"eksempel [(color','=','red')]"
 
 #. module: base
 #: field:res.partner,ref:0
@@ -159,7 +180,7 @@ msgstr "Referanse"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_be_invoice_bba
 msgid "Belgium - Structured Communication"
-msgstr ""
+msgstr "Belgia - Strukturert kommunikasjon"
 
 #. module: base
 #: field:ir.actions.act_window,target:0
@@ -169,12 +190,12 @@ msgstr "Målvindu"
 #. module: base
 #: field:ir.actions.report.xml,report_rml:0
 msgid "Main Report File Path"
-msgstr ""
+msgstr "Filbane for hovedplassering av rapporter"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_analytic_plans
 msgid "Sales Analytic Distribution"
-msgstr ""
+msgstr "Salgsdistribusjons analyse"
 
 #. module: base
 #: model:ir.module.module,description:base.module_hr_timesheet_invoice
@@ -206,12 +227,14 @@ msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
 "them through Python code, preferably through a custom addon!"
 msgstr ""
+"Egenskaper til grunnleggende felt kan ikke endres på denne måten! Vennligst "
+"modifiser dem via Python kode, helst gjennom en egen modul!"
 
 #. module: base
 #: code:addons/osv.py:151
 #, python-format
 msgid "Constraint Error"
-msgstr "Betingelsesfeil"
+msgstr "Begrensningsfeil"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_ui_view_custom
@@ -222,7 +245,7 @@ msgstr "ir.ui.view.custom"
 #: code:addons/base/ir/ir_model.py:374
 #, python-format
 msgid "Renaming sparse field \"%s\" is not allowed"
-msgstr ""
+msgstr "Det er ikke tillatt å tildele feltet \"%s\" et nytt navn"
 
 #. module: base
 #: model:res.country,name:base.sz
@@ -238,12 +261,12 @@ msgstr "opprettet."
 #. module: base
 #: field:ir.actions.report.xml,report_xsl:0
 msgid "XSL Path"
-msgstr ""
+msgstr "XSL bane"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_tr
 msgid "Turkey - Accounting"
-msgstr ""
+msgstr "Tyrkia - regnskap"
 
 #. module: base
 #: field:ir.sequence,number_increment:0
@@ -259,12 +282,12 @@ msgstr "Firmastruktur"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Inuktitut / ᐃᓄᒃᑎᑐᑦ"
-msgstr ""
+msgstr "Inuktitut / ᐃᓄᒃᑎᑐᑦ"
 
 #. module: base
 #: model:res.groups,name:base.group_multi_currency
 msgid "Multi Currencies"
-msgstr ""
+msgstr "Flere valutaer"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_cl
@@ -276,6 +299,12 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"Chilensk finansgrafer og skattelokalisasjon.\n"
+"===================================\n"
+"Plan contable chileno e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale
@@ -288,6 +317,7 @@ msgid ""
 "The internal user that is in charge of communicating with this contact if "
 "any."
 msgstr ""
+"Intern bruker med ansvar for kommunikasjon med denne kontakten, hvis noen."
 
 #. module: base
 #: view:res.partner:0
@@ -302,7 +332,7 @@ msgstr "Antall moduler"
 #. module: base
 #: help:multi_company.default,company_dest_id:0
 msgid "Company to store the current record"
-msgstr ""
+msgstr "Firma for å lagre nåværende post"
 
 #. module: base
 #: field:res.partner.bank.type.field,size:0
@@ -315,6 +345,8 @@ msgid ""
 "Database ID of record to open in form view, when ``view_mode`` is set to "
 "'form' only"
 msgstr ""
+"Database ID til raden  som skal åpnes i skjemavisning, når ''view_mode'' er "
+"satt til 'skjema'"
 
 #. module: base
 #: help:ir.values,key2:0
@@ -326,6 +358,12 @@ msgid ""
 "  - tree_but_open\n"
 "For defaults, an optional condition"
 msgstr ""
+"For handlinger, en av de mulige handlingstypene: \n"
+"  - client_action_multi\n"
+"  - client_print_multi\n"
+"  - client_action_relate\n"
+"  - tree_but_open\n"
+"For standardverdier kan du angi en begrensning"
 
 #. module: base
 #: sql_constraint:res.lang:0
@@ -358,7 +396,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.category,name:base.module_category_customer_relationship_management
 msgid "Customer Relationship Management"
-msgstr ""
+msgstr "Kunderelasjonshåndtering"
 
 #. module: base
 #: model:ir.module.module,description:base.module_delivery
@@ -372,6 +410,13 @@ msgid ""
 "invoices from picking, OpenERP is able to add and compute the shipping "
 "line.\n"
 msgstr ""
+"\n"
+"Lar deg legge til leveringsmetoder i salgs- og plukkordre.\n"
+"====================================================\n"
+"\n"
+"Du kan definere din egen speditør og leveringsområder for prising. Når du "
+"lager \n"
+"fakturaer fra plukklister, kan OpenERP legge sammen og beregne fraktlinjen.\n"
 
 #. module: base
 #: code:addons/base/ir/ir_filters.py:80
@@ -380,17 +425,19 @@ msgid ""
 "There is already a shared filter set as default for %(model)s, delete or "
 "change it before setting a new default"
 msgstr ""
+"Det er allerede satt et delt filter som standard for %(model)s, slett eller "
+"endre det før du setter et nytt standardfilter"
 
 #. module: base
 #: code:addons/orm.py:2649
 #, python-format
 msgid "Invalid group_by"
-msgstr "Ugyldig gruppering"
+msgstr "Ugyldig group_by"
 
 #. module: base
 #: field:ir.module.category,child_ids:0
 msgid "Child Applications"
-msgstr ""
+msgstr "Underliggende applikasjoner"
 
 #. module: base
 #: field:res.partner,credit_limit:0
@@ -407,7 +454,7 @@ msgstr "Dato oppdatert"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_base_action_rule
 msgid "Automated Action Rules"
-msgstr ""
+msgstr "Automatiserte handlingsregler"
 
 #. module: base
 #: view:ir.attachment:0
@@ -423,7 +470,7 @@ msgstr "Kildeobjekt"
 #. module: base
 #: model:res.partner.bank.type,format_layout:base.bank_normal
 msgid "%(bank_name)s: %(acc_number)s"
-msgstr ""
+msgstr "%(bank_name)s: %(acc_number)s"
 
 #. module: base
 #: view:ir.actions.todo:0
@@ -448,6 +495,8 @@ msgid ""
 "Invalid date/time format directive specified. Please refer to the list of "
 "allowed directives, displayed when you edit a language."
 msgstr ""
+"Ugyldig dato/tidsformat direktiv spesifisert. Vennligst referer til listen "
+"over tillatte direktiver, som vises når du redigerer et språk."
 
 #. module: base
 #: code:addons/orm.py:4153
@@ -457,7 +506,7 @@ msgid ""
 "(Document type: %s)."
 msgstr ""
 "En av postene som du forsøker å endre på har allerede blitt slettet "
-"(Dokument type: %s)."
+"(Dokumenttype: %s)."
 
 #. module: base
 #: help:ir.actions.act_window,views:0
@@ -467,16 +516,20 @@ msgid ""
 "and reference view. The result is returned as an ordered list of pairs "
 "(view_id,view_mode)."
 msgstr ""
+"Dette funksjonsfeltet beregner den ordnede listen over visninger som skal "
+"være tilgjengelig når resultatet fra en handling vises, i sammenfatnet "
+"visning, eller referansevisning. Resultatet blir returnert som en ordnet "
+"liste av par (view_id,view_mode)."
 
 #. module: base
 #: field:ir.model.relation,name:0
 msgid "Relation Name"
-msgstr ""
+msgstr "Relasjonsnavn"
 
 #. module: base
 #: view:ir.rule:0
 msgid "Create Access Right"
-msgstr ""
+msgstr "Lag tilgangsrettighet"
 
 #. module: base
 #: model:res.country,name:base.tv
@@ -496,7 +549,7 @@ msgstr "Datoformat"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_base_report_designer
 msgid "OpenOffice Report Designer"
-msgstr "OpenOffice Rapport Designer"
+msgstr "OpenOffice rapportdesigner"
 
 #. module: base
 #: model:res.country,name:base.an
@@ -511,12 +564,12 @@ msgid ""
 "created by OpenERP (updates, module installation, ...)"
 msgstr ""
 "Du kan ikke fjerne admin brukeren da den brukes internt for ressurser "
-"opprettet av OpenERP (oppdateringer, modul installasjoner, ...)"
+"opprettet av OpenERP (oppdateringer, modulinstallasjoner, ...)"
 
 #. module: base
 #: view:workflow.transition:0
 msgid "Workflow Transition"
-msgstr ""
+msgstr "Arbeidsflytsovergang"
 
 #. module: base
 #: model:res.country,name:base.gf
@@ -526,7 +579,7 @@ msgstr "Fransk Guyana"
 #. module: base
 #: model:ir.module.module,summary:base.module_hr
 msgid "Jobs, Departments, Employees Details"
-msgstr ""
+msgstr "Jobber, avdelinger og ansatte detaljer"
 
 #. module: base
 #: model:ir.module.module,description:base.module_analytic
@@ -542,6 +595,16 @@ msgid ""
 "that have no counterpart in the general financial accounts.\n"
 "    "
 msgstr ""
+"\n"
+"Modul for definering av objekt for analytisk regnskapsføring.\n"
+"=================================================\n"
+"\n"
+"I OpenERP er analytiske kontoer knyttet til generelle kontoer, men blir "
+"behandlet\n"
+"uavhengig. Du kan dermed gå inn i forskjellige analytiske operasjoner som "
+"ikke har\n"
+"noen tilsvarende enhet i de generelle finanskontoene.\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_idea
@@ -565,6 +628,18 @@ msgid ""
 "* Use emails to automatically confirm and send acknowledgements for any "
 "event registration\n"
 msgstr ""
+"\n"
+"Organisasjon og administrasjon av arrangementer.\n"
+"=========================================\n"
+"\n"
+"Event modulen lar deg effektivt organisere arrangementer og alle relaterte "
+"oppgaver: planlegging, registrering, oppmøte o.s.v.\n"
+"\n"
+"Nøkkelegenskaper:\n"
+"------------------\n"
+"* Administrer arrangementer og registrering\n"
+"* Bruk epost for å automatisk bekrefte og sende tilbakemelding for alle "
+"arrangementsregistreringer.\n"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -577,7 +652,7 @@ msgid ""
 "If you check this, then the second time the user prints with same attachment "
 "name, it returns the previous report."
 msgstr ""
-"Hvis du krysser av denne, så vil den forrige rapporten returneres den andre "
+"Hvis du krysser av denne, vil den forrige rapporten returneres den andre "
 "gangen brukeren skriver ut med samme vedleggsnavnet."
 
 #. module: base
@@ -609,7 +684,7 @@ msgstr "Spansk (AR) / Español (AR)"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_invoice
 msgid "Invoice on Timesheets"
-msgstr ""
+msgstr "Faktura på timelister"
 
 #. module: base
 #: view:base.module.upgrade:0
@@ -635,7 +710,7 @@ msgstr "Colombia"
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_mister
 msgid "Mister"
-msgstr ""
+msgstr "Herr"
 
 #. module: base
 #: help:res.country,code:0
@@ -643,8 +718,8 @@ msgid ""
 "The ISO country code in two chars.\n"
 "You can use this field for quick search."
 msgstr ""
-"ISO landekode (to karakterer).\n"
-"Du kan bruke dette feltet for rask søking."
+"ISO-landskode (to bokstaver).\n"
+"Du kan bruke dette i hurtigsøkfeltet."
 
 #. module: base
 #: model:res.country,name:base.pw
@@ -664,7 +739,7 @@ msgstr "Ikke oversatt"
 #. module: base
 #: view:ir.mail_server:0
 msgid "Outgoing Mail Server"
-msgstr ""
+msgstr "Utgående eposttjener"
 
 #. module: base
 #: help:ir.actions.act_window,context:0
@@ -672,11 +747,12 @@ msgstr ""
 msgid ""
 "Context dictionary as Python expression, empty by default (Default: {})"
 msgstr ""
+"Kontekst dictionary som Python-setning, tom som standard (Standard: {})"
 
 #. module: base
 #: field:res.company,logo_web:0
 msgid "Logo Web"
-msgstr ""
+msgstr "Logo nettsted"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:344
@@ -687,22 +763,22 @@ msgstr "Egendefinerte felter må ha et navn som starter med 'x_' !"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_mx
 msgid "Mexico - Accounting"
-msgstr ""
+msgstr "Mexico - Regnskapsføring"
 
 #. module: base
 #: help:ir.actions.server,action_id:0
 msgid "Select the Action Window, Report, Wizard to be executed."
-msgstr "Velg handling, vindu, rapport, veileder som skal eksekveres."
+msgstr "Velg handling, vindu, rapport, veileder som skal kjøres."
 
 #. module: base
 #: sql_constraint:ir.config_parameter:0
 msgid "Key must be unique."
-msgstr "Nøkkel må være unik"
+msgstr "Nøkkel må være unik."
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_plugin_outlook
 msgid "Outlook Plug-In"
-msgstr "Outlook Plug-In"
+msgstr "Outlook tillegg"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account
@@ -735,6 +811,31 @@ msgid ""
 "module named account_voucher.\n"
 "    "
 msgstr ""
+"\n"
+"Regnskap og finansstyring.\n"
+"============================\n"
+"\n"
+"Finans og regnskapsmodul som dekker:\n"
+"----------------------------------------------------------\n"
+"    * Generelt regnskap\n"
+"    * Kostanalyse\n"
+"    * Tredjepartsregnskap\n"
+"    * Moms- og skattebehandling\n"
+"    * Budsjetter\n"
+"    * Kunde- og leverandørfakturering\n"
+"    * Kontoutskrifter\n"
+"    * Forsoningsprosess per partner\n"
+"\n"
+"Lager et instrumentpanel for regnskapsførere som inkluderer:\n"
+"--------------------------------------------------\n"
+"    * Liste over kundefakturaer til godkjenning\n"
+"    * Firmaanalyse\n"
+"    * Grafer over aktiva\n"
+"\n"
+"Prosesser slik som hovedbokføring blir gjort via definerte finansjournaler "
+"(linjedetaljer og gruppering beholdes i journalen) \n"
+"for finansåret, og for kuponger fins modulen account_voucher.\n"
+"    "
 
 #. module: base
 #: view:ir.model:0
@@ -752,6 +853,12 @@ msgid ""
 "Contains the installer for marketing-related modules.\n"
 "    "
 msgstr ""
+"\n"
+"Meny for markedsføring.\n"
+"=====================\n"
+"\n"
+"Inneholder installasjonsprogram for markedsføringsrelaterte moduler.\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,description:base.module_web_linkedin
@@ -762,12 +869,17 @@ msgid ""
 "This module provides the Integration of the LinkedIn with OpenERP.\n"
 "        "
 msgstr ""
+"\n"
+"OpenERP Web LinkedIn modul.\n"
+"==========================\n"
+"Denne modulen gir integrasjon mot LinkedIn i OpenERP.\n"
+"        "
 
 #. module: base
 #: help:ir.actions.act_window,src_model:0
 msgid ""
 "Optional model name of the objects on which this action should be visible"
-msgstr ""
+msgstr "Opsjonelt modellnavn for objekter hvor denne handlingen skal vises"
 
 #. module: base
 #: field:workflow.transition,trigger_expr_id:0
@@ -782,12 +894,12 @@ msgstr "Jordan"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hr
 msgid "Croatia - RRIF 2012 COA"
-msgstr ""
+msgstr "Kroatia - RRIF 2012 COA"
 
 #. module: base
 #: help:ir.cron,nextcall:0
 msgid "Next planned execution date for this job."
-msgstr ""
+msgstr "Neste planlagte utføring av denne jobben."
 
 #. module: base
 #: model:ir.model,name:base.model_ir_ui_view
@@ -812,12 +924,12 @@ msgstr "Automatiserte handinger"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_ro
 msgid "Romania - Accounting"
-msgstr ""
+msgstr "Romania - Regnskapsføring"
 
 #. module: base
 #: model:ir.model,name:base.model_res_config_settings
 msgid "res.config.settings"
-msgstr ""
+msgstr "res.config.settings"
 
 #. module: base
 #: help:res.partner,image_small:0
@@ -826,6 +938,9 @@ msgid ""
 "image, with aspect ratio preserved. Use this field anywhere a small image is "
 "required."
 msgstr ""
+"Lite bilde av denne kontakten. Bildet blir automatisk skalert til et 64x64px "
+"bilde, med aspektrate preservert. Bruk dette feltet hvorenn et lite bilde "
+"trengs."
 
 #. module: base
 #: help:ir.actions.server,mobile:0
@@ -841,12 +956,12 @@ msgstr ""
 #. module: base
 #: view:ir.mail_server:0
 msgid "Security and Authentication"
-msgstr ""
+msgstr "Sikkerhet og autentisering"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_calendar
 msgid "Web Calendar"
-msgstr ""
+msgstr "Webkalender"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -857,7 +972,7 @@ msgstr "Svensk"
 #: field:base.language.export,name:0
 #: field:ir.attachment,datas_fname:0
 msgid "File Name"
-msgstr ""
+msgstr "Filnavn"
 
 #. module: base
 #: model:res.country,name:base.rs
@@ -872,13 +987,13 @@ msgstr "Veiviser visning"
 #. module: base
 #: model:res.country,name:base.kh
 msgid "Cambodia, Kingdom of"
-msgstr "Kambodsja, Kongeriket Kambodsja"
+msgstr "Kambodsja, Kongeriket"
 
 #. module: base
 #: field:base.language.import,overwrite:0
 #: field:base.language.install,overwrite:0
 msgid "Overwrite Existing Terms"
-msgstr ""
+msgstr "Overskriv eksisterende vilkår"
 
 #. module: base
 #: model:ir.module.module,description:base.module_hr_holidays
@@ -908,6 +1023,31 @@ msgid ""
 "also possible in order to automatically create a meeting when a holiday "
 "request is accepted by setting up a type of meeting in Leave Type.\n"
 msgstr ""
+"\n"
+"Håndterer ferie og allokasjonsforespørsler\n"
+"==================================\n"
+"\n"
+"Denne applikasjonen kontrollerer ferieavviklingen for ditt firma. Det lar "
+"ansatte sende forespørsler om fri. Deretter kan ledere se over "
+"forespørselene og godta eller avvise dem. På denne måten kan du kontrollere "
+"ferieavvikling for firmaet eller avdelingen.\n"
+"\n"
+"Du kan konfigurere flere typer fravær (Sykdom, helligdag, ferie med lønn, "
+"...) og tildele fritid til ansatte eller avdelinger hurtig ved hjelp av "
+"allokasjonsforespørsler. En ansatt kan også legge inn forespørsel etter "
+"flere fridager ved å lage en ny allokasjon. Dette vil øke antallet dager for "
+"den typen fravær (hvis forespørselen godkjennes).\n"
+"\n"
+"Du kan spore ferieavvikling på forskjellige måter ved hjelp av følgende "
+"rapporter: \n"
+"\n"
+"* Feriesammendrag\n"
+"* Fravær per avdelinge\n"
+"* Fraværsanalyse\n"
+"\n"
+"Synkronisering med intern møteplan (Møter via CRM-modulen) er også mulig for "
+"å automatisk lage et møte når en ferieforespørsel blir akseptert, ved å "
+"sette opp en møtetype i \"fraværstype\".\n"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -938,7 +1078,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_document_webdav
 msgid "Shared Repositories (WebDAV)"
-msgstr ""
+msgstr "Delte mapper (WebDAV)"
 
 #. module: base
 #: view:res.users:0
@@ -949,12 +1089,12 @@ msgstr "E-post innstillinger"
 #: code:addons/base/ir/ir_fields.py:195
 #, python-format
 msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
-msgstr ""
+msgstr "'%s' ser ikke ut til å være en gyldig dato for felt '%%(field)s'"
 
 #. module: base
 #: view:res.partner:0
 msgid "My Partners"
-msgstr ""
+msgstr "Mine partnere"
 
 #. module: base
 #: model:res.country,name:base.zw
@@ -966,6 +1106,7 @@ msgstr "Zimbabwe"
 msgid ""
 "Type of the constraint: `f` for a foreign key, `u` for other constraints."
 msgstr ""
+"Type begrensning: 'f' for ekstern nøkkel, 'u' for andre begrensninger."
 
 #. module: base
 #: view:ir.actions.report.xml:0
@@ -981,17 +1122,17 @@ msgstr "Spania"
 #: help:ir.actions.act_window,domain:0
 msgid ""
 "Optional domain filtering of the destination data, as a Python expression"
-msgstr ""
+msgstr "Opsjonell domenefiltrering av måldata, som en Python-setning"
 
 #. module: base
 #: model:ir.model,name:base.model_base_module_upgrade
 msgid "Module Upgrade"
-msgstr "Moduloppgradering"
+msgstr "Moduloppdatering"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (UY) / Español (UY)"
-msgstr "Spanish (UY) / Español (UY)"
+msgstr "Spansk (UY) / Español (UY)"
 
 #. module: base
 #: field:res.partner,mobile:0
@@ -1006,7 +1147,7 @@ msgstr "Oman"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_mrp
 msgid "MRP"
-msgstr ""
+msgstr "MRP"
 
 #. module: base
 #: model:ir.module.module,description:base.module_hr_attendance
@@ -1019,6 +1160,13 @@ msgid ""
 "actions(Sign in/Sign out) performed by them.\n"
 "       "
 msgstr ""
+"\n"
+"Denne modulen behandler ansattes tilstedeværelse.\n"
+"===========================================\n"
+"\n"
+"Holder følge med tilstedeværelse av ansatte på grunnlag av\n"
+"på- og avlogging.\n"
+"       "
 
 #. module: base
 #: model:res.country,name:base.nu
@@ -1028,7 +1176,7 @@ msgstr "Niue"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_membership
 msgid "Membership Management"
-msgstr ""
+msgstr "Medlemskapsadministrasjon"
 
 #. module: base
 #: selection:ir.module.module,license:0
@@ -1038,7 +1186,7 @@ msgstr "Andre OSI godkjente lisenser"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_gantt
 msgid "Web Gantt"
-msgstr ""
+msgstr "Web Ganttgraf"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.act_menu_create
@@ -1055,17 +1203,17 @@ msgstr "India"
 #: model:ir.actions.act_window,name:base.res_request_link-act
 #: model:ir.ui.menu,name:base.menu_res_request_link_act
 msgid "Request Reference Types"
-msgstr ""
+msgstr "Hent referansetyper"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_google_base_account
 msgid "Google Users"
-msgstr ""
+msgstr "Google brukere"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_fleet
 msgid "Fleet Management"
-msgstr ""
+msgstr "Flåtebehandling"
 
 #. module: base
 #: help:ir.server.object.lines,value:0
@@ -1076,6 +1224,10 @@ msgid ""
 "If Value type is selected, the value will be used directly without "
 "evaluation."
 msgstr ""
+"Setning som inneholder en verdispesifikasjon. \n"
+"Når Formula typen er valgt, kan dette feltet inneholde en Python setning som "
+"kan bruke de samme verdiene som begrensningsfeltet til serverhandlingen.\n"
+"Hvis Verdi typen velges, kan verdien benytes direkte uten evaluering."
 
 #. module: base
 #: model:res.country,name:base.ad
@@ -1085,7 +1237,7 @@ msgstr "Andorra"
 #. module: base
 #: field:ir.rule,perm_read:0
 msgid "Apply for Read"
-msgstr ""
+msgstr "Be om les"
 
 #. module: base
 #: model:res.country,name:base.mn
@@ -1136,18 +1288,19 @@ msgstr "TGZ arkiv"
 msgid ""
 "Users added to this group are automatically added in the following groups."
 msgstr ""
+"Brukere lagt til i denne gruppen blir automatisk lagt til i følgende grupper."
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:732
 #: code:addons/base/ir/ir_model.py:735
 #, python-format
 msgid "Document model"
-msgstr ""
+msgstr "Dokumentmodell"
 
 #. module: base
 #: view:res.users:0
 msgid "Change the user password."
-msgstr ""
+msgstr "Endre brukerens passord."
 
 #. module: base
 #: view:res.lang:0
@@ -1244,12 +1397,12 @@ msgstr "Navnet på landet må være unikt !"
 #. module: base
 #: field:ir.module.module,installed_version:0
 msgid "Latest Version"
-msgstr ""
+msgstr "Siste versjon"
 
 #. module: base
 #: view:ir.rule:0
 msgid "Delete Access Right"
-msgstr ""
+msgstr "Fjern tilgangsrettighet"
 
 #. module: base
 #: code:addons/base/ir/ir_mail_server.py:214
@@ -1281,18 +1434,18 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.kr
 msgid "South Korea"
-msgstr "Sør Korea"
+msgstr "Sør-Korea"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_si
 msgid "Kontni načrt za gospodarske družbe"
-msgstr ""
+msgstr "Kontoplan for bedrifter"
 
 #. module: base
 #: code:addons/orm.py:4920
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
-msgstr ""
+msgstr "Rad #%d av %s ikke funnet, kan ikke kopiere!"
 
 #. module: base
 #: field:ir.module.module,contributors:0
@@ -1312,12 +1465,12 @@ msgstr "Tegn"
 #. module: base
 #: field:ir.module.category,visible:0
 msgid "Visible"
-msgstr ""
+msgstr "Synlig"
 
 #. module: base
 #: model:ir.actions.client,name:base.action_client_base_menu
 msgid "Open Settings Menu"
-msgstr ""
+msgstr "Åpne innstillingsmeny"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -1332,7 +1485,7 @@ msgstr "Uganda"
 #. module: base
 #: field:ir.model.access,perm_unlink:0
 msgid "Delete Access"
-msgstr "Slett tilgang"
+msgstr "Slettetilgang"
 
 #. module: base
 #: model:res.country,name:base.ne
@@ -1362,12 +1515,12 @@ msgstr "Spansk (AR) / Español (AR)"
 #. module: base
 #: field:ir.mail_server,smtp_port:0
 msgid "SMTP Port"
-msgstr "SMTP Port"
+msgstr "SMTP port"
 
 #. module: base
 #: help:res.users,login:0
 msgid "Used to log into the system"
-msgstr ""
+msgstr "Brukes for å logge seg inn i systemet"
 
 #. module: base
 #: view:base.language.export:0
@@ -1377,6 +1530,9 @@ msgid ""
 "                                for uploading to OpenERP's translation "
 "platform,"
 msgstr ""
+"TGZ format: dette er et komprimert arkiv som inneholder en .PO fil, som "
+"egner seg\n"
+"                         for opplastning til OpenERPs oversettelsesplattform,"
 
 #. module: base
 #: view:res.lang:0
@@ -1385,7 +1541,7 @@ msgid ""
 "decimal number [00,53]. All days in a new year preceding the first Monday "
 "are considered to be in week 0."
 msgstr ""
-"%W - Ukenummer i året (Mandag som første dag i uken) som et desimtall "
+"%W - Ukenummer i året (Mandag som første dag i uken) som et desimaltall "
 "[00,53]. Alle dager i et nytt år forut for den første mandagen blir ansett "
 "til å være i uke 0."
 
@@ -1393,7 +1549,7 @@ msgstr ""
 #: code:addons/base/module/wizard/base_language_install.py:53
 #, python-format
 msgid "Language Pack"
-msgstr ""
+msgstr "Språkpakke"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_tests
@@ -1403,12 +1559,12 @@ msgstr "Tester"
 #. module: base
 #: field:ir.actions.report.xml,attachment:0
 msgid "Save as Attachment Prefix"
-msgstr ""
+msgstr "Lagre som vedleggsprefiks"
 
 #. module: base
 #: field:ir.ui.view_sc,res_id:0
 msgid "Resource Ref."
-msgstr "Ressures ref."
+msgstr "Ressursref."
 
 #. module: base
 #: field:ir.actions.act_url,url:0
@@ -1424,13 +1580,13 @@ msgstr "Modulnavn"
 #. module: base
 #: model:res.country,name:base.mh
 msgid "Marshall Islands"
-msgstr "Marshalløyene, Republikken Marshalløyene"
+msgstr "Marshalløyene"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:429
 #, python-format
 msgid "Changing the model of a field is forbidden!"
-msgstr ""
+msgstr "Å endre modellen til et felt er ikke tillatt!"
 
 #. module: base
 #: model:res.country,name:base.ht
@@ -1440,7 +1596,7 @@ msgstr "Haiti"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_fr_hr_payroll
 msgid "French Payroll"
-msgstr ""
+msgstr "Fransk lønningsavregning"
 
 #. module: base
 #: view:ir.ui.view:0
@@ -1457,14 +1613,15 @@ msgid ""
 "reference it\n"
 "- creation/update: a mandatory field is not correctly set"
 msgstr ""
-"Handlingen kan ikke fullføres, sannsynligvis p.g.a følgende:\n"
-"- Sletting: Du forsøker å slette en post som det fremdeles refereres til\n"
-"- Ny/ Endre: Et obligatorisk felt er ikke korrekt angitt"
+"Handlingen kan ikke fullføres, sannsynligvis på grunn av følgende:\n"
+"- Sletting: Du forsøker å slette en post som andre poster fremdeles "
+"refererer til\n"
+"- Ny/Endre: Et obligatorisk felt er ikke korrekt angitt"
 
 #. module: base
 #: field:ir.module.category,parent_id:0
 msgid "Parent Application"
-msgstr ""
+msgstr "Overordnet applikasjon"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_action_wizard
@@ -1477,17 +1634,17 @@ msgstr "Veivisere"
 #: code:addons/base/res/res_users.py:131
 #, python-format
 msgid "Operation Canceled"
-msgstr "Operasjon avbrutt"
+msgstr "Operasjonen ble avbrutt"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_document
 msgid "Document Management System"
-msgstr ""
+msgstr "Dokumentbehandlingssystem"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_crm_claim
 msgid "Claims Management"
-msgstr ""
+msgstr "Claims Management"
 
 #. module: base
 #: model:ir.module.module,description:base.module_document_webdav
@@ -1520,6 +1677,33 @@ msgid ""
 "Also implements IETF RFC 5785 for services discovery on a http server,\n"
 "which needs explicit configuration in openerp-server.conf too.\n"
 msgstr ""
+"\n"
+"Med denne modulen aktiveres WebDAV serveren for dokumenter.\n"
+"=====================================================\n"
+"\n"
+"Du kan da benytte enhver kompatibel leser for å se vedlegger til "
+"OpenObject.\n"
+"\n"
+"Etter installasjon kan WebDAV serveren kontrolleres med en  [webdav] seksjon "
+"i \n"
+"serverens konfigurasjon.\n"
+"\n"
+"Serverparametre:\n"
+"---------------------------\n"
+"[webdav]:\n"
+"++++++++++ \n"
+"    * enable = True ; Tilby WebDAV via http(s) serverene\n"
+"    * vdir = webdav ; katalogen som WebDAV blir servert fra;\n"
+"    * denne standardverdien betyr at WebDAV blir tilgjengelig\n"
+"    * fra http://localhost:8069/webdav/\n"
+"    * verbose = True ; Skru på utfyllende meldinger fra WebDAV\n"
+"    * debug = True ; Skru på feilsøkingsmeldinger fra WebDAV\n"
+"    * siden meldingene er logget via Python, med nivåene\n"
+"    * \"debug\" og \"debug_rpc\", kan du la disse verdiene være\n"
+"    * \"true\"\n"
+"\n"
+"Implementerer også IETF RFC 5785 for tjenesteoppdagelse via http,\n"
+"noe som også trenger eksplisitt konfigurasjon i openerp-server.conf.\n"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_purchase_management
@@ -1546,6 +1730,16 @@ msgid ""
 "with a single statement.\n"
 "    "
 msgstr ""
+"\n"
+"Denne modulen installerer basisen for IBAN (International Bank Account "
+"Number) bankkontoer og sjekker at de er gyldige.\n"
+"============================================================================="
+"======================\n"
+"\n"
+"Gir mulighet til å hente ut korrekt representerte lokale kontoer fra IBAN "
+"kontoer\n"
+"med en enkel setning.\n"
+"    "
 
 #. module: base
 #: view:ir.module.module:0
@@ -1588,11 +1782,13 @@ msgid ""
 "If specified, this action will be opened at logon for this user, in addition "
 "to the standard menu."
 msgstr ""
+"Hvis spesifisert, vil denne handlingen bli kjørt når brukeren logger inn, i "
+"tillegg til standardmenyen."
 
 #. module: base
 #: model:res.country,name:base.mf
 msgid "Saint Martin (French part)"
-msgstr ""
+msgstr "Saint Martin (fransk del)"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_exports
@@ -1623,7 +1819,7 @@ msgstr "Språkkode \"%s\" finnes ikke"
 #: model:ir.module.category,name:base.module_category_social_network
 #: model:ir.module.module,shortdesc:base.module_mail
 msgid "Social Network"
-msgstr ""
+msgstr "Sosialt nettverk"
 
 #. module: base
 #: view:res.lang:0
@@ -1633,12 +1829,12 @@ msgstr "%Y - År med århundre."
 #. module: base
 #: view:res.company:0
 msgid "Report Footer Configuration"
-msgstr ""
+msgstr "Konfigurer fottekst på rapporter"
 
 #. module: base
 #: field:ir.translation,comments:0
 msgid "Translation comments"
-msgstr ""
+msgstr "Oversettelseskommentarer"
 
 #. module: base
 #: model:ir.module.module,description:base.module_lunch
@@ -1664,6 +1860,26 @@ msgid ""
 "in their pockets, this module is essential.\n"
 "    "
 msgstr ""
+"\n"
+"Basismodul for lunch-håndtering.\n"
+"============================\n"
+"\n"
+"Mange firma bestiller smørbrød, pizza eller lignende til sine ansatte fra "
+"forskjellige leverandører.\n"
+"\n"
+"Slike innkjøp krever administrasjon innenfor firmaet, spesielt når antall "
+"ansatte eller leverandørbruk er viktig.\n"
+"\n"
+"Lunchmodulen har blitt utviklet for å forenkle denne administrasjonen, og "
+"tilbyr også flere verktøy til ansatte.\n"
+"\n"
+"I tillegg til full kontroll over måltider og leverandører, lar denne modulen "
+"deg vise advarsler i forhold til matvalg, og gjør det mulig å gjøre raske "
+"valg basert på den ansattes preferanser.\n"
+"\n"
+"Hvis du vil spare dine ansatte tid, og forhindre småinnkjøp, er denne "
+"modulen essensiell.\n"
+"    "
 
 #. module: base
 #: view:wizard.ir.model.menu.create:0
@@ -1676,6 +1892,8 @@ msgid ""
 "The field on the current object that links to the target object record (must "
 "be a many2one, or an integer field with the record ID)"
 msgstr ""
+"Feltet på nåværende objekt som lenker til målobjektets post (må være en "
+"mange-til-en, eller et heltallsfelt med postens ID)"
 
 #. module: base
 #: model:ir.model,name:base.model_res_bank
@@ -1695,11 +1913,13 @@ msgid ""
 "Helps you manage your purchase-related processes such as requests for "
 "quotations, supplier invoices, etc..."
 msgstr ""
+"Hjelper deg med å håndtere dine innkjøps-relaterte prosesser slik som "
+"forespørsler på tilbud, leverandørfaktura, osv..."
 
 #. module: base
 #: help:res.partner,website:0
 msgid "Website of Partner or Company"
-msgstr ""
+msgstr "Nettsted til partner eller firma"
 
 #. module: base
 #: help:base.language.install,overwrite:0
@@ -1707,6 +1927,8 @@ msgid ""
 "If you check this box, your customized translations will be overwritten and "
 "replaced by the official ones."
 msgstr ""
+"Hvis du merker av denne boksen, vil dine tilpassede oversettelser "
+"overskrives med offisielle oversettelser."
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_action_report_xml
@@ -1737,14 +1959,14 @@ msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
 "used to refer to other modules data, as in module.reference_id"
 msgstr ""
-"\"%s\" inneholder for mange punktum. XML identer skal ikke inneholde punktum "
-"! Disse er forbeholdt å referere til data i andre moduler, f.eks. som i "
+"\"%s\" inneholder for mange punktum. XML id-er skal ikke inneholde punktum ! "
+"Disse er forbeholdt for å referere til data i andre moduler, f.eks. som i "
 "module.reference_id"
 
 #. module: base
 #: field:res.users,login:0
 msgid "Login"
-msgstr "Login"
+msgstr "Logg inn"
 
 #. module: base
 #: view:ir.actions.server:0
@@ -1752,6 +1974,8 @@ msgid ""
 "Access all the fields related to the current object using expressions, i.e. "
 "object.partner_id.name "
 msgstr ""
+"Få tilgang til alle felt relatert til det nåværende objektet ved hjelp av "
+"setninger, slik som object.partner_id.name "
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_portal_project_issue
@@ -1776,11 +2000,15 @@ msgid ""
 "Launch Manually Once: after having been launched manually, it sets "
 "automatically to Done."
 msgstr ""
+"Manuell: Startes manuelt.\n"
+"Automatisk: Kjører når systemet blir rekonfigurert.\n"
+"Start manuelt en gang: Etter å ha blitt kjørt manuelt, settes den automatisk "
+"til Fullført."
 
 #. module: base
 #: field:res.partner,image_small:0
 msgid "Small-sized image"
-msgstr ""
+msgstr "Lite bilde"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_stock
@@ -1795,7 +2023,7 @@ msgstr "res.request.link"
 #. module: base
 #: field:ir.actions.wizard,name:0
 msgid "Wizard Info"
-msgstr "Veiviser informasjon"
+msgstr "Veiviserinformasjon"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_wizard_lang_export
@@ -1813,19 +2041,19 @@ msgstr "Handlinger på server"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_lu
 msgid "Luxembourg - Accounting"
-msgstr ""
+msgstr "Luxembourg - Regnskapsføring"
 
 #. module: base
 #: model:res.country,name:base.tp
 msgid "East Timor"
-msgstr "Øst Timor"
+msgstr "Øst-Timor"
 
 #. module: base
 #: code:addons/base/module/module.py:414
 #: view:ir.module.module:0
 #, python-format
 msgid "Install"
-msgstr ""
+msgstr "Installer"
 
 #. module: base
 #: field:res.currency,accuracy:0
@@ -1843,11 +2071,17 @@ msgid ""
 "Please keep in mind that you should review and adapt it with your "
 "Accountant, before using it in a live Environment.\n"
 msgstr ""
+"\n"
+"Denne modulen tilbyr standard kontooppsett for Sveits, som er basert på "
+"malen fra BMF.gv.at.\n"
+"=========================================================================\n"
+"Vennligst husk at du bør se over og tilpasse oppsettet med din "
+"regnskapsfører, før du benytter det i produksjonsmiljø.\n"
 
 #. module: base
 #: model:res.country,name:base.kg
 msgid "Kyrgyz Republic (Kyrgyzstan)"
-msgstr "Kirgisistan, Republikken Kirgisistan"
+msgstr "Kirgisistan, Republikken"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_accountant
@@ -1861,6 +2095,14 @@ msgid ""
 "It assigns manager and user access rights to the Administrator and only user "
 "rights to the Demo user. \n"
 msgstr ""
+"\n"
+"Regnskapstilgangsrettigheter\n"
+"========================\n"
+"Dette gir administratorbrukeren tilgang til alle regnskapsføringsfunksjoner, "
+"slik som journaler og kontooversikten.\n"
+"\n"
+"Det gir manager og user tilgangsrettigheter til administratoren, og kun "
+"brukerrettigheter til Demo brukeren. \n"
 
 #. module: base
 #: view:ir.sequence:0
@@ -1874,12 +2116,14 @@ msgid ""
 "simplified payment mode encoding, automatic picking lists generation and "
 "more."
 msgstr ""
+"Hjelper deg med å få det meste ut av utsalgssteder med rask salgshåndtering, "
+"forenklet betalingsmåte, automatisk plukkliste generering og mer."
 
 #. module: base
 #: code:addons/base/ir/ir_fields.py:164
 #, python-format
 msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
-msgstr ""
+msgstr "Ukjent verdi '%s' for booleansk felt '%%(field)s', antar '%s'"
 
 #. module: base
 #: model:res.country,name:base.nl
@@ -1894,7 +2138,7 @@ msgstr ""
 #. module: base
 #: selection:ir.translation,state:0
 msgid "Translation in Progress"
-msgstr ""
+msgstr "Oversettelse pågår"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_rule
@@ -1909,7 +2153,7 @@ msgstr "Dager"
 #. module: base
 #: model:ir.module.module,summary:base.module_fleet
 msgid "Vehicle, leasing, insurances, costs"
-msgstr ""
+msgstr "Kjøretøy, leasing, forsikring, kostnader"
 
 #. module: base
 #: view:ir.model.access:0
@@ -1920,7 +2164,7 @@ msgstr "Lesetilgang"
 #. module: base
 #: help:ir.attachment,res_id:0
 msgid "The record id this is attached to"
-msgstr ""
+msgstr "IDen denne posten er tilkoblet"
 
 #. module: base
 #: model:ir.module.module,description:base.module_share
@@ -1942,11 +2186,27 @@ msgid ""
 "synchronization with other companies.\n"
 "    "
 msgstr ""
+"\n"
+"Denne modulen gir generiske delingsverkøty til din nåværende OpenERP "
+"database.\n"
+"===================================================================\n"
+"\n"
+"Den legger til en 'del' knapp som er tilgjengelig i webklienten, og lar deg\n"
+"dele hvilken som helst type OpenERP data med kollegaer, kunder og venner.\n"
+"\n"
+"Systemet kan lage nye brukere og grupper, og ved å kombinere riktige\n"
+"tilgangsrettigheter og ir.rules, forsikrer det at brukerene kun har tilgang "
+"til\n"
+"data som har blitt delt med dem.\n"
+"\n"
+"Dette er veldig nyttig for samarbeid, kunnskapsdeling og synkronisering\n"
+"med andre firmaer.\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_process
 msgid "Enterprise Process"
-msgstr ""
+msgstr "Enterpriseprosess"
 
 #. module: base
 #: help:res.partner,supplier:0
@@ -1954,11 +2214,13 @@ msgid ""
 "Check this box if this contact is a supplier. If it's not checked, purchase "
 "people will not see it when encoding a purchase order."
 msgstr ""
+"Merk av denne boksen hvis kontakten er en leverandør. Hvis den ikke er "
+"merket, vil ikke innkjøpsbrukere kunne se den når de lager en innkjøpsordre."
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_evaluation
 msgid "Employee Appraisals"
-msgstr ""
+msgstr "Medarbeidersamtaler"
 
 #. module: base
 #: selection:ir.actions.server,state:0
@@ -1990,23 +2252,23 @@ msgstr "Partnere"
 #. module: base
 #: field:res.partner.category,parent_left:0
 msgid "Left parent"
-msgstr ""
+msgstr "Venstre forelder"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_project_mrp
 msgid "Create Tasks on SO"
-msgstr ""
+msgstr "Lag oppgaver på SO"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:320
 #, python-format
 msgid "This column contains module data and cannot be removed!"
-msgstr ""
+msgstr "Denne kolonnen inneholder moduldata, og kan ikke fjernes!"
 
 #. module: base
 #: field:res.partner.bank,footer:0
 msgid "Display on Reports"
-msgstr ""
+msgstr "Vis på rapporter"
 
 #. module: base
 #: model:ir.module.module,description:base.module_project_timesheet
@@ -2021,6 +2283,14 @@ msgid ""
 "with the effect of creating, editing and deleting either ways.\n"
 "    "
 msgstr ""
+"\n"
+"Synkronisasjon av prosjektoppgaver med timelister.\n"
+"==========================================\n"
+"\n"
+"Denne modulen lar deg overføre timer brukt på oppgaver definert i\n"
+"prosjektstyringsmodulen til timelister for bestemte datoer og brukere.\n"
+"Redigering, oppretting eller sletting kan skje begge veier.\n"
+"    "
 
 #. module: base
 #: model:ir.model,name:base.model_ir_model_access
@@ -2040,6 +2310,13 @@ msgid ""
 "          templates to target objects.\n"
 "    "
 msgstr ""
+"\n"
+"    * Flerspråklig støtte for kontooversikt, skatt, skattekoder, journaler\n"
+"       regnskapsmaler, analytiske kontooversikter og analytiske journaler.\n"
+"    * Endringer i installasjonsveiviser.\n"
+"        - Kopier oversettelser for COA, skatt, skattekoder og finans fra\n"
+"          maler til målobjekter.\n"
+"    "
 
 #. module: base
 #: field:workflow.transition,act_from:0
@@ -2049,7 +2326,7 @@ msgstr "Aktivitetskilde"
 #. module: base
 #: view:ir.sequence:0
 msgid "Legend (for prefix, suffix)"
-msgstr "Legend (for prefix, suffix)"
+msgstr "Kartnøkkel (for prefix, suffix)"
 
 #. module: base
 #: selection:ir.server.object.lines,type:0
@@ -2079,6 +2356,12 @@ msgid ""
 "Accounting chart and localization for Ecuador.\n"
 "    "
 msgstr ""
+"\n"
+"Dette er basismodulen for å styre kontoplaner for Ecuador i OpenERP.\n"
+"=========================================================\n"
+"\n"
+"Kontoplan og lokalisering for Ecuador.\n"
+"    "
 
 #. module: base
 #: code:addons/base/ir/ir_filters.py:36
@@ -2093,7 +2376,7 @@ msgstr "%s (kopi)"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_chart
 msgid "Template of Charts of Accounts"
-msgstr ""
+msgstr "Mal for kontoplan"
 
 #. module: base
 #: field:res.partner,type:0
@@ -2132,7 +2415,7 @@ msgstr "Full sti"
 #. module: base
 #: view:base.language.export:0
 msgid "The next step depends on the file format:"
-msgstr ""
+msgstr "Neste steg avhenger av filformatet:"
 
 #. module: base
 #: view:res.lang:0
@@ -2149,6 +2432,7 @@ msgstr ""
 #: view:base.language.export:0
 msgid "PO(T) format: you should edit it with a PO editor such as"
 msgstr ""
+"PO(T) format: du bør redigere den med et PO-redigeringsprogram slik som"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_administration
@@ -2172,7 +2456,7 @@ msgstr "Opprett / Skriv / Kopier"
 #. module: base
 #: view:ir.sequence:0
 msgid "Second: %(sec)s"
-msgstr ""
+msgstr "Sekund: %(sec)s"
 
 #. module: base
 #: field:ir.actions.act_window,view_mode:0
@@ -2185,6 +2469,8 @@ msgid ""
 "Display this bank account on the footer of printed documents like invoices "
 "and sales orders."
 msgstr ""
+"Vis denne bankkontoen i bunntekst på utskrevne dokumenter, slik som "
+"fakturaer og salgsordre."
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -2199,7 +2485,7 @@ msgstr "Koreansk (KP) / 한국어 (KP)"
 #. module: base
 #: model:res.country,name:base.ax
 msgid "Åland Islands"
-msgstr ""
+msgstr "Åland øyene"
 
 #. module: base
 #: field:res.company,logo:0
@@ -2209,7 +2495,7 @@ msgstr "Logo"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_cr
 msgid "Costa Rica - Accounting"
-msgstr ""
+msgstr "Costa Rica - Regnskapsføring"
 
 #. module: base
 #: selection:ir.actions.act_url,target:0
@@ -2220,12 +2506,12 @@ msgstr "Nytt vindu"
 #. module: base
 #: field:ir.values,action_id:0
 msgid "Action (change only)"
-msgstr ""
+msgstr "Handling (kun endring)"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_subscription
 msgid "Recurring Documents"
-msgstr ""
+msgstr "Repeterende dokumenter"
 
 #. module: base
 #: model:res.country,name:base.bs
@@ -2235,12 +2521,12 @@ msgstr "Bahamas"
 #. module: base
 #: field:ir.rule,perm_create:0
 msgid "Apply for Create"
-msgstr ""
+msgstr "Be om opprett"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_tools
 msgid "Extra Tools"
-msgstr ""
+msgstr "Ekstra Verktøy"
 
 #. module: base
 #: view:ir.attachment:0
@@ -2258,6 +2544,8 @@ msgid ""
 "Appears by default on the top right corner of your printed documents (report "
 "header)."
 msgstr ""
+"Legges til som standard i øverste høyre hjørne av dine utskrevne dokumenter "
+"(topptekst på rapporter)."
 
 #. module: base
 #: field:base.module.update,update:0
@@ -2267,17 +2555,17 @@ msgstr "Antall moduler oppdatert"
 #. module: base
 #: field:ir.cron,function:0
 msgid "Method"
-msgstr ""
+msgstr "Metode"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_auth_crypt
 msgid "Password Encryption"
-msgstr ""
+msgstr "Passordskryptering"
 
 #. module: base
 #: view:workflow.activity:0
 msgid "Workflow Activity"
-msgstr ""
+msgstr "Arbeidsflytsaktivitet"
 
 #. module: base
 #: model:ir.module.module,description:base.module_hr_timesheet_sheet
@@ -2305,6 +2593,27 @@ msgid ""
 "* Maximal difference between timesheet and attendances\n"
 "    "
 msgstr ""
+"\n"
+"Før og godkjenn timelister og oppmøte på en enkel måte\n"
+"==============================================\n"
+"\n"
+"Denne applikasjonen gir tilgang til et nytt skjermbilde hvor du kan klokke "
+"inn og ut, og føre logg over timeforbruk. Timelister blir generert for "
+"ansatte hver dag. På slutten av perioden kan ansatte validere sine "
+"timelister, og ledere kan godkjenne dem. Perioden er definert i "
+"firmainnstillingene, og kan være ukentlige eller månedlige.\n"
+"\n"
+"Hele timelisteprosessen er:\n"
+"-----------------------------------------\n"
+"* Generer timeliste\n"
+"* Den ansatte valider timelisten på slutten av perioden\n"
+"* Leder godkjenner timelisten\n"
+"\n"
+"Valideringen kan bli konfigurert i firmaet:\n"
+"--------------------------------------------------------------\n"
+"* Periodelengde (Dag, uke, måned)\n"
+"* Maksimal differanse mellom timeliste og oppmøte\n"
+"    "
 
 #. module: base
 #: code:addons/base/ir/ir_fields.py:341
@@ -2312,11 +2621,12 @@ msgstr ""
 msgid ""
 "No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
 msgstr ""
+"Ingen matchende post for %(field_type)s '%(value)s' i felt '%%(field)s'"
 
 #. module: base
 #: field:change.password.user,new_passwd:0
 msgid "New Password"
-msgstr ""
+msgstr "Nytt passord"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
@@ -2324,11 +2634,13 @@ msgid ""
 "Views allows you to personalize each view of OpenERP. You can add new "
 "fields, move fields, rename them or delete the ones that you do not need."
 msgstr ""
+"Visninger lar deg tilpasse hver visning i OpenERP. Du kan legge til felt, "
+"flytte felt, gi dem nye navn, eller slette de du ikke trenger."
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_base_setup
 msgid "Initial Setup Tools"
-msgstr ""
+msgstr "Verktøy for grunnleggende oppsett"
 
 #. module: base
 #: field:ir.actions.act_window,groups_id:0
@@ -2353,7 +2665,7 @@ msgstr "Grupper"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CL) / Español (CL)"
-msgstr "Spanish (CL) / Español (CL)"
+msgstr "Spansk (CL) / Español (CL)"
 
 #. module: base
 #: model:res.country,name:base.bz
@@ -2363,7 +2675,7 @@ msgstr "Belize"
 #. module: base
 #: help:ir.actions.report.xml,header:0
 msgid "Add or not the corporate RML header"
-msgstr "Legg til, eller ikke RML toppteksten til selskapet"
+msgstr "Skal RML toppteksten til selskapet legges til?"
 
 #. module: base
 #: model:ir.module.module,description:base.module_portal_anonymous
@@ -2373,6 +2685,10 @@ msgid ""
 "=================================\n"
 " "
 msgstr ""
+"\n"
+"Gi anonym tilgang til Portalen.\n"
+"========================\n"
+" "
 
 #. module: base
 #: model:res.country,name:base.ge
@@ -2423,6 +2739,8 @@ msgid ""
 "Comma-separated list of allowed view modes, such as 'form', 'tree', "
 "'calendar', etc. (Default: tree,form)"
 msgstr ""
+"Kommaseparert liste over tillate visningsmoduser, slik som 'skjema', 'tre', "
+"'kalender', o.l (Standard: tre,skjema)"
 
 #. module: base
 #: code:addons/orm.py:3843
@@ -2433,13 +2751,13 @@ msgstr "Et dokument har blitt endret siden du sist så på det (%s:%d)"
 #. module: base
 #: view:workflow:0
 msgid "Workflow Editor"
-msgstr ""
+msgstr "Arbeidsflytredigering"
 
 #. module: base
 #: selection:ir.module.module,state:0
 #: selection:ir.module.module.dependency,state:0
 msgid "To be removed"
-msgstr "Å fjerne"
+msgstr "Vil bli fjernet"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_sequence
@@ -2483,6 +2801,8 @@ msgid ""
 "View type: Tree type to use for the tree view, set to 'tree' for a "
 "hierarchical tree view, or 'form' for a regular list view"
 msgstr ""
+"Visningstype: Tretype for bruk i trevisning; sett til 'tre' for et hiearkisk "
+"tre, eller 'skjema' for en vanlig listevisning"
 
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
@@ -2492,7 +2812,7 @@ msgstr "Det eksisterer allerede en svarvei til denne menyen!"
 #. module: base
 #: view:ir.rule:0
 msgid "Groups (no group = global)"
-msgstr ""
+msgstr "Grupper (ingen gruppe = global)"
 
 #. module: base
 #: view:ir.module.module:0
@@ -2534,6 +2854,27 @@ msgid ""
 "Print product labels with barcode.\n"
 "    "
 msgstr ""
+"\n"
+"Dette er basismodulen for å behandle produkter og prislister i OpenERP.\n"
+"==========================================================\n"
+"\n"
+"Produktene kan ha forskjellige varianter, prisingsmetoder, "
+"leverandørinformasjon,\n"
+"produser til lager/ordre, forskjellige måleenheter, pakking og egenskaper.\n"
+"\n"
+"Prislister støtter:\n"
+"-------------------------\n"
+"    * Flere rabattnivåer (Etter produkt, etter kategori, etter kvantitet)\n"
+"    * Beregn pris basert på forskjellige kriterier:\n"
+"       * Annen prisliste\n"
+"       * Kostpris\n"
+"       * Listepris\n"
+"       * Forhandlerpris\n"
+"\n"
+"Prislistepreferanser basert på produkt eller partner.\n"
+"\n"
+"Skriv ut produktetiketter med strekkode.\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_analytic_default
@@ -2568,12 +2909,12 @@ msgstr "Madagaskar"
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
-"Objektnavnet må starte med x_ og kan ikke inneholde noen spesial karakterer !"
+"Objektnavnet må starte med x_ og kan ikke inneholde noen spesialkarakterer !"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_auth_oauth_signup
 msgid "Signup with OAuth2 Authentication"
-msgstr ""
+msgstr "Registrer med OAuth2 autentisering"
 
 #. module: base
 #: selection:ir.model,state:0
@@ -2590,7 +2931,7 @@ msgstr "Meny"
 #. module: base
 #: field:res.currency,rate:0
 msgid "Current Rate"
-msgstr "Gjeldene rate"
+msgstr "Gjeldende rate"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -2600,12 +2941,12 @@ msgstr "Gresk / Ελληνικά"
 #. module: base
 #: field:res.company,custom_footer:0
 msgid "Custom Footer"
-msgstr ""
+msgstr "Tilpasset bunntekst"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_crm
 msgid "Opportunity to Quotation"
-msgstr ""
+msgstr "Tilbudsmulighet"
 
 #. module: base
 #: model:ir.module.module,description:base.module_sale_analytic_plans
@@ -2618,6 +2959,12 @@ msgid ""
 "orders.\n"
 "    "
 msgstr ""
+"\n"
+"Basismodul for administrasjon av analytisk distribusjon og salgsordre.\n"
+"========================================================\n"
+"\n"
+"Bruk denne modulen hvis du vil lenke analytiske kontoer til salgsordre.\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_us
@@ -2627,6 +2974,9 @@ msgid ""
 "==================================\n"
 "    "
 msgstr ""
+"\n"
+"De Forente Stater - Kontoplan\n"
+"    "
 
 #. module: base
 #: field:ir.actions.act_url,target:0
@@ -2641,12 +2991,12 @@ msgstr "Anguilla"
 #. module: base
 #: model:ir.actions.report.xml,name:base.report_ir_model_overview
 msgid "Model Overview"
-msgstr ""
+msgstr "Modelloversikt"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_product_margin
 msgid "Margins by Products"
-msgstr "Margin pr product"
+msgstr "Margin per produkt"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_invoiced
@@ -2661,7 +3011,7 @@ msgstr "Navn på snarvei"
 #. module: base
 #: field:res.partner,contact_address:0
 msgid "Complete Address"
-msgstr ""
+msgstr "Fullstendig adresse"
 
 #. module: base
 #: help:ir.actions.act_window,limit:0
@@ -2683,6 +3033,17 @@ msgid ""
 "        * Files by Partner (graph)\n"
 "        * Files Size by Month (graph)\n"
 msgstr ""
+"\n"
+"Dette er et komplett dokumentstyringssystem.\n"
+"======================================\n"
+"    * Brukerautentisering\n"
+"    * Dokumentindeksering:- .pptx og .docx er ikke ståttet på Windows-"
+"plattformen.\n"
+"    * Instrumentpanel for dokumenter som inkluderer:\n"
+"       * Nye filer (liste)\n"
+"       * Filer etter ressurstype (graf)\n"
+"       * Filer etter partner (graf)\n"
+"       * Filstørrelse etter måned (graf)\n"
 
 #. module: base
 #: view:ir.actions.report.xml:0
@@ -2732,6 +3093,39 @@ msgid ""
 "* Monthly Turnover (Graph)\n"
 "    "
 msgstr ""
+"\n"
+"Administrer tilbud og salgsordre\n"
+"==========================\n"
+"\n"
+"Denne applikasjonen lar deg styre dine salgsmål på en effektiv måte ved å "
+"spore alle salgsordre og historikk.\n"
+"\n"
+"Den håndterer hele salgsarbeidsflyten:\n"
+"\n"
+"* **Tilbud** -> **Salgsordre** -> **Faktura**\n"
+"\n"
+"Innstillinger (Kun med lagermodulen installert)\n"
+"-----------------------------------------------------------------------\n"
+"\n"
+"Hvis du også har installert lagermodulen, kan du sette de følgende "
+"innstillingene:\n"
+"\n"
+"* Frakt: Velg mellom dellevering eller full levering\n"
+"* Fakturering: Velg hvordan fakturaer skal betaler\n"
+"* Incoterms: Internasjonale kommersielle avtaler\n"
+"\n"
+"Du kan velge mellom fleksible faktureringsmetoder:\n"
+"\n"
+"* *Ved behov*: Fakturaen genereres manuelt fra salgsordren når det trengs\n"
+"* *Ved leveranseordre*: Fakturaen genereres fra plukkliste (levering)\n"
+"* *Før levering*: En faktura blir generert og må betales før levering\n"
+"\n"
+"\n"
+"Instrumentpanelet for salgssjef inkluderer\n"
+"----------------------------------------------------------------\n"
+"* Mine tilbud\n"
+"* Månedlig omsetning (Graf)\n"
+"    "
 
 #. module: base
 #: field:ir.actions.act_window,res_id:0
@@ -2739,7 +3133,7 @@ msgstr ""
 #: field:ir.translation,res_id:0
 #: field:ir.values,res_id:0
 msgid "Record ID"
-msgstr ""
+msgstr "Post-ID"
 
 #. module: base
 #: view:ir.filters:0
@@ -2758,17 +3152,20 @@ msgid ""
 "Module to attach a google document to any model.\n"
 "================================================\n"
 msgstr ""
+"\n"
+"Modul for å koble et Google dokument til en modell.\n"
+"==========================================\n"
 
 #. module: base
 #: code:addons/base/ir/ir_fields.py:333
 #, python-format
 msgid "Found multiple matches for field '%%(field)s' (%d matches)"
-msgstr ""
+msgstr "Fant flere treff for feltet '%%(field)s' (%d treff)"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "French (BE) / Français (BE)"
-msgstr "Fransk / Français"
+msgstr "Fransk (BE) / Français (BE)"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_pe
@@ -2782,6 +3179,14 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"Kontokart og skattelokalisasjon for Peru. Følger PCGE 2010.\n"
+"================================================\n"
+"\n"
+"Plan contable peruano e impuestos de acuerdo a disposiciones vigentes de la\n"
+"SUNAT 2011 (PCGE 2010).\n"
+"\n"
+"    "
 
 #. module: base
 #: view:ir.actions.server:0
@@ -2792,17 +3197,17 @@ msgstr "Tjenerhandling"
 #. module: base
 #: help:ir.actions.client,params:0
 msgid "Arguments sent to the client along withthe view tag"
-msgstr ""
+msgstr "Argumenter sent til klienten sammen med visnings-taggen"
 
 #. module: base
 #: model:ir.module.module,summary:base.module_contacts
 msgid "Contacts, People and Companies"
-msgstr ""
+msgstr "Kontakter, personer og firmaer"
 
 #. module: base
 #: model:res.country,name:base.tt
 msgid "Trinidad and Tobago"
-msgstr "Trinidad and Tobago"
+msgstr "Trinidad og Tobago"
 
 #. module: base
 #: model:res.country,name:base.lv
@@ -2831,19 +3236,27 @@ msgid ""
 "This module is currently not compatible with the ``user_ldap`` module and\n"
 "will disable LDAP authentication completely if installed at the same time.\n"
 msgstr ""
+"\n"
+"Krypterte passord\n"
+"===============\n"
+"\n"
+"Interaksjon med LDAP-autentisering:\n"
+"-------------------------------\n"
+"Denne modulen er for tiden ikke kompatibel med ''user_ldap'' modulen,\n"
+"og vil skru av LDAP-autentisering hvis den blir installert samtidig.\n"
 
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
 #: model:res.groups,name:base.group_sale_manager
 #: model:res.groups,name:base.group_tool_manager
 msgid "Manager"
-msgstr ""
+msgstr "Leder"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:726
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
-msgstr ""
+msgstr "Beklager, du har ikke tilgang til dette dokumentet."
 
 #. module: base
 #: model:res.country,name:base.py
@@ -2858,7 +3271,7 @@ msgstr "Fiji"
 #. module: base
 #: view:ir.actions.report.xml:0
 msgid "Report Xml"
-msgstr ""
+msgstr "Rapport XML"
 
 #. module: base
 #: model:ir.module.module,description:base.module_purchase
@@ -2887,6 +3300,29 @@ msgid ""
 "* Purchase Analysis\n"
 "    "
 msgstr ""
+"\n"
+"Behandle materialkrav etter innkjøpsordre\n"
+"==================================\n"
+"\n"
+"Innkjøpsstyring lar deg spore dine leverandørers prislister, og kan "
+"konvertere dem til innkjøpsordre.\n"
+"OpenERP har flere metoder for å overvåke fakturaer, og kan spore mottak av "
+"bestilte varer. Du kan håndtere delleveringer i OpenERP, slik at du kan "
+"holde øye med varer som fortsatt ikke er levert på dine ordre. Du kan også "
+"sende ut påminnelser automatisk.\n"
+"\n"
+"OpenERP har regelbasert administrasjon av lagernivåer, slik at du kan "
+"generere innkjøpsordre automatisk, eller du kan sette opp en prosess som "
+"drives helt og holdent av produksjonsbehov.\n"
+"\n"
+"Instrumentbord / rapporter for innkjøpsstyring inkluderer:\n"
+"----------------------------------------------------------\n"
+"* Be om tilbud\n"
+"* Innkjøpsordre som venter på godkjenning\n"
+"* Månedlige innkjøp etter kategori\n"
+"* Mottaksanalyse\n"
+"* Innkjøpsanalyse\n"
+"    "
 
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_act_window_close
@@ -2896,7 +3332,7 @@ msgstr "ir.actions.act_window_close"
 #. module: base
 #: field:ir.server.object.lines,col1:0
 msgid "Destination"
-msgstr "Destinasjon"
+msgstr "Mål"
 
 #. module: base
 #: model:res.country,name:base.lt
@@ -2919,22 +3355,33 @@ msgid ""
 "    * Unlimited \"Group By\" levels (not stacked), two cross level analysis "
 "(stacked)\n"
 msgstr ""
+"\n"
+"Graf-visninger for webklient.\n"
+"=======================\n"
+"\n"
+"    * Vis en <graph> visning, men lar deg endre presentasjonen\n"
+"    * Graftyper: kake, linje, områder, stolper, radar\n"
+"    * Stablet/ikke stablet for områder og stolper\n"
+"    * Kartnøkler: topp, innenfor (topp/venstre), gjemt\n"
+"    * Last ned som PNG eller CSV, vise data, bytt akser\n"
+"    * Ubegrenset \"grupper etter\" nivåer (Ikke stablet), to "
+"kryssanalysenivåer (stablet)\n"
 
 #. module: base
 #: view:res.groups:0
 msgid "Inherited"
-msgstr ""
+msgstr "Arvet"
 
 #. module: base
 #: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "yes"
-msgstr ""
+msgstr "ja"
 
 #. module: base
 #: field:ir.model.fields,serialization_field_id:0
 msgid "Serialization Field"
-msgstr ""
+msgstr "Serialiseringsfelt"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_be_hr_payroll
@@ -2954,12 +3401,26 @@ msgid ""
 "    * Salary Maj, ONSS, Withholding Tax, Child Allowance, ...\n"
 "    "
 msgstr ""
+"\n"
+"Belgiske avlønningsregler.\n"
+"=====================\n"
+"\n"
+"    * Detaljer om ansatt\n"
+"    * Arbeidskontrakter\n"
+"    * Passbasert kontrakt\n"
+"    * Dagpenger/trekk\n"
+"    * Tillater konfigurasjon av grunnlønn, bruttolønn, nettolønn\n"
+"    * Lønnsslipp\n"
+"    * Månedlig avlønningsregister\n"
+"    * Integrert med ferieplanlegger\n"
+"    * Lønns Maj, ONSS, tilbakehold av skattetrekk, barnebidrag, ...\n"
+"    "
 
 #. module: base
 #: code:addons/base/ir/ir_fields.py:174
 #, python-format
 msgid "'%s' does not seem to be an integer for field '%%(field)s'"
-msgstr ""
+msgstr "'%s' er ikke et heltall for feltet '%%(field)s'"
 
 #. module: base
 #: model:ir.module.category,description:base.module_category_report_designer
@@ -2967,6 +3428,8 @@ msgid ""
 "Lets you install various tools to simplify and enhance OpenERP's report "
 "creation."
 msgstr ""
+"Lar deg installere forskjellige verktøy for å forenkle og forbedre OpenERPs "
+"rapporter"
 
 #. module: base
 #: view:res.lang:0
@@ -3018,14 +3481,14 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_linkedin
 msgid "LinkedIn Integration"
-msgstr ""
+msgstr "LinkedIn integrasjon"
 
 #. module: base
 #: code:addons/orm.py:2021
 #: code:addons/orm.py:2032
 #, python-format
 msgid "Invalid Object Architecture!"
-msgstr ""
+msgstr "Ugyldig objektarkitektur!"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:372
@@ -3070,6 +3533,8 @@ msgid ""
 "the user will have an access to the sales configuration as well as statistic "
 "reports."
 msgstr ""
+"brukeren vil ha tilgang til salgskonfigurasjonen så vel som "
+"statistikkrapporter."
 
 #. module: base
 #: model:res.country,name:base.nz
@@ -3090,6 +3555,9 @@ msgid ""
 "partner records. You can create or delete countries to make sure the ones "
 "you are working on will be maintained."
 msgstr ""
+"Vis og administrer liste over alle land som kan bli tildelt dine partner-"
+"poster.  Du kan slette eller opprette land for å være sikker på at de du "
+"jobber med vil bli vedlikeholdt."
 
 #. module: base
 #: model:res.country,name:base.nf
@@ -3099,12 +3567,12 @@ msgstr "Norfolk øyene"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Korean (KR) / 한국어 (KR)"
-msgstr ""
+msgstr "Koreansk (KR) / 한국어 (KR)"
 
 #. module: base
 #: help:ir.model.fields,model:0
 msgid "The technical name of the model this field belongs to"
-msgstr ""
+msgstr "Det tekniske navnet til modellen dette feltet hører til"
 
 #. module: base
 #: field:ir.actions.server,action_id:0
@@ -3131,11 +3599,24 @@ msgid ""
 "      above. Specify the interval information and partner to be invoice.\n"
 "    "
 msgstr ""
+"\n"
+"Opprett gjentagende dokumenter.\n"
+"============================\n"
+"\n"
+"Denne modulen lar deg opprette nye dokumenter og legge til abonnementer på "
+"det dokumentet.\n"
+"\n"
+"For eksempel, for å lage en faktura som periodisk genereres:\n"
+"---------------------------------------------------------------\n"
+"    * Definer en dokumenttype basert på faktura objektet\n"
+"    * Definer et abonnement som har et kildedokument definert som\n"
+"       over. Spesifiser intervallet og partneren som skal faktureres.\n"
+"    "
 
 #. module: base
 #: field:res.company,rml_header1:0
 msgid "Company Tagline"
-msgstr ""
+msgstr "Firmaets tagline"
 
 #. module: base
 #: code:addons/base/res/res_users.py:674
@@ -3145,7 +3626,7 @@ msgstr ""
 #: view:res.users:0
 #, python-format
 msgid "Application"
-msgstr ""
+msgstr "Applikasjon"
 
 #. module: base
 #: model:res.groups,comment:base.group_hr_manager
@@ -3153,6 +3634,8 @@ msgid ""
 "the user will have an access to the human resources configuration as well as "
 "statistic reports."
 msgstr ""
+"brukeren vil ha tilgang på ansattekonfigurasjon så vel som statistiske "
+"rapporter."
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_pl
@@ -3174,7 +3657,7 @@ msgstr ""
 #. module: base
 #: field:ir.actions.client,params_store:0
 msgid "Params storage"
-msgstr ""
+msgstr "Parameterlagring"
 
 #. module: base
 #: code:addons/base/module/module.py:525
@@ -3191,12 +3674,12 @@ msgstr "Cuba"
 #: code:addons/report_sxw.py:443
 #, python-format
 msgid "Unknown report type: %s"
-msgstr ""
+msgstr "Ukjent rapporttype: %s"
 
 #. module: base
 #: model:ir.module.module,summary:base.module_hr_expense
 msgid "Expenses Validation, Invoicing"
-msgstr ""
+msgstr "Utgiftsføring, fakturering"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_be_hr_payroll_account
@@ -3215,7 +3698,7 @@ msgstr "Armenia"
 #. module: base
 #: model:ir.module.module,summary:base.module_hr_evaluation
 msgid "Periodical Evaluations, Appraisals, Surveys"
-msgstr ""
+msgstr "Periodiske evalueringer, verdivurdering, spørreundersøkelser"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_property_form
@@ -3236,7 +3719,7 @@ msgstr "Sverige"
 #. module: base
 #: field:ir.actions.report.xml,report_file:0
 msgid "Report File"
-msgstr ""
+msgstr "Rapportfil"
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
@@ -3269,7 +3752,7 @@ msgstr ""
 #: code:addons/orm.py:3871
 #, python-format
 msgid "Missing document(s)"
-msgstr ""
+msgstr "Manglende dokument(er)"
 
 #. module: base
 #: model:ir.model,name:base.model_res_partner_bank_type
@@ -3305,6 +3788,27 @@ msgid ""
 "customers' expenses if your work by project.\n"
 "    "
 msgstr ""
+"\n"
+"Utgiftsføring for ansatte\n"
+"======================\n"
+"\n"
+"Denne applikasjonen lar dine ansatte føre utgifter. Den gir deg tilgang til "
+"de ansattes kvitteringer, og lar deg fullføre og validere, eller avvise "
+"kvitteringene. Etter godkjenning lager den en faktura for den ansatte.\n"
+"Ansatte kan legge inn sine utgifter, og validasjonsflyten legger utgiftene "
+"automatisk inn i regnskapet etter godkjenning fra ledere.\n"
+"\n"
+"Hele flyten er implementert slik:\n"
+"-------------------------------------------\n"
+"* Før utgift\n"
+"* Den ansatte bekrefter utgiftsføringen\n"
+"* Godkjenning av leder\n"
+"* Godkjenning fra regnskapsfører og kvittering\n"
+"\n"
+"Modulen bruker også analytisk regnskapsføring, og er kompatibel med "
+"fakturadelen av timelistemodulen, slik at du automatisk kan viderefakturere "
+"utgiftene til dine kunder hvis det er prosjektarbeid.\n"
+"    "
 
 #. module: base
 #: view:base.language.export:0
@@ -3312,6 +3816,7 @@ msgid ""
 "For more details about translating OpenERP in your language, please refer to "
 "the"
 msgstr ""
+"For mer informasjon om oversettelse av OpenERP til ditt språk, vennligst se"
 
 #. module: base
 #: field:res.partner,image:0
@@ -3334,7 +3839,7 @@ msgstr "Kalender"
 #. module: base
 #: model:ir.module.category,name:base.module_category_knowledge_management
 msgid "Knowledge"
-msgstr ""
+msgstr "Kunnskap"
 
 #. module: base
 #: field:workflow.activity,signal_send:0
@@ -3349,6 +3854,9 @@ msgid ""
 "separated list of valid field names (optionally followed by asc/desc for the "
 "direction)"
 msgstr ""
+"Ugyldig \"order\" spesifisert. En gyldig \"order\" spesifikasjon er en "
+"kommaseparert liste over feltnavn (eventuelt etterfulgt av asc/desc for "
+"retning)"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_module_module_dependency
@@ -3367,13 +3875,16 @@ msgid ""
 "way you want to print them in letters and other documents. Some example: "
 "Mr., Mrs. "
 msgstr ""
+"Administrer titulering av kontakter som du vil ha tilgjengelig i ditt "
+"system, og måten de brukes i brev og andre dokumenter. For eksempel, Herr, "
+"Fru. "
 
 #. module: base
 #: view:ir.model.access:0
 #: view:res.groups:0
 #: field:res.groups,model_access:0
 msgid "Access Controls"
-msgstr "Tilgangskontroller"
+msgstr "Tilgangskontroll"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:277
@@ -3382,11 +3893,13 @@ msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
 "provide an expression in the [('key','Label'), ...] format."
 msgstr ""
+"Utvalgspreferanse-uttrykket er ikke en gyldig Python setning. Vennligst angi "
+"et uttrykk i [('key','Label'), ...] format."
 
 #. module: base
 #: model:res.groups,name:base.group_survey_user
 msgid "Survey / User"
-msgstr ""
+msgstr "Spørreundersøkelse / Bruker"
 
 #. module: base
 #: view:ir.module.module:0
@@ -3402,17 +3915,17 @@ msgstr "Hovedfirma"
 #. module: base
 #: field:ir.ui.menu,web_icon_hover:0
 msgid "Web Icon File (hover)"
-msgstr ""
+msgstr "Webikon fil (hover)"
 
 #. module: base
 #: help:res.currency,name:0
 msgid "Currency Code (ISO 4217)"
-msgstr ""
+msgstr "Valutakode (ISO 4217)"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_contract
 msgid "Employee Contracts"
-msgstr ""
+msgstr "Arbeidskontrakter"
 
 #. module: base
 #: view:ir.actions.server:0
@@ -3426,7 +3939,7 @@ msgstr ""
 #. module: base
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr "Feil ! Du kan ikke lage rekursive firmaer."
+msgstr "Feil! Du kan ikke opprette rekursive firmaer."
 
 #. module: base
 #: field:res.partner,birthdate:0
@@ -3448,18 +3961,18 @@ msgstr "Vareprodusenter"
 #: code:addons/base/ir/ir_mail_server.py:240
 #, python-format
 msgid "SMTP-over-SSL mode unavailable"
-msgstr ""
+msgstr "SMTP over SSL modus ikke tilgjengelig"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_survey
 #: model:ir.ui.menu,name:base.next_id_10
 msgid "Survey"
-msgstr ""
+msgstr "Spørreundersøkelse"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (DO) / Español (DO)"
-msgstr "Spanish (DO) / Español (DO)"
+msgstr "Spansk (DO) / Español (DO)"
 
 #. module: base
 #: model:ir.model,name:base.model_workflow_activity
@@ -3469,7 +3982,7 @@ msgstr "workflow.activity"
 #. module: base
 #: view:base.language.export:0
 msgid "Export Complete"
-msgstr ""
+msgstr "Eksport fullført"
 
 #. module: base
 #: help:ir.ui.view_sc,res_id:0
@@ -3477,6 +3990,8 @@ msgid ""
 "Reference of the target resource, whose model/table depends on the 'Resource "
 "Name' field."
 msgstr ""
+"Referanse til målressursen, hvor modell/tabell er avhengig av 'Ressursnavn' "
+"feltet."
 
 #. module: base
 #: field:ir.model.fields,select_level:0
@@ -3496,12 +4011,12 @@ msgstr "Finland / Suomi"
 #. module: base
 #: view:ir.config_parameter:0
 msgid "System Properties"
-msgstr ""
+msgstr "Systeminnstillinger"
 
 #. module: base
 #: field:ir.sequence,prefix:0
 msgid "Prefix"
-msgstr "Prefix"
+msgstr "Prefiks"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -3511,13 +4026,13 @@ msgstr "Tysk / Deutsch"
 #. module: base
 #: view:ir.actions.server:0
 msgid "Fields Mapping"
-msgstr "Kobling av felter"
+msgstr "Kobling av felt"
 
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_sir
 #: model:res.partner.title,shortcut:base.res_partner_title_sir
 msgid "Sir"
-msgstr "Hr"
+msgstr "Herr"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_ca
@@ -3535,7 +4050,7 @@ msgstr ""
 #. module: base
 #: view:base.module.import:0
 msgid "Select module package to import (.zip file):"
-msgstr ""
+msgstr "Velg modulpakke for import (.zip fil):"
 
 #. module: base
 #: view:ir.filters:0
@@ -3545,7 +4060,7 @@ msgstr ""
 #. module: base
 #: field:base.language.export,modules:0
 msgid "Modules To Export"
-msgstr ""
+msgstr "Moduler for eksportering"
 
 #. module: base
 #: model:res.country,name:base.mt
@@ -3558,11 +4073,12 @@ msgstr "Malta"
 msgid ""
 "Only users with the following access level are currently allowed to do that"
 msgstr ""
+"Kun brukere med følgende tilgangsnivåer har tillatelse til å gjøre dette"
 
 #. module: base
 #: field:ir.actions.server,fields_lines:0
 msgid "Field Mappings."
-msgstr "Mapping av felter."
+msgstr "Mapping av felt."
 
 #. module: base
 #: selection:res.request,priority:0
@@ -3638,7 +4154,7 @@ msgstr ""
 #. module: base
 #: help:ir.mail_server,smtp_host:0
 msgid "Hostname or IP of SMTP server"
-msgstr ""
+msgstr "Vertsnavn eller IP-adresse til SMTP tjener"
 
 #. module: base
 #: model:res.country,name:base.aq
@@ -3648,7 +4164,7 @@ msgstr "Antarktis"
 #. module: base
 #: view:res.partner:0
 msgid "Persons"
-msgstr ""
+msgstr "Personer"
 
 #. module: base
 #: view:base.language.import:0
@@ -3668,7 +4184,7 @@ msgstr "Separatorformat"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_report_webkit
 msgid "Webkit Report Engine"
-msgstr ""
+msgstr "Webkit rapporteringsmotor"
 
 #. module: base
 #: model:ir.ui.menu,name:base.next_id_9
@@ -3678,7 +4194,7 @@ msgstr "Databasestruktur"
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_mass_mail
 msgid "Mass Mailing"
-msgstr "Masse utsendelse av e-post"
+msgstr "Masseutsendelse av e-post"
 
 #. module: base
 #: model:res.country,name:base.yt
@@ -3688,7 +4204,7 @@ msgstr "Mayotte"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_crm_todo
 msgid "Tasks on CRM"
-msgstr ""
+msgstr "Oppgaver i CRM"
 
 #. module: base
 #: help:ir.model.fields,relation_field:0
@@ -3696,17 +4212,19 @@ msgid ""
 "For one2many fields, the field on the target model that implement the "
 "opposite many2one relationship"
 msgstr ""
+"For en-til-mange felt, feltet på målmodellen som implementerer den motsatte "
+"mange-til-en relasjonen"
 
 #. module: base
 #: view:ir.rule:0
 msgid "Interaction between rules"
-msgstr ""
+msgstr "Regelinteraksjon"
 
 #. module: base
 #: field:res.company,rml_footer:0
 #: field:res.company,rml_footer_readonly:0
 msgid "Report Footer"
-msgstr ""
+msgstr "Rapportens bunntekst"
 
 #. module: base
 #: selection:res.lang,direction:0
@@ -3716,7 +4234,7 @@ msgstr "Høyre-til-venstre"
 #. module: base
 #: model:res.country,name:base.sx
 msgid "Sint Maarten (Dutch part)"
-msgstr ""
+msgstr "Sint Maarten (nederlandsk del)"
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -3749,18 +4267,18 @@ msgstr "Tittel"
 #. module: base
 #: help:ir.property,res_id:0
 msgid "If not set, acts as a default value for new resources"
-msgstr ""
+msgstr "Hvis ikke satt, fungerer som standard verdi for nye ressurser"
 
 #. module: base
 #: code:addons/orm.py:4246
 #, python-format
 msgid "Recursivity Detected."
-msgstr ""
+msgstr "Rekursjon oppdaget."
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_et
 msgid "Ethiopia - Accounting"
-msgstr ""
+msgstr "Etiopia - Regnskapsføring"
 
 #. module: base
 #: code:addons/base/module/module.py:366
@@ -3805,12 +4323,12 @@ msgstr "Togo"
 #: field:ir.actions.act_window,res_model:0
 #: field:ir.actions.client,res_model:0
 msgid "Destination Model"
-msgstr ""
+msgstr "Målmodell"
 
 #. module: base
 #: selection:ir.sequence,implementation:0
 msgid "Standard"
-msgstr ""
+msgstr "Standard"
 
 #. module: base
 #: model:res.country,name:base.ru
@@ -3829,7 +4347,7 @@ msgstr "Urdu / اردو"
 #: code:addons/orm.py:3902
 #, python-format
 msgid "Access Denied"
-msgstr ""
+msgstr "Ingen tilgang"
 
 #. module: base
 #: field:res.company,name:0
@@ -3843,6 +4361,8 @@ msgid ""
 "Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
 "integer): \"%s\""
 msgstr ""
+"Ugyldig verdi for referansefeltet \"%s.%s\" (siste del må være et heltall "
+"som ikke er null): \"%s\""
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_country
@@ -3853,7 +4373,7 @@ msgstr "Land"
 #. module: base
 #: selection:ir.translation,type:0
 msgid "RML  (deprecated - use Report)"
-msgstr ""
+msgstr "RML (utfases - bruk Rapport)"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
@@ -3891,7 +4411,7 @@ msgstr "Saint Pierre og Miquelon"
 #. module: base
 #: view:ir.actions.todo:0
 msgid "Search Actions"
-msgstr ""
+msgstr "Søkehandlinger"
 
 #. module: base
 #: model:ir.module.module,description:base.module_base_calendar
@@ -3908,11 +4428,23 @@ msgid ""
 "If you need to manage your meetings, you should install the CRM module.\n"
 "    "
 msgstr ""
+"\n"
+"Dette er et fullt kalendersystem.\n"
+"===========================\n"
+"\n"
+"Det støtter:\n"
+"------------------\n"
+"* Arrangementskalender\n"
+"* Gjentagende hendelser\n"
+"\n"
+"Hvis du trenger å administrere møtevirksomheten din, bør du installere CRM "
+"modulen.\n"
+"    "
 
 #. module: base
 #: model:res.country,name:base.je
 msgid "Jersey"
-msgstr ""
+msgstr "Jersey"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_translation
@@ -3937,12 +4469,12 @@ msgstr "%x - Passende datovisning."
 #. module: base
 #: view:res.partner:0
 msgid "Tag"
-msgstr ""
+msgstr "Tagg"
 
 #. module: base
 #: view:res.lang:0
 msgid "%d - Day of the month [01,31]."
-msgstr "%d - Dag i månedenl [01,31]."
+msgstr "%d - Dag i måneden [01,31]."
 
 #. module: base
 #: model:res.country,name:base.tj
@@ -3957,12 +4489,12 @@ msgstr "GPL-2 eller senere versjon"
 #. module: base
 #: selection:workflow.activity,kind:0
 msgid "Stop All"
-msgstr "Stop alle"
+msgstr "Stopp alle"
 
 #. module: base
 #: field:res.company,paper_format:0
 msgid "Paper Format"
-msgstr ""
+msgstr "Papirformat"
 
 #. module: base
 #: code:addons/base/module/module.py:644
@@ -3971,13 +4503,13 @@ msgid ""
 "Can not create the module file:\n"
 " %s"
 msgstr ""
-"Can not create the module file:\n"
+"Kan ikke opprette modulfilen:\n"
 " %s"
 
 #. module: base
 #: model:res.country,name:base.sk
 msgid "Slovakia"
-msgstr ""
+msgstr "Slovakia"
 
 #. module: base
 #: model:res.country,name:base.nr
@@ -3988,12 +4520,12 @@ msgstr "Nauru"
 #: code:addons/base/res/res_company.py:166
 #, python-format
 msgid "Reg"
-msgstr ""
+msgstr "Reg"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_property
 msgid "ir.property"
-msgstr "Ukjent egenskap %s"
+msgstr "ir.property"
 
 #. module: base
 #: selection:ir.actions.act_window,view_type:0
@@ -4027,7 +4559,7 @@ msgstr "Montenegro"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_fetchmail
 msgid "Email Gateway"
-msgstr ""
+msgstr "Epost gateway"
 
 #. module: base
 #: code:addons/base/ir/ir_mail_server.py:470
@@ -4036,6 +4568,8 @@ msgid ""
 "Mail delivery failed via SMTP server '%s'.\n"
 "%s: %s"
 msgstr ""
+"Levering feilet via SMTP server '%s'.\n"
+"%s: %s"
 
 #. module: base
 #: model:res.country,name:base.tk
@@ -4134,7 +4668,7 @@ msgstr "Liechtenstein"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_project_issue_sheet
 msgid "Timesheet on Issues"
-msgstr ""
+msgstr "Timeliste på saker"
 
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_ltd
@@ -4144,7 +4678,7 @@ msgstr "AS"
 #. module: base
 #: model:ir.actions.server,name:base.action_run_ir_action_todo
 msgid "Run Remaining Action Todo"
-msgstr ""
+msgstr "Kjør Gjenværende Handlinger Oppgaver"
 
 #. module: base
 #: field:res.partner,ean13:0
@@ -4155,7 +4689,7 @@ msgstr "EAN13"
 #: code:addons/orm.py:2247
 #, python-format
 msgid "Invalid Architecture!"
-msgstr ""
+msgstr "Ugyldig arkitektur!"
 
 #. module: base
 #: model:res.country,name:base.pt
@@ -4165,12 +4699,12 @@ msgstr "Portugal"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_share
 msgid "Share any Document"
-msgstr ""
+msgstr "Del et dokument"
 
 #. module: base
 #: field:workflow.transition,group_id:0
 msgid "Group Required"
-msgstr ""
+msgstr "Gruppe påkrevd"
 
 #. module: base
 #: view:res.lang:0
@@ -4180,7 +4714,7 @@ msgstr "6.  %d, %m         ==> 05, 12"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_it
 msgid "Italy - Accounting"
-msgstr ""
+msgstr "Italia - Regnskapsføring"
 
 #. module: base
 #: field:ir.actions.act_url,help:0
@@ -4192,7 +4726,7 @@ msgstr ""
 #: field:ir.actions.server,help:0
 #: field:ir.actions.wizard,help:0
 msgid "Action description"
-msgstr ""
+msgstr "Handlingsbeskrivelse"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_ma
@@ -4218,6 +4752,9 @@ msgid ""
 "its dependencies are satisfied. If the module has no dependency, it is "
 "always installed."
 msgstr ""
+"En autoinstallerbar modul blir automatisk installert av systemet når alle "
+"dens avhengigheter er oppfylt. Hvis modulen ikke har avhengigheter, blir den "
+"alltid installert."
 
 #. module: base
 #: model:ir.actions.act_window,name:base.res_lang_act_window
@@ -4236,12 +4773,12 @@ msgstr "Xor"
 #. module: base
 #: model:ir.module.category,name:base.module_category_localization_account_charts
 msgid "Account Charts"
-msgstr ""
+msgstr "Kontoplaner"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_event_main
 msgid "Events Organization"
-msgstr ""
+msgstr "Arrangementsorganisering"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_customer_form
@@ -4269,7 +4806,7 @@ msgstr "Basisfelt"
 #. module: base
 #: model:ir.module.category,name:base.module_category_managing_vehicles_and_contracts
 msgid "Managing vehicles and contracts"
-msgstr ""
+msgstr "Administrasjon av kjøretøy og kontrakter"
 
 #. module: base
 #: model:ir.module.module,description:base.module_base_setup
@@ -4284,6 +4821,14 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"Denne modulen lar deg konfigurere systemet etter installasjon av en ny "
+"database.\n"
+"==================================================================\n"
+"\n"
+"Viser deg en liste over applikasjoner du kan installere.\n"
+"\n"
+"    "
 
 #. module: base
 #: model:ir.model,name:base.model_res_config
@@ -4293,18 +4838,18 @@ msgstr "res.config"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_pl
 msgid "Poland - Accounting"
-msgstr ""
+msgstr "Polen - regnskapsføring"
 
 #. module: base
 #: view:ir.cron:0
 msgid "Action to Trigger"
-msgstr "Handling å trigge"
+msgstr "Handling som skal utføres"
 
 #. module: base
 #: field:ir.model.constraint,name:0
 #: selection:ir.translation,type:0
 msgid "Constraint"
-msgstr "Beskrankning"
+msgstr "Begrensning"
 
 #. module: base
 #: selection:ir.values,key:0
@@ -4315,14 +4860,14 @@ msgstr "Standard"
 #. module: base
 #: model:ir.module.module,summary:base.module_lunch
 msgid "Lunch Order, Meal, Food"
-msgstr ""
+msgstr "Lunchbestilling, mat"
 
 #. module: base
 #: view:ir.model.fields:0
 #: field:ir.model.fields,required:0
 #: field:res.partner.bank.type.field,required:0
 msgid "Required"
-msgstr "Obligatorisk"
+msgstr "Påkrevd"
 
 #. module: base
 #: model:res.country,name:base.ro
@@ -4338,7 +4883,7 @@ msgstr "Sammendrag"
 #. module: base
 #: model:ir.module.category,name:base.module_category_hidden_dependency
 msgid "Dependency"
-msgstr ""
+msgstr "Avhengigheter"
 
 #. module: base
 #: model:ir.module.module,description:base.module_portal
@@ -4379,16 +4924,19 @@ msgid ""
 "When no specific mail server is requested for a mail, the highest priority "
 "one is used. Default priority is 10 (smaller number = higher priority)"
 msgstr ""
+"Hvis ingen spesifikk mailtjener er forespurt for en epost, vil tjeneren med "
+"høyest prioritet bli benyttet. Standard prioritet er 10 (Mindre nummer = "
+"høyere prioritet)"
 
 #. module: base
 #: model:ir.module.module,summary:base.module_sale
 msgid "Quotations, Sales Orders, Invoicing"
-msgstr ""
+msgstr "Tilbud, salgsordre, fakturering"
 
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Related Company"
-msgstr ""
+msgstr "Relatert firma"
 
 #. module: base
 #: help:ir.actions.act_url,help:0
@@ -4403,11 +4951,13 @@ msgid ""
 "Optional help text for the users with a description of the target view, such "
 "as its usage and purpose."
 msgstr ""
+"Opsjonell hjelpetekst for brukerene med beskrivelse av målvisningen, slik "
+"som bruken av visningen."
 
 #. module: base
 #: model:res.country,name:base.va
 msgid "Holy See (Vatican City State)"
-msgstr "Pavestolen (Vatikanstaten)"
+msgstr "Vatikanstaten"
 
 #. module: base
 #: field:base.module.import,module_file:0
@@ -4417,7 +4967,7 @@ msgstr "Modul .ZIP fil"
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_17
 msgid "Telecom sector"
-msgstr "Telecom sektor"
+msgstr "Telekom sektor"
 
 #. module: base
 #: field:workflow.transition,trigger_model:0
@@ -4427,12 +4977,12 @@ msgstr "Utløserobjekt"
 #. module: base
 #: sql_constraint:ir.sequence.type:0
 msgid "`code` must be unique."
-msgstr ""
+msgstr "'code' må være unik."
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_knowledge
 msgid "Knowledge Management System"
-msgstr ""
+msgstr "Kunnskapsbase system"
 
 #. module: base
 #: view:workflow.activity:0
@@ -4443,7 +4993,7 @@ msgstr "Innkommende overganger"
 #. module: base
 #: field:ir.values,value_unpickle:0
 msgid "Default value or action reference"
-msgstr ""
+msgstr "Standard verdi eller handlingsreferanse"
 
 #. module: base
 #: model:ir.module.module,description:base.module_note_pad
@@ -4479,7 +5029,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_project_timesheet
 msgid "Bill Time on Tasks"
-msgstr ""
+msgstr "Fakturer timer på oppgaver"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_marketing
@@ -4502,11 +5052,15 @@ msgid ""
 "==========================\n"
 "\n"
 msgstr ""
+"\n"
+"OpenERP Webkalendervisning.\n"
+"=========================\n"
+"\n"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (HN) / Español (HN)"
-msgstr "Spanish (HN) / Español (HN)"
+msgstr "Spansk (HN) / Español (HN)"
 
 #. module: base
 #: view:ir.sequence.type:0
@@ -4516,24 +5070,24 @@ msgstr "Sekvenstype"
 #. module: base
 #: view:base.language.export:0
 msgid "Unicode/UTF-8"
-msgstr ""
+msgstr "Unicode/UTF-8"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Hindi / हिंदी"
-msgstr ""
+msgstr "Hindi / हिंदी"
 
 #. module: base
 #: view:base.language.install:0
 #: model:ir.actions.act_window,name:base.action_view_base_language_install
 #: model:ir.ui.menu,name:base.menu_view_base_language_install
 msgid "Load a Translation"
-msgstr ""
+msgstr "Last inn oversettelse"
 
 #. module: base
 #: field:ir.module.module,latest_version:0
 msgid "Installed Version"
-msgstr ""
+msgstr "Installert versjon"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_test
@@ -4554,7 +5108,7 @@ msgstr ""
 #. module: base
 #: field:ir.module.module,license:0
 msgid "License"
-msgstr "License"
+msgstr "Lisensvilkår"
 
 #. module: base
 #: field:ir.attachment,url:0
@@ -4564,7 +5118,7 @@ msgstr "Url"
 #. module: base
 #: selection:ir.translation,type:0
 msgid "SQL Constraint"
-msgstr "SQL beskrankning"
+msgstr "SQL begrensning"
 
 #. module: base
 #: help:ir.ui.menu,groups_id:0
@@ -4573,9 +5127,9 @@ msgid ""
 "groups. If this field is empty, OpenERP will compute visibility based on the "
 "related object's read access."
 msgstr ""
-"Hvis du har grupper så vil synligheten av denne menyen baseres på disse. "
-"Hvis dette feltet er tomt så vil OpenERP beregne synligheten basert på "
-"lesetilganger til relaterte objekter."
+"Hvis du har grupper, vil synligheten av denne menyen baseres på disse. Hvis "
+"dette feltet er tomt, vil OpenERP beregne synligheten basert på det "
+"relaterte objektets lesetilganger."
 
 #. module: base
 #: model:ir.module.module,description:base.module_event_sale
@@ -4633,7 +5187,7 @@ msgid ""
 "The selected language has been successfully installed. You must change the "
 "preferences of the user and open a new menu to view the changes."
 msgstr ""
-"The valgte språk har blitt installert. Du må endre preferansene til brukeren "
+"Det valgte språk har blitt installert. Du må endre preferansene til brukeren "
 "og åpne en ny meny for å se endringene."
 
 #. module: base
@@ -4648,7 +5202,7 @@ msgstr "Vis"
 #: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "no"
-msgstr ""
+msgstr "nei"
 
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
@@ -4682,7 +5236,7 @@ msgstr "Ekvatorial-Guinea"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_api
 msgid "OpenERP Web API"
-msgstr ""
+msgstr "OpenERP Web API"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_fr_rib
@@ -4730,12 +5284,12 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
-msgstr ""
+msgstr "Palestinske territorier, Okkuperte"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_ch
 msgid "Switzerland - Accounting"
-msgstr ""
+msgstr "Sveits - Regnskapsføring"
 
 #. module: base
 #: field:res.bank,zip:0
@@ -4754,7 +5308,7 @@ msgstr "Forfatter"
 #. module: base
 #: view:ir.actions.todo:0
 msgid "Set as Todo"
-msgstr ""
+msgstr "Sett som oppgave"
 
 #. module: base
 #: view:res.lang:0
@@ -4777,11 +5331,12 @@ msgstr ""
 #: model:ir.module.category,description:base.module_category_marketing
 msgid "Helps you manage your marketing campaigns step by step."
 msgstr ""
+"Hjelper deg med å administrere dine markedsførings kampanjer trinn for trinn."
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Hebrew / עִבְרִי"
-msgstr ""
+msgstr "Hebraisk / עִבְרִי"
 
 #. module: base
 #: model:res.country,name:base.bo
@@ -4822,7 +5377,7 @@ msgstr "Regler"
 #. module: base
 #: field:ir.mail_server,smtp_host:0
 msgid "SMTP Server"
-msgstr ""
+msgstr "SMTP tjener"
 
 #. module: base
 #: code:addons/base/module/module.py:320
@@ -4839,7 +5394,7 @@ msgstr "Modulene har blitt oppgradert / installert !"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (PR) / Español (PR)"
-msgstr "Spanish (PR) / Español (PR)"
+msgstr "Spansk (PR) / Español (PR)"
 
 #. module: base
 #: model:ir.module.module,description:base.module_crm_profiling
@@ -4875,59 +5430,62 @@ msgid ""
 "the same values as those available in the condition field, e.g. `Dear [[ "
 "object.partner_id.name ]]`"
 msgstr ""
+"Epostinnhold, kan inneholde uttrykk i doble braketter basert på de samme "
+"verdiene som er tilgjengelige i kondisjonsfeltet, slik som 'Kjære [[ "
+"object.partner_id.name ]]'"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_workflow_form
 #: model:ir.ui.menu,name:base.menu_workflow
 #: model:ir.ui.menu,name:base.menu_workflow_root
 msgid "Workflows"
-msgstr "Arbeidsflyt"
+msgstr "Arbeidsflyter"
 
 #. module: base
 #: model:ir.ui.menu,name:base.next_id_73
 msgid "Purchase"
-msgstr ""
+msgstr "Innkjøp"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Portuguese (BR) / Português (BR)"
-msgstr ""
+msgstr "Portugisisk (BR) / Português (BR)"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_needaction_mixin
 msgid "ir.needaction_mixin"
-msgstr ""
+msgstr "ir.needaction_mixin"
 
 #. module: base
 #: view:base.language.export:0
 msgid "This file was generated using the universal"
-msgstr ""
+msgstr "Denne filen ble generert ved bruk av det universale"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_7
 msgid "IT Services"
-msgstr ""
+msgstr "IT tjenester"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_specific_industry_applications
 msgid "Specific Industry Applications"
-msgstr ""
+msgstr "Spesifikke industriapplikasjoner"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_google_docs
 msgid "Google Docs integration"
-msgstr ""
+msgstr "Google Docs integrasjon"
 
 #. module: base
 #: help:ir.attachment,res_model:0
 msgid "The database object this attachment will be attached to"
-msgstr ""
+msgstr "Databaseobjektet dette vedlegget vil bli koblet til"
 
 #. module: base
 #: code:addons/base/ir/ir_fields.py:327
 #, python-format
 msgid "name"
-msgstr ""
+msgstr "navn"
 
 #. module: base
 #: model:ir.module.module,description:base.module_mrp_operations
@@ -4973,7 +5531,7 @@ msgstr "Hopp over"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_event_sale
 msgid "Events Sales"
-msgstr ""
+msgstr "Messesalg"
 
 #. module: base
 #: model:res.country,name:base.ls
@@ -4983,12 +5541,12 @@ msgstr "Lesotho"
 #. module: base
 #: view:base.language.export:0
 msgid ", or your preferred text editor"
-msgstr ""
+msgstr ", eller din foretrukne tekstredigerer"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_crm_partner_assign
 msgid "Partners Geo-Localization"
-msgstr ""
+msgstr "Partner geolokasjon"
 
 #. module: base
 #: model:res.country,name:base.ke
@@ -4999,12 +5557,12 @@ msgstr "Kenya"
 #: model:ir.actions.act_window,name:base.action_translation
 #: model:ir.ui.menu,name:base.menu_action_translation
 msgid "Translated Terms"
-msgstr ""
+msgstr "Oversatte vilkår"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Abkhazian / аҧсуа"
-msgstr ""
+msgstr "Abkhazian / аҧсуа"
 
 #. module: base
 #: view:base.module.configuration:0
@@ -5015,7 +5573,7 @@ msgstr "Systemkonfigurasjon fullført"
 #: code:addons/orm.py:1540
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
-msgstr ""
+msgstr "Feil under validering av felt(ene) %s: %s"
 
 #. module: base
 #: view:ir.property:0
@@ -5025,7 +5583,7 @@ msgstr "Generell"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_document_ftp
 msgid "Shared Repositories (FTP)"
-msgstr ""
+msgstr "Delte mapper (FTP)"
 
 #. module: base
 #: model:res.country,name:base.sm
@@ -5045,17 +5603,17 @@ msgstr "Peru"
 #. module: base
 #: selection:ir.model.fields,on_delete:0
 msgid "Set NULL"
-msgstr "Set NULL"
+msgstr "Sett NULL"
 
 #. module: base
 #: view:res.users:0
 msgid "Save"
-msgstr ""
+msgstr "Lagre"
 
 #. module: base
 #: field:ir.actions.report.xml,report_xml:0
 msgid "XML Path"
-msgstr ""
+msgstr "XML bane"
 
 #. module: base
 #: model:res.country,name:base.bj
@@ -5066,17 +5624,17 @@ msgstr "Benin"
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_type_form
 #: model:ir.ui.menu,name:base.menu_action_res_partner_bank_typeform
 msgid "Bank Account Types"
-msgstr ""
+msgstr "Bankkontotyper"
 
 #. module: base
 #: help:ir.sequence,suffix:0
 msgid "Suffix value of the record for the sequence"
-msgstr ""
+msgstr "Suffiks verdi av posten for sekvensen"
 
 #. module: base
 #: help:ir.mail_server,smtp_user:0
 msgid "Optional username for SMTP authentication"
-msgstr ""
+msgstr "Opsjonelt brukernavn for SMTP autentisering"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_actions
@@ -5086,7 +5644,7 @@ msgstr "ir.actions.actions"
 #. module: base
 #: selection:ir.model.fields,select_level:0
 msgid "Not Searchable"
-msgstr "Ikke søkbar"
+msgstr "Ikke søkbart"
 
 #. module: base
 #: view:ir.config_parameter:0
@@ -5116,6 +5674,18 @@ msgid ""
 "            \n"
 "%(country_code)s: the code of the country"
 msgstr ""
+"Her kan du definere det vanlige formatet for adresser i dette landet.\n"
+"\n"
+"Du kan bruke python-stilede strengemønster med alle feltene i adressen (For "
+"eksempel, bruk '%(street)s' for å vise feltet 'gate') pluss\n"
+"            \n"
+"%(state_name)s: navn på fylke\n"
+"      \n"
+"%(state_code)s: fylkeskode\n"
+"       \n"
+"%(country_name)s: Navn på landet\n"
+"        \n"
+"%(country_code)s: Landskode"
 
 #. module: base
 #: model:res.country,name:base.mu
@@ -5130,7 +5700,7 @@ msgstr "Full tilgang"
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_pt
 msgid "Plano de contas SNC para Portugal"
-msgstr ""
+msgstr "Kontoplan for Portugal"
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -5142,24 +5712,24 @@ msgstr "Sikkerhet"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Portuguese / Português"
-msgstr ""
+msgstr "Portugisisk / Português"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:372
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
-msgstr ""
+msgstr "Endring av lagringssystemet for feltet \"%s\" er ikke tillatt."
 
 #. module: base
 #: help:res.partner.bank,company_id:0
 msgid "Only if this bank account belong to your company"
-msgstr ""
+msgstr "Kun hvis denne bankkontoen tilhører ditt selskap"
 
 #. module: base
 #: code:addons/base/ir/ir_fields.py:337
 #, python-format
 msgid "Unknown sub-field '%s'"
-msgstr ""
+msgstr "Ukjent underfelt '%s'"
 
 #. module: base
 #: model:res.country,name:base.za
@@ -5198,11 +5768,17 @@ msgid ""
 "Collects web application usage with Google Analytics.\n"
 "    "
 msgstr ""
+"\n"
+"Google Analytics.\n"
+"==============\n"
+"\n"
+"Samler bruksdata for webapplikasjonen via Google Analytics.\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment Process"
-msgstr ""
+msgstr "Rekrutteringsprosess"
 
 #. module: base
 #: model:res.country,name:base.br
@@ -5228,12 +5804,12 @@ msgstr "Neste nummer"
 #. module: base
 #: help:workflow.transition,condition:0
 msgid "Expression to be satisfied if we want the transition done."
-msgstr ""
+msgstr "Uttrykk som må være sant hvis overgangen skal utføres"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (PA) / Español (PA)"
-msgstr "Spanish (PA) / Español (PA)"
+msgstr "Spansk (PA) / Español (PA)"
 
 #. module: base
 #: view:res.currency:0
@@ -5244,7 +5820,7 @@ msgstr "Rater"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_email_template
 msgid "Email Templates"
-msgstr ""
+msgstr "Epostmaler"
 
 #. module: base
 #: model:res.country,name:base.sy
@@ -5259,13 +5835,13 @@ msgstr "======================================================"
 #. module: base
 #: sql_constraint:ir.model:0
 msgid "Each model must be unique!"
-msgstr ""
+msgstr "Hver modell må være unik!"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_localization
 #: model:ir.ui.menu,name:base.menu_localisation
 msgid "Localization"
-msgstr ""
+msgstr "Lokalisering"
 
 #. module: base
 #: model:ir.module.module,description:base.module_web_api
@@ -5275,6 +5851,10 @@ msgid ""
 "================\n"
 "\n"
 msgstr ""
+"\n"
+"Openerp Web API.\n"
+"================\n"
+"\n"
 
 #. module: base
 #: selection:res.request,state:0
@@ -5293,7 +5873,7 @@ msgstr "Dato"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_event_moodle
 msgid "Event Moodle"
-msgstr ""
+msgstr "Arrangements-Moodle"
 
 #. module: base
 #: model:ir.module.module,description:base.module_email_template
@@ -5344,12 +5924,12 @@ msgstr ""
 #. module: base
 #: model:ir.ui.menu,name:base.menu_partner_category_form
 msgid "Partner Tags"
-msgstr ""
+msgstr "Partnertagger"
 
 #. module: base
 #: view:res.company:0
 msgid "Preview Header/Footer"
-msgstr ""
+msgstr "Forhåndsvis topptekst/bunntekst"
 
 #. module: base
 #: field:ir.ui.menu,parent_id:0
@@ -5360,13 +5940,15 @@ msgstr "Overordnet meny"
 #. module: base
 #: field:res.partner.bank,owner_name:0
 msgid "Account Owner Name"
-msgstr ""
+msgstr "Kontoeiers navn"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:420
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
 msgstr ""
+"Kan ikke gi nytt navn til kolonnen %s, siden den kolonnen allerede "
+"eksisterer!"
 
 #. module: base
 #: view:ir.attachment:0
@@ -5376,18 +5958,18 @@ msgstr "Knyttet til"
 #. module: base
 #: field:res.lang,decimal_point:0
 msgid "Decimal Separator"
-msgstr "Desimal separator"
+msgstr "Desimalseparator"
 
 #. module: base
 #: code:addons/orm.py:5319
 #, python-format
 msgid "Missing required value for the field '%s'."
-msgstr ""
+msgstr "Mangler påkrevd verdi for feltet '%s'."
 
 #. module: base
 #: view:ir.rule:0
 msgid "Write Access Right"
-msgstr ""
+msgstr "Skrivetilgangsrettighet"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_res_groups
@@ -5399,12 +5981,17 @@ msgid ""
 "to see. Whether they can have a read, write, create and delete access right "
 "can be managed from here."
 msgstr ""
+"En gruppe er et sett med funksjonelle områder som blir tilegnet brukeren for "
+"å gi dem tilgang og rettigheter til spesifikke applikasjoner og oppgaver i "
+"systemet. Du kan lage egne grupper, eller redigere allerede eksisterende "
+"grupper for å tilpasse menyen brukerene vil se. Les, skriv, opprett og slett-"
+"tilganger kan også bli håndtert herifra."
 
 #. module: base
 #: view:ir.filters:0
 #: field:ir.filters,name:0
 msgid "Filter Name"
-msgstr ""
+msgstr "Filternavn"
 
 #. module: base
 #: view:ir.attachment:0
@@ -5416,12 +6003,12 @@ msgstr "Historikk"
 #. module: base
 #: model:res.country,name:base.im
 msgid "Isle of Man"
-msgstr ""
+msgstr "Isle of Man"
 
 #. module: base
 #: help:ir.actions.client,res_model:0
 msgid "Optional model, mostly used for needactions."
-msgstr ""
+msgstr "Opsjonell modell, for det meste brukt for needactions."
 
 #. module: base
 #: code:addons/base/module/module.py:306
@@ -5437,7 +6024,7 @@ msgstr "Bouvet øyene"
 #. module: base
 #: field:ir.model.constraint,type:0
 msgid "Constraint Type"
-msgstr ""
+msgstr "Begrensningstype"
 
 #. module: base
 #: field:res.company,child_ids:0
@@ -5478,7 +6065,7 @@ msgstr "Felt"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_project_long_term
 msgid "Long Term Projects"
-msgstr ""
+msgstr "Langtidsprosjekter"
 
 #. module: base
 #: model:res.country,name:base.ve
@@ -5498,12 +6085,12 @@ msgstr "Zambia"
 #. module: base
 #: view:ir.actions.todo:0
 msgid "Launch Configuration Wizard"
-msgstr ""
+msgstr "Start konfigurasjonsveiviser"
 
 #. module: base
 #: model:ir.module.module,summary:base.module_mrp
 msgid "Manufacturing Orders, Bill of Materials, Routing"
-msgstr ""
+msgstr "Produksjonsordre, materiallister, routing"
 
 #. module: base
 #: field:ir.attachment,name:0
@@ -5576,7 +6163,7 @@ msgstr ""
 #. module: base
 #: model:res.groups,name:base.group_sale_salesman_all_leads
 msgid "See all Leads"
-msgstr ""
+msgstr "Se alle leads"
 
 #. module: base
 #: model:res.country,name:base.ci
@@ -5602,7 +6189,7 @@ msgstr "Ressursnavn"
 #. module: base
 #: model:ir.ui.menu,name:base.menu_ir_filters
 msgid "User-defined Filters"
-msgstr ""
+msgstr "Brukerdefinerte filter"
 
 #. module: base
 #: field:ir.actions.act_window_close,name:0
@@ -5645,8 +6232,8 @@ msgid ""
 "If set to true, the action will not be displayed on the right toolbar of a "
 "form view"
 msgstr ""
-"Hvis satt til sann, så vil ikke handlingen vises på den høyre verktøylinjen "
-"i skjemavisning."
+"Hvis satt til sann, vil ikke handlingen vises på den høyre verktøylinjen i "
+"skjemavisning."
 
 #. module: base
 #: model:res.country,name:base.ms
@@ -5656,18 +6243,18 @@ msgstr "Montserrat"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_decimal_precision
 msgid "Decimal Precision Configuration"
-msgstr ""
+msgstr "Desimalpresisjon konfigurasjon"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_act_url
 #: selection:ir.ui.menu,action:0
 msgid "ir.actions.act_url"
-msgstr ""
+msgstr "ir.actions.act_url"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_translation_app
 msgid "Application Terms"
-msgstr "Begrep i applikasjonen"
+msgstr "Applikasjonsvilkår"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.open_module_tree
@@ -5676,6 +6263,9 @@ msgid ""
 "              <p>You should try others search criteria.</p>\n"
 "            "
 msgstr ""
+"<p><b>Ingen modul funnet!</b></p>\n"
+"              <p>Du bør prøve andre søkekriterier.</p>\n"
+"            "
 
 #. module: base
 #: model:ir.model,name:base.model_ir_module_module
@@ -5693,7 +6283,7 @@ msgstr "Modul"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "English (UK)"
-msgstr "Britisk Engelsk"
+msgstr "Engelsk (UK)"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -5711,12 +6301,14 @@ msgid ""
 "Source activity. When this activity is over, the condition is tested to "
 "determine if we can start the ACT_TO activity."
 msgstr ""
+"Kildeaktivitet. Når denne aktiviteten er fullført, blir vilkårsbegrepet "
+"testet for å se om vi skal starte ACT_TO aktiviteten."
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_generic_modules_accounting
 #: view:res.company:0
 msgid "Accounting"
-msgstr ""
+msgstr "Regnskap"
 
 #. module: base
 #: model:ir.module.module,description:base.module_base_vat
@@ -5777,17 +6369,17 @@ msgstr "Web"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_lunch
 msgid "Lunch Orders"
-msgstr ""
+msgstr "Lunsjordre"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "English (CA)"
-msgstr ""
+msgstr "Engelsk (CA)"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_human_resources
 msgid "Human Resources"
-msgstr ""
+msgstr "Personalstyring"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_syscohada
@@ -5813,7 +6405,7 @@ msgstr ""
 #. module: base
 #: view:ir.translation:0
 msgid "Comments"
-msgstr ""
+msgstr "Kommentarer"
 
 #. module: base
 #: model:res.country,name:base.et
@@ -5823,7 +6415,7 @@ msgstr "Etiopia"
 #. module: base
 #: model:ir.module.category,name:base.module_category_authentication
 msgid "Authentication"
-msgstr ""
+msgstr "Autentisering"
 
 #. module: base
 #: model:res.country,name:base.sj
@@ -5839,7 +6431,7 @@ msgstr "ir.actions.wizard"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_kanban
 msgid "Base Kanban"
-msgstr ""
+msgstr "Base Kanban"
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -5857,7 +6449,7 @@ msgstr "tittel"
 #: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "true"
-msgstr ""
+msgstr "sann"
 
 #. module: base
 #: model:ir.model,name:base.model_base_language_install
@@ -5867,7 +6459,7 @@ msgstr "Installer språk"
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_11
 msgid "Services"
-msgstr ""
+msgstr "Tjenester"
 
 #. module: base
 #: view:ir.translation:0
@@ -5877,7 +6469,7 @@ msgstr "Oversettelse"
 #. module: base
 #: selection:res.request,state:0
 msgid "closed"
-msgstr "lukket"
+msgstr "avsluttet"
 
 #. module: base
 #: selection:base.language.export,state:0
@@ -5887,12 +6479,12 @@ msgstr "hent"
 #. module: base
 #: help:ir.model.fields,on_delete:0
 msgid "On delete property for many2one fields"
-msgstr "On delete property for many2one fields"
+msgstr "On delete attributt for mange-til-en felt"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_accounting_and_finance
 msgid "Accounting & Finance"
-msgstr ""
+msgstr "Regnskap & Finans"
 
 #. module: base
 #: field:ir.actions.server,write_id:0
@@ -5909,7 +6501,7 @@ msgstr "Produkter"
 #: model:ir.ui.menu,name:base.menu_values_form_defaults
 #: view:ir.values:0
 msgid "User-defined Defaults"
-msgstr ""
+msgstr "Brukerdefinerte standarder"
 
 #. module: base
 #: model:ir.module.module,description:base.module_auth_signup
@@ -5919,12 +6511,16 @@ msgid ""
 "===============================================\n"
 "    "
 msgstr ""
+"\n"
+"Lar brukere registrere seg og resette passordet sitt\n"
+"===============================================\n"
+"    "
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_usability
 #: view:res.users:0
 msgid "Usability"
-msgstr ""
+msgstr "Brukervennlighet"
 
 #. module: base
 #: field:ir.actions.act_window,domain:0
@@ -5975,6 +6571,19 @@ msgid ""
 "documentation at http://doc.openerp.com.\n"
 "    "
 msgstr ""
+"\n"
+"Tilbyr en felles EDI plattform som andre applikasjoner kan bruke.\n"
+"========================================================\n"
+"\n"
+"OpenERP spesifiserer et generisk EDI format for utveksling av dokumenter "
+"mellom\n"
+"forskjellige systemer, og tilbyr mekanismer for å importere og eksportere "
+"dem.\n"
+"\n"
+"Flere detaljer om OpenERPs EDI format kan du finne i OpenERPs tekniske "
+"dokumentasjon\n"
+"på http://doc.openerp.com.\n"
+"    "
 
 #. module: base
 #: code:addons/base/ir/workflow/workflow.py:99
@@ -5994,11 +6603,14 @@ msgid ""
 "deleting it (if you delete a native record rule, it may be re-created when "
 "you reload the module."
 msgstr ""
+"Hvis du fjerner avmerkingen for det aktive feltet, vil det deaktivere "
+"regelen for posten uten å slette den. (Hvis du sletter en innebygd regel, "
+"kan det hende den skapes på nytt når du laster inn modulen)"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (BO) / Español (BO)"
-msgstr "Spanish (BO) / Español (BO)"
+msgstr "Spansk (BO) / Español (BO)"
 
 #. module: base
 #: model:ir.module.module,description:base.module_board
@@ -6010,6 +6622,12 @@ msgid ""
 "Allows users to create custom dashboard.\n"
 "    "
 msgstr ""
+"\n"
+"Lar brukeren lage et tilpasset instrumentpanel.\n"
+"=======================================\n"
+"\n"
+"Lar brukere lage tilpassede instrumentpanel.\n"
+"    "
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_access_act
@@ -6028,6 +6646,8 @@ msgid ""
 "How many times the method is called,\n"
 "a negative number indicates no limit."
 msgstr ""
+"Hvor mange ganger metoden kalles,\n"
+"et negativt nummer betyr ingen begrensning."
 
 #. module: base
 #: field:res.partner.bank.type.field,bank_type_id:0
@@ -6045,7 +6665,7 @@ msgstr "Navnet på gruppen kan ikke starte med \"-\""
 #: view:ir.module.module:0
 #: model:ir.ui.menu,name:base.module_mi
 msgid "Apps"
-msgstr ""
+msgstr "Applikasjoner"
 
 #. module: base
 #: view:ir.ui.view_sc:0
@@ -6060,7 +6680,7 @@ msgstr "Initiell dato"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Gujarati / ગુજરાતી"
-msgstr ""
+msgstr "Gujarati / ગુજરાતી"
 
 #. module: base
 #: code:addons/base/module/module.py:361
@@ -6068,11 +6688,13 @@ msgstr ""
 msgid ""
 "Unable to process module \"%s\" because an external dependency is not met: %s"
 msgstr ""
+"Kunne ikke prosessere modulen \"%s\" fordi en ekstern avhengighet ikke er "
+"møtt: %s"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll
 msgid "Belgium - Payroll"
-msgstr ""
+msgstr "Belgia - Lønnsavregning"
 
 #. module: base
 #: view:workflow.activity:0
@@ -6093,17 +6715,17 @@ msgstr "Bankkontoeier"
 #. module: base
 #: model:ir.module.category,name:base.module_category_uncategorized
 msgid "Uncategorized"
-msgstr ""
+msgstr "Ikke kategorisert"
 
 #. module: base
 #: view:res.partner:0
 msgid "Phone:"
-msgstr ""
+msgstr "Telefonnummer:"
 
 #. module: base
 #: field:res.partner,is_company:0
 msgid "Is a Company"
-msgstr ""
+msgstr "Er et firma"
 
 #. module: base
 #: selection:ir.cron,interval_type:0
@@ -6130,11 +6752,14 @@ msgid ""
 "form, signal tests the name of the pressed button. If signal is NULL, no "
 "button is necessary to validate this transition."
 msgstr ""
+"Når overgangen startes på grunn av et tasteslag i klientskjemaet, tester "
+"signal navnet til den trykte tasten. Hvis signal er NULL, er det ikke "
+"nødvendig å trykke en tast for å validere overgangen."
 
 #. module: base
 #: field:ir.ui.view.custom,ref_id:0
 msgid "Original View"
-msgstr "Orginal visning"
+msgstr "Original visning"
 
 #. module: base
 #: model:ir.module.module,description:base.module_web_kanban
@@ -6144,48 +6769,53 @@ msgid ""
 "========================\n"
 "\n"
 msgstr ""
+"\n"
+"OpenERP Web kanban visning.\n"
+"========================\n"
+"\n"
 
 #. module: base
 #: code:addons/base/ir/ir_fields.py:182
 #, python-format
 msgid "'%s' does not seem to be a number for field '%%(field)s'"
-msgstr ""
+msgstr "'%s' ser ikke ut til å være et tall for felt '%%(field)s'"
 
 #. module: base
 #: help:res.country.state,name:0
 msgid ""
 "Administrative divisions of a country. E.g. Fed. State, Departement, Canton"
 msgstr ""
+"Administrative inndelinger for landet. For eksempel stat, departement, fylke"
 
 #. module: base
 #: view:res.partner.bank:0
 msgid "My Banks"
-msgstr ""
+msgstr "Mine banker"
 
 #. module: base
 #: sql_constraint:ir.filters:0
 msgid "Filter names must be unique"
-msgstr ""
+msgstr "Filternavn må være unike"
 
 #. module: base
 #: help:multi_company.default,object_id:0
 msgid "Object affected by this rule"
-msgstr ""
+msgstr "Objekt påvirket av denne regelen"
 
 #. module: base
 #: selection:ir.actions.act_window,target:0
 msgid "Inline View"
-msgstr ""
+msgstr "Inline visning"
 
 #. module: base
 #: field:ir.filters,is_default:0
 msgid "Default filter"
-msgstr ""
+msgstr "Standard filter"
 
 #. module: base
 #: report:ir.module.reference:0
 msgid "Directory"
-msgstr "Katalogområde"
+msgstr "Mappe"
 
 #. module: base
 #: field:wizard.ir.model.menu.create,name:0
@@ -6195,7 +6825,7 @@ msgstr "Menynavn"
 #. module: base
 #: field:ir.values,key2:0
 msgid "Qualifier"
-msgstr ""
+msgstr "Kvalifiserer"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_be_coda
@@ -6309,17 +6939,17 @@ msgstr "Malaysia"
 #: code:addons/base/ir/ir_sequence.py:160
 #, python-format
 msgid "Increment number must not be zero."
-msgstr ""
+msgstr "Inkrementtallet kan ikke være null."
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_cancel
 msgid "Cancel Journal Entries"
-msgstr ""
+msgstr "Kanseller journallinjer"
 
 #. module: base
 #: field:res.partner,tz_offset:0
 msgid "Timezone offset"
-msgstr ""
+msgstr "Tidssone"
 
 #. module: base
 #: model:ir.module.module,description:base.module_marketing_campaign
@@ -6365,6 +6995,9 @@ msgid ""
 "If enabled, the full output of SMTP sessions will be written to the server "
 "log at DEBUG level(this is very verbose and may include confidential info!)"
 msgstr ""
+"Hvis skrudd på, vil all utdata fra SMTP sesjoner bli skrevet til "
+"serverloggen på DEBUG nivå (Dette er veldig detaljert, og kan inneholde "
+"konfidensiell informasjon!)"
 
 #. module: base
 #: model:ir.module.module,description:base.module_sale_margin
@@ -6381,7 +7014,7 @@ msgstr ""
 #. module: base
 #: selection:ir.actions.todo,type:0
 msgid "Launch Automatically"
-msgstr ""
+msgstr "Start automatisk"
 
 #. module: base
 #: help:ir.model.fields,translate:0
@@ -6389,6 +7022,8 @@ msgid ""
 "Whether values for this field can be translated (enables the translation "
 "mechanism for that field)"
 msgstr ""
+"Kan verdier for dette feltet oversettes? (Skrur på oversettelsesmekanismen "
+"for det feltet)"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -6403,7 +7038,7 @@ msgstr "Cape Verde"
 #. module: base
 #: model:res.groups,comment:base.group_sale_salesman
 msgid "the user will have access to his own data in the sales application."
-msgstr ""
+msgstr "brukeren vil ha tilgang til sine egne data i salgsapplikasjonen."
 
 #. module: base
 #: model:res.groups,comment:base.group_user
@@ -6411,12 +7046,14 @@ msgid ""
 "the user will be able to manage his own human resources stuff (leave "
 "request, timesheets, ...), if he is linked to an employee in the system."
 msgstr ""
+"brukeren vil være i stand til å håndtere sine egne data (fridager, "
+"timelister, ....), hvis han er registrert som en ansatt i systemet."
 
 #. module: base
 #: code:addons/orm.py:2247
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
-msgstr ""
+msgstr "Det fins ingen visning av typen '%s' for denne strukturen!"
 
 #. module: base
 #: help:ir.values,key:0
@@ -6424,6 +7061,8 @@ msgid ""
 "- Action: an action attached to one slot of the given model\n"
 "- Default: a default value for a model field"
 msgstr ""
+"-Action: en handling koblet til en gitt modell\n"
+"-Default: en standard verdi for et modellfelt"
 
 #. module: base
 #: field:base.module.update,add:0
@@ -6433,7 +7072,7 @@ msgstr "Antall moduler lagt til"
 #. module: base
 #: view:res.currency:0
 msgid "Price Accuracy"
-msgstr ""
+msgstr "Prisnøyaktighet"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -6455,12 +7094,12 @@ msgstr "Opprettet menyer"
 #: view:ir.module.module:0
 #, python-format
 msgid "Uninstall"
-msgstr ""
+msgstr "Avinstaller"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_budget
 msgid "Budgets Management"
-msgstr ""
+msgstr "Budsjettstyring"
 
 #. module: base
 #: field:workflow.triggers,workitem_id:0
@@ -6470,7 +7109,7 @@ msgstr "Arbeidselement"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_anonymization
 msgid "Database Anonymization"
-msgstr ""
+msgstr "Databaseanonymisering"
 
 #. module: base
 #: selection:ir.mail_server,smtp_encryption:0
@@ -6528,24 +7167,24 @@ msgstr "E-post konfigurasjon"
 #. module: base
 #: model:ir.model,name:base.model_ir_cron
 msgid "ir.cron"
-msgstr "ir.actions.actions"
+msgstr "ir.cron"
 
 #. module: base
 #: model:res.country,name:base.cw
 msgid "Curaçao"
-msgstr ""
+msgstr "Curaçao"
 
 #. module: base
 #: view:ir.sequence:0
 msgid "Current Year without Century: %(y)s"
-msgstr ""
+msgstr "Inneværende år uten århundre: %(y)s"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_config_list_action
 #: view:ir.config_parameter:0
 #: model:ir.ui.menu,name:base.ir_config_menu
 msgid "System Parameters"
-msgstr ""
+msgstr "Systeminnstillinger"
 
 #. module: base
 #: help:ir.actions.client,tag:0
@@ -6553,16 +7192,18 @@ msgid ""
 "An arbitrary string, interpreted by the client according to its own needs "
 "and wishes. There is no central tag repository across clients."
 msgstr ""
+"En hvilken som helst tekststreng, tolket av klienten etter egne behov eller "
+"ønsker. Det er ingen sentral mappe for tagger på tvers av klienter."
 
 #. module: base
 #: sql_constraint:ir.rule:0
 msgid "Rule must have at least one checked access right !"
-msgstr ""
+msgstr "Regelen må ha minst en tilgangsrettighet sjekket!"
 
 #. module: base
 #: field:res.partner.bank.type,format_layout:0
 msgid "Format Layout"
-msgstr ""
+msgstr "Formater utseende"
 
 #. module: base
 #: model:ir.module.module,description:base.module_document_ftp
@@ -6586,13 +7227,13 @@ msgstr "Størrelse"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_audittrail
 msgid "Audit Trail"
-msgstr ""
+msgstr "Revisjonssporing"
 
 #. module: base
 #: code:addons/base/ir/ir_fields.py:264
 #, python-format
 msgid "Value '%s' not found in selection field '%%(field)s'"
-msgstr ""
+msgstr "Verdi '%s' ble ikke funnet i utvalgsfeltet '%%(field)s'"
 
 #. module: base
 #: model:res.country,name:base.sd
@@ -6605,7 +7246,7 @@ msgstr "Sudan"
 #: field:res.currency.rate,currency_rate_type_id:0
 #: view:res.currency.rate.type:0
 msgid "Currency Rate Type"
-msgstr ""
+msgstr "Valuta vekslingstype"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_fr
@@ -6658,7 +7299,7 @@ msgstr "Menyer"
 #. module: base
 #: selection:ir.actions.todo,type:0
 msgid "Launch Manually Once"
-msgstr ""
+msgstr "Start manuelt en gang"
 
 #. module: base
 #: view:workflow:0
@@ -6673,7 +7314,7 @@ msgstr "Arbeidsflyt"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Serbian (Latin) / srpski"
-msgstr ""
+msgstr "Serbisk (Latin) / srpski"
 
 #. module: base
 #: model:res.country,name:base.il
@@ -6684,22 +7325,22 @@ msgstr "Israel"
 #: code:addons/base/res/res_config.py:475
 #, python-format
 msgid "Cannot duplicate configuration!"
-msgstr ""
+msgstr "Kan ikke duplisere konfigurasjon!"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_syscohada
 msgid "OHADA - Accounting"
-msgstr ""
+msgstr "OHADA - Regnskapsføring"
 
 #. module: base
 #: help:res.bank,bic:0
 msgid "Sometimes called BIC or Swift."
-msgstr ""
+msgstr "Noen ganger kalt BIC eller Swift."
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_in
 msgid "Indian - Accounting"
-msgstr ""
+msgstr "India - Regnskapsføring"
 
 #. module: base
 #: field:res.lang,time_format:0
@@ -6709,12 +7350,12 @@ msgstr "Tidsformat"
 #. module: base
 #: field:res.company,rml_header3:0
 msgid "RML Internal Header for Landscape Reports"
-msgstr ""
+msgstr "RML intern topptekst for rapporter i landskapsformat"
 
 #. module: base
 #: model:res.groups,name:base.group_partner_manager
 msgid "Contact Creation"
-msgstr ""
+msgstr "Kontakt skapt"
 
 #. module: base
 #: view:ir.module.module:0
@@ -6724,7 +7365,7 @@ msgstr "Definerte rapporter"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_project_gtd
 msgid "Todo Lists"
-msgstr ""
+msgstr "Oppgavelister"
 
 #. module: base
 #: view:ir.actions.report.xml:0
@@ -6765,21 +7406,27 @@ msgid ""
 "This module provides the core of the OpenERP Web Client.\n"
 "        "
 msgstr ""
+"\n"
+"OpenERP Web core module.\n"
+"========================\n"
+"\n"
+"Denne modulen tilbyr kjernen i OpenERP webklienten.\n"
+"        "
 
 #. module: base
 #: view:ir.sequence:0
 msgid "Week of the Year: %(woy)s"
-msgstr ""
+msgstr "Ukenummer: %(woy)s"
 
 #. module: base
 #: field:res.users,id:0
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: base
 #: field:ir.cron,doall:0
 msgid "Repeat Missed"
-msgstr "Repeter uteblitte"
+msgstr "Repeter manglende"
 
 #. module: base
 #: code:addons/base/module/wizard/base_module_import.py:67
@@ -6796,17 +7443,17 @@ msgstr "Objektkobling"
 #: field:ir.module.category,xml_id:0
 #: field:ir.ui.view,xml_id:0
 msgid "External ID"
-msgstr ""
+msgstr "Ekstern ID"
 
 #. module: base
 #: help:res.currency.rate,rate:0
 msgid "The rate of the currency to the currency of rate 1"
-msgstr "The rate of the currency to the currency of rate 1"
+msgstr "Vekslingsraten til valutaen mot valutaen med vekslingsrate lik 1"
 
 #. module: base
 #: model:res.country,name:base.uk
 msgid "United Kingdom"
-msgstr "United Kingdom"
+msgstr "Storbritannia"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_pa
@@ -6833,24 +7480,24 @@ msgstr "Botswana"
 #. module: base
 #: view:res.partner.title:0
 msgid "Partner Titles"
-msgstr "Partner titler"
+msgstr "Partnertitler"
 
 #. module: base
 #: code:addons/base/ir/ir_fields.py:196
 #: code:addons/base/ir/ir_fields.py:227
 #, python-format
 msgid "Use the format '%s'"
-msgstr ""
+msgstr "Bruk formatet '%s'"
 
 #. module: base
 #: help:ir.actions.act_window,auto_refresh:0
 msgid "Add an auto-refresh on the view"
-msgstr "Legg til automatisk oppdatereing av denne visningen"
+msgstr "Legg til automatisk oppdatering av denne visningen"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_crm_profiling
 msgid "Customer Profiling"
-msgstr ""
+msgstr "Kundeprofilering"
 
 #. module: base
 #: selection:ir.cron,interval_type:0
@@ -6860,7 +7507,7 @@ msgstr "Arbeidsdager"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_multi_company
 msgid "Multi-Company"
-msgstr ""
+msgstr "Flerfirma"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_workflow_workitem_form
@@ -6872,12 +7519,12 @@ msgstr "Arbeidselementer"
 #: code:addons/base/res/res_bank.py:195
 #, python-format
 msgid "Invalid Bank Account Type Name format."
-msgstr ""
+msgstr "Ugyldig navneformat for kontotype"
 
 #. module: base
 #: view:ir.filters:0
 msgid "Filters visible only for one user"
-msgstr ""
+msgstr "Filter synlig for bare en bruker"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_attachment
@@ -6891,6 +7538,8 @@ msgid ""
 "You cannot perform this operation. New Record Creation is not allowed for "
 "this object as this object is for reporting purpose."
 msgstr ""
+"Du kan ikke utføre denne operasjonen. Nye poster kan ikke lages på dette "
+"objektet, da det er et rapporteringsobjekt."
 
 #. module: base
 #: model:ir.module.module,description:base.module_base_import
@@ -6920,12 +7569,12 @@ msgstr ""
 #. module: base
 #: selection:res.currency,position:0
 msgid "After Amount"
-msgstr ""
+msgstr "Etter beløp"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Lithuanian / Lietuvių kalba"
-msgstr ""
+msgstr "Litauensk / Lietuvių kalba"
 
 #. module: base
 #: help:ir.actions.server,record_id:0
@@ -6933,23 +7582,23 @@ msgid ""
 "Provide the field name where the record id is stored after the create "
 "operations. If it is empty, you can not track the new record."
 msgstr ""
-"Angi feltnavnet hvor nøkkel på nøkkelen på raden blir lagret etter "
-"oppretting. Hvis den er tom kan du ikke spore den nye raden."
+"Angi feltnavnet hvor postens ID blir lagret etter oppretting. Hvis den er "
+"tom, kan du ikke spore den nye posten."
 
 #. module: base
 #: model:res.groups,comment:base.group_hr_user
 msgid "the user will be able to approve document created by employees."
-msgstr ""
+msgstr "brukeren vil kunne godkjenne dokumenter laget av ansatte."
 
 #. module: base
 #: field:ir.ui.menu,needaction_enabled:0
 msgid "Target model uses the need action mechanism"
-msgstr ""
+msgstr "Målmodellen bruker 'trenger handling' mekanismen"
 
 #. module: base
 #: help:ir.model.fields,relation:0
 msgid "For relationship fields, the technical name of the target model"
-msgstr ""
+msgstr "For relasjonsfelt, det tekniske navnet til målmodellen"
 
 #. module: base
 #: view:res.lang:0
@@ -6962,16 +7611,18 @@ msgid ""
 "If you enable this option, existing translations (including custom ones) "
 "will be overwritten and replaced by those in this file"
 msgstr ""
+"Hvis du skrur på dette valget, vil nåværende oversettelser (inkludert "
+"tilpassede oversettelser) bli overskrevet av oversettelser fra denne filen"
 
 #. module: base
 #: field:ir.ui.view,inherit_id:0
 msgid "Inherited View"
-msgstr "Inherited View"
+msgstr "Nedarvet visning"
 
 #. module: base
 #: view:ir.translation:0
 msgid "Source Term"
-msgstr ""
+msgstr "Kildedata"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_project_management
@@ -6984,7 +7635,7 @@ msgstr "Prosjekt"
 #. module: base
 #: field:ir.ui.menu,web_icon_hover_data:0
 msgid "Web Icon Image (hover)"
-msgstr ""
+msgstr "Webikon bilde (hover)"
 
 #. module: base
 #: view:base.module.import:0
@@ -6996,7 +7647,7 @@ msgstr "Modul ble importert uten feil !"
 #: view:ir.model.constraint:0
 #: model:ir.ui.menu,name:base.ir_model_constraint_menu
 msgid "Model Constraints"
-msgstr ""
+msgstr "Modellbegrensninger"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_workflow_transition_form
@@ -7009,12 +7660,12 @@ msgstr "Overganger"
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
 msgid "Timesheets"
-msgstr ""
+msgstr "Timelister"
 
 #. module: base
 #: help:ir.values,company_id:0
 msgid "If set, action binding only applies for this company"
-msgstr ""
+msgstr "Hvis satt, gjelder handlingsbindingen kun for dette firmaet"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_cn
@@ -7038,6 +7689,9 @@ msgid ""
 "password, otherwise leave empty. After a change of password, the user has to "
 "login again."
 msgstr ""
+"Spesifiser en verdi bare når du lager en bruker, eller hvis du ønsker å "
+"endre brukerens passord. La stå tomt ellers. Etter at passord har blitt "
+"endret, må brukeren logge inn på nytt."
 
 #. module: base
 #: model:res.country,name:base.so
@@ -7047,7 +7701,7 @@ msgstr "Somalia"
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_doctor
 msgid "Dr."
-msgstr ""
+msgstr "Dr."
 
 #. module: base
 #: model:res.groups,name:base.group_user
@@ -7095,6 +7749,20 @@ msgid ""
 "up a management by affair.\n"
 "    "
 msgstr ""
+"\n"
+"Denne modulen implementerer et timelistesystem.\n"
+"==========================================\n"
+"\n"
+"Hver ansatt kan legge inn og spore tid brukt på forskjellige prosjekter.\n"
+"Et prosjekt er en analytisk konto, og tid brukt på prosjektet genererer "
+"kostnaer på\n"
+"den analytiske kontoen.\n"
+"\n"
+"Mange muligheter for rapportering på time og ressursbruk tilbys.\n"
+"\n"
+"Modulen er tett integrert med kostnadsstyringsmodulen. Den lar deg sette\n"
+"opp styring per affære.\n"
+"    "
 
 #. module: base
 #: field:res.bank,state:0
@@ -7111,23 +7779,23 @@ msgstr "Kopi av"
 #. module: base
 #: field:ir.model.data,display_name:0
 msgid "Record Name"
-msgstr ""
+msgstr "Postens navn"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_client
 #: selection:ir.ui.menu,action:0
 msgid "ir.actions.client"
-msgstr ""
+msgstr "ir.actions.client"
 
 #. module: base
 #: model:res.country,name:base.io
 msgid "British Indian Ocean Territory"
-msgstr "British Indian Ocean Territory"
+msgstr "Det britiske territoriet i Indiahavet"
 
 #. module: base
 #: model:ir.actions.server,name:base.action_server_module_immediate_install
 msgid "Module Immediate Install"
-msgstr ""
+msgstr "Umiddelbar installasjon av modul"
 
 #. module: base
 #: view:ir.actions.server:0
@@ -7147,7 +7815,7 @@ msgstr "Statskode"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_multilang
 msgid "Multi Language Chart of Accounts"
-msgstr ""
+msgstr "Flerspråklig kontoplan"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_gt
@@ -7177,7 +7845,7 @@ msgstr "Oversettbar"
 #. module: base
 #: help:base.language.import,code:0
 msgid "ISO Language and Country code, e.g. en_US"
-msgstr ""
+msgstr "ISO språk- og landskode, f.eks en_US"
 
 #. module: base
 #: model:res.country,name:base.vn
@@ -7197,12 +7865,12 @@ msgstr "Fullt navn"
 #. module: base
 #: view:ir.attachment:0
 msgid "on"
-msgstr ""
+msgstr "på"
 
 #. module: base
 #: view:ir.property:0
 msgid "Parameters that are used by all resources."
-msgstr ""
+msgstr "Parametre som brukes av alle ressurser."
 
 #. module: base
 #: model:res.country,name:base.mz
@@ -7215,6 +7883,8 @@ msgid ""
 "Action bound to this entry - helper field for binding an action, will "
 "automatically set the correct reference"
 msgstr ""
+"Handling knyttet til denne posten - hjelpefelt for å binde en handling, "
+"setter automatisk korrekt referanse"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_project_long_term
@@ -7230,7 +7900,7 @@ msgstr "Melding"
 #: field:ir.actions.act_window.view,multi:0
 #: field:ir.actions.report.xml,multi:0
 msgid "On Multiple Doc."
-msgstr "On Multiple Doc."
+msgstr "På flere dok."
 
 #. module: base
 #: view:base.language.export:0
@@ -7247,17 +7917,17 @@ msgstr "On Multiple Doc."
 #: view:res.users:0
 #: view:wizard.ir.model.menu.create:0
 msgid "or"
-msgstr ""
+msgstr "eller"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_accountant
 msgid "Accounting and Finance"
-msgstr ""
+msgstr "Regnskap og finans"
 
 #. module: base
 #: view:ir.module.module:0
 msgid "Upgrade"
-msgstr ""
+msgstr "Oppgrader"
 
 #. module: base
 #: model:ir.module.module,description:base.module_base_action_rule
@@ -7279,7 +7949,7 @@ msgstr ""
 #. module: base
 #: field:res.partner,function:0
 msgid "Job Position"
-msgstr ""
+msgstr "Stilling"
 
 #. module: base
 #: view:res.partner:0
@@ -7295,7 +7965,7 @@ msgstr "Færøyene"
 #. module: base
 #: field:ir.mail_server,smtp_encryption:0
 msgid "Connection Security"
-msgstr ""
+msgstr "Tilkoblingssikkerhet"
 
 #. module: base
 #: code:addons/base/ir/ir_actions.py:606
@@ -7306,7 +7976,7 @@ msgstr "Vær vennlig å velg en handling å uføre !"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_ec
 msgid "Ecuador - Accounting"
-msgstr ""
+msgstr "Ecuador - Regnskapsføring"
 
 #. module: base
 #: field:res.partner.category,name:0
@@ -7321,12 +7991,12 @@ msgstr "Marianaøyene"
 #. module: base
 #: field:change.password.user,user_login:0
 msgid "User Login"
-msgstr ""
+msgstr "Brukernavn"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
-msgstr ""
+msgstr "Honduras - Regnskapsføring"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_report_intrastat
@@ -7340,6 +8010,8 @@ msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
 "change your own password."
 msgstr ""
+"Vennligst bruk endre passord veiviseren (I brukerinnstillinger eller i "
+"brukermenyen) for å endre ditt eget passord."
 
 #. module: base
 #: model:ir.model,name:base.model_ir_config_parameter
@@ -7379,12 +8051,12 @@ msgstr ""
 #: code:addons/orm.py:2021
 #, python-format
 msgid "Insufficient fields for Calendar View!"
-msgstr ""
+msgstr "Ikke tilstrekkelige felt for kalendervisning!"
 
 #. module: base
 #: selection:ir.property,type:0
 msgid "Integer"
-msgstr "Integer"
+msgstr "Heltall"
 
 #. module: base
 #: help:ir.actions.report.xml,report_rml:0
@@ -7392,16 +8064,18 @@ msgid ""
 "The path to the main report file (depending on Report Type) or NULL if the "
 "content is in another data field"
 msgstr ""
+"Filbane til hovedrapportfilen (avhengig av rapporttype) eller NULL hvis "
+"innholdet er i et annet felt"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_14
 msgid "Manufacturer"
-msgstr ""
+msgstr "Produsent"
 
 #. module: base
 #: help:res.users,company_id:0
 msgid "The company this user is currently working for."
-msgstr ""
+msgstr "Firmaet denne brukeren jobber for."
 
 #. module: base
 #: model:ir.model,name:base.model_wizard_ir_model_menu_create
@@ -7478,11 +8152,14 @@ msgid ""
 "use the same timezone that is otherwise used to pick and render date and "
 "time values: your computer's timezone."
 msgstr ""
+"Partnerens tidssone, som blir brukt til å skrive ut korrekt dato og tid på "
+"raporter. Det er viktig å sette en verdi for dette feltet. Du bør bruke den "
+"samme tidssonen som ellers blir brukt av din datamaskin."
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_analytic_default
 msgid "Account Analytic Defaults"
-msgstr ""
+msgstr "Standardverdier for kontoanalyser"
 
 #. module: base
 #: selection:ir.ui.view,type:0
@@ -7492,7 +8169,7 @@ msgstr "mdx"
 #. module: base
 #: view:ir.cron:0
 msgid "Scheduled Action"
-msgstr ""
+msgstr "Tidsbestemt handling"
 
 #. module: base
 #: model:res.country,name:base.bi
@@ -7510,12 +8187,12 @@ msgstr "Lukk"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (MX) / Español (MX)"
-msgstr "Spanish (MX) / Español (MX)"
+msgstr "Spansk (MX) / Español (MX)"
 
 #. module: base
 #: view:ir.actions.todo:0
 msgid "Wizards to be Launched"
-msgstr ""
+msgstr "Veivisere som skal startes"
 
 #. module: base
 #: model:res.country,name:base.bt
@@ -7541,12 +8218,12 @@ msgstr "Neste nummer på denne sekvensen"
 #. module: base
 #: view:res.partner:0
 msgid "at"
-msgstr ""
+msgstr "på"
 
 #. module: base
 #: view:ir.rule:0
 msgid "Rule Definition (Domain Filter)"
-msgstr ""
+msgstr "Regeldefinisjon (domenefilter)"
 
 #. module: base
 #: selection:ir.actions.act_url,target:0
@@ -7556,7 +8233,7 @@ msgstr "Dette vinduet"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_portal_anonymous
 msgid "Anonymous portal"
-msgstr ""
+msgstr "Anonym portal"
 
 #. module: base
 #: field:base.language.export,format:0
@@ -7566,23 +8243,23 @@ msgstr "Filformat"
 #. module: base
 #: field:res.lang,iso_code:0
 msgid "ISO code"
-msgstr "ISO code"
+msgstr "ISO kode"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_association
 msgid "Associations Management"
-msgstr ""
+msgstr "Relasjonsstyring"
 
 #. module: base
 #: help:ir.model,modules:0
 msgid "List of modules in which the object is defined or inherited"
-msgstr ""
+msgstr "Liste over moduler hvor objektet er definert eller arvet"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_localization_payroll
 #: model:ir.module.module,shortdesc:base.module_hr_payroll
 msgid "Payroll"
-msgstr ""
+msgstr "Lønnsavregning"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_country_state
@@ -7591,11 +8268,14 @@ msgid ""
 "federal states you are working on from here. Each state is attached to one "
 "country."
 msgstr ""
+"Hvis du arbeider med det amerikanske markedet, kan du administrere de "
+"forskjellige føderale statene du jobber med herifra. Hver stat er tilknyttet "
+"et land."
 
 #. module: base
 #: view:workflow.workitem:0
 msgid "Workflow Workitems"
-msgstr "Arbeidsflyt arbeidselementer"
+msgstr "Arbeidselementer i arbeidsflyt"
 
 #. module: base
 #: model:res.country,name:base.vc
@@ -7625,6 +8305,9 @@ msgid ""
 "Allow users to login through OAuth2 Provider.\n"
 "=============================================\n"
 msgstr ""
+"\n"
+"Lar brukere logge på via OAuth2.\n"
+"=============================================\n"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_model_fields
@@ -7634,7 +8317,7 @@ msgstr ""
 #: view:ir.model.fields:0
 #: model:ir.ui.menu,name:base.ir_model_model_fields
 msgid "Fields"
-msgstr "Felter"
+msgstr "Felt"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_employee_form
@@ -7659,17 +8342,17 @@ msgstr ""
 #. module: base
 #: field:res.company,rml_header2:0
 msgid "RML Internal Header"
-msgstr "RML Internal Header"
+msgstr "RML Intern topptekst"
 
 #. module: base
 #: field:ir.actions.act_window,search_view_id:0
 msgid "Search View Ref."
-msgstr ""
+msgstr "Søk Vis Ref."
 
 #. module: base
 #: help:res.users,partner_id:0
 msgid "Partner-related data of the user"
-msgstr ""
+msgstr "Partnerrelatert brukerdata"
 
 #. module: base
 #: model:ir.module.module,description:base.module_crm_todo
@@ -7683,7 +8366,7 @@ msgstr ""
 #. module: base
 #: view:ir.mail_server:0
 msgid "Test Connection"
-msgstr ""
+msgstr "Test tilkobling"
 
 #. module: base
 #: model:res.country,name:base.mm
@@ -7795,7 +8478,7 @@ msgstr "Canada"
 #. module: base
 #: view:base.language.export:0
 msgid "Launchpad"
-msgstr ""
+msgstr "Launchpad"
 
 #. module: base
 #: help:res.currency.rate,currency_rate_type_id:0
@@ -7803,11 +8486,13 @@ msgid ""
 "Allow you to define your own currency rate types, like 'Average' or 'Year to "
 "Date'. Leave empty if you simply want to use the normal 'spot' rate type"
 msgstr ""
+"Lar deg definere dine egne valutaratetyper, slik som gjennomsnittlig, eller "
+"'årsvis til dags dato'. La stå tomt hvis du vil bruke den vanlige spotraten."
 
 #. module: base
 #: selection:ir.module.module.dependency,state:0
 msgid "Unknown"
-msgstr "Unknown"
+msgstr "Ukjent"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_res_users_my
@@ -7818,7 +8503,7 @@ msgstr "Endre mine preferanser"
 #: code:addons/base/ir/ir_actions.py:171
 #, python-format
 msgid "Invalid model name in the action definition."
-msgstr "Ugyldig navn på modell i handlingsdefinisjonen."
+msgstr "Ugyldig modellnavn i handlingsdefinisjonen"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_ro
@@ -7851,12 +8536,12 @@ msgstr "Tilpasset felt"
 #. module: base
 #: model:ir.module.module,summary:base.module_account_accountant
 msgid "Financial and Analytic Accounting"
-msgstr ""
+msgstr "Finans og analytisk regnskap"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_portal_project
 msgid "Portal Project"
-msgstr ""
+msgstr "Portalprosjekt"
 
 #. module: base
 #: model:res.country,name:base.cc
@@ -7868,18 +8553,18 @@ msgstr "Cocos (Keeling) øyene"
 #: selection:base.module.import,state:0
 #: selection:base.module.update,state:0
 msgid "init"
-msgstr ""
+msgstr "init"
 
 #. module: base
 #: view:res.partner:0
 #: field:res.partner,user_id:0
 msgid "Salesperson"
-msgstr ""
+msgstr "Selger"
 
 #. module: base
 #: view:res.lang:0
 msgid "11. %U or %W       ==> 48 (49th week)"
-msgstr "11. %U eler %W       ==> 48 (49. uke)"
+msgstr "11. %U eller %W       ==> 48 (49. uke)"
 
 #. module: base
 #: model:ir.model,name:base.model_res_partner_bank_type_field
@@ -7889,7 +8574,7 @@ msgstr "Banktypefelter"
 #. module: base
 #: constraint:ir.rule:0
 msgid "Rules can not be applied on Transient models."
-msgstr ""
+msgstr "Regler kan ikke bli lagt til på transiente modeller."
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -7899,7 +8584,7 @@ msgstr "Nederlandsk / Nederlands"
 #. module: base
 #: selection:res.company,paper_format:0
 msgid "US Letter"
-msgstr ""
+msgstr "US Letter"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_partner_customer_form
@@ -7917,24 +8602,24 @@ msgstr ""
 #. module: base
 #: model:ir.actions.act_window,name:base.bank_account_update
 msgid "Company Bank Accounts"
-msgstr ""
+msgstr "Firmaets bankkontoer"
 
 #. module: base
 #: code:addons/base/res/res_users.py:473
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
-msgstr "Tomme passord er ikke tillat!"
+msgstr "Tomme passord er ikke tillatt!"
 
 #. module: base
 #: help:ir.mail_server,smtp_pass:0
 msgid "Optional password for SMTP authentication"
-msgstr ""
+msgstr "Opsjonelt passord for SMTP autentisering"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:727
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
-msgstr ""
+msgstr "Beklager, du har ikke tillatelse til å modifisere dette dokumentet."
 
 #. module: base
 #: code:addons/base/res/res_config.py:380
@@ -7944,16 +8629,19 @@ msgid ""
 "\n"
 "This addon is already installed on your system"
 msgstr ""
+"\n"
+"\n"
+"Dette tillegget er allerede installert på ditt system"
 
 #. module: base
 #: help:ir.cron,interval_number:0
 msgid "Repeat every x."
-msgstr "Gjennta hvert x."
+msgstr "Gjenta hvert x."
 
 #. module: base
 #: model:res.partner.bank.type,name:base.bank_normal
 msgid "Normal Bank Account"
-msgstr ""
+msgstr "Normal bankkonto"
 
 #. module: base
 #: field:change.password.user,wizard_id:0
@@ -7965,7 +8653,7 @@ msgstr "Veiviser"
 #: code:addons/base/ir/ir_fields.py:303
 #, python-format
 msgid "database id"
-msgstr ""
+msgstr "database id"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_base_import
@@ -7980,7 +8668,7 @@ msgstr "1cm 28cm 20cm 28cm"
 #. module: base
 #: field:ir.module.module,maintainer:0
 msgid "Maintainer"
-msgstr ""
+msgstr "Vedlikeholdes av"
 
 #. module: base
 #: field:ir.sequence,suffix:0
@@ -8002,7 +8690,7 @@ msgstr "Etiketter"
 msgid ""
 "Select this if you want to set company's address information  for this "
 "contact"
-msgstr ""
+msgstr "Velg dette hvis du vil sette en firmaadresse for denne kontakten"
 
 #. module: base
 #: field:ir.default,field_name:0
@@ -8012,17 +8700,17 @@ msgstr "Objektfelt"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (PE) / Español (PE)"
-msgstr "Spanish (PE) / Español (PE)"
+msgstr "Spansk (PE) / Español (PE)"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "French (CH) / Français (CH)"
-msgstr "French (CH) / Français (CH)"
+msgstr "Fransk (CH) / Français (CH)"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_13
 msgid "Distributor"
-msgstr ""
+msgstr "Distributør"
 
 #. module: base
 #: help:ir.actions.server,subject:0
@@ -8031,6 +8719,9 @@ msgid ""
 "the same values as those available in the condition field, e.g. `Hello [[ "
 "object.partner_id.name ]]`"
 msgstr ""
+"Epost emne, kan inneholde uttrykk i doble braketter basert på samme verdier "
+"som er tilgjengelige i alternativfeltet, f. eks 'Hallo "
+"[[object.partner_id.name]]'"
 
 #. module: base
 #: help:res.partner,image:0
@@ -8038,6 +8729,8 @@ msgid ""
 "This field holds the image used as avatar for this contact, limited to "
 "1024x1024px"
 msgstr ""
+"Dette feltet inneholder bildet som brukes som avatar for denne kontakten, "
+"begrenset til 1024x1024 piksler"
 
 #. module: base
 #: model:res.country,name:base.to
@@ -8051,11 +8744,13 @@ msgid ""
 "serialization field, instead of having its own database column. This cannot "
 "be changed after creation."
 msgstr ""
+"Hvis satt, vil dette feltet bli lagret i serialiseringsfeltet istedet for en "
+"egen databasekolonne. Dette kan ikke endres etter opprettelse."
 
 #. module: base
 #: view:res.partner.bank:0
 msgid "Bank accounts belonging to one of your companies"
-msgstr ""
+msgstr "Bankkontoer som tilhører en av dine firmaer"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_analytic_plans
@@ -8117,22 +8812,22 @@ msgstr ""
 #. module: base
 #: view:base.language.export:0
 msgid "POEdit"
-msgstr ""
+msgstr "POEdit"
 
 #. module: base
 #: view:ir.values:0
 msgid "Client Actions"
-msgstr ""
+msgstr "Klienthandlinger"
 
 #. module: base
 #: field:res.partner.bank.type,field_ids:0
 msgid "Type Fields"
-msgstr ""
+msgstr "Typefelt"
 
 #. module: base
 #: model:ir.module.module,summary:base.module_hr_recruitment
 msgid "Jobs, Recruitment, Applications, Job Interviews"
-msgstr ""
+msgstr "Jobber, rekruttering, søknader, jobbintervju"
 
 #. module: base
 #: code:addons/base/module/module.py:539
@@ -8141,20 +8836,20 @@ msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
 "But this module is not available in your system."
 msgstr ""
-"You try to upgrade a module that depends on the module: %s.\n"
-"But this module is not available in your system."
+"Du prøvde å oppgrade en modul som er avhengig av en annen modul, %s,\n"
+"men den modulen er ikke installert på systemet ditt."
 
 #. module: base
 #: field:workflow.transition,act_to:0
 msgid "Destination Activity"
-msgstr "Aktivitetsblokker"
+msgstr "Målaktivitet"
 
 #. module: base
 #: help:res.currency,position:0
 msgid ""
 "Determines where the currency symbol should be placed after or before the "
 "amount."
-msgstr ""
+msgstr "Skal valutasymbolet vises før eller etter beløpet?"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_pad_project
@@ -8169,7 +8864,7 @@ msgstr "base.update.translations"
 #. module: base
 #: view:ir.rule:0
 msgid "Full Access Right"
-msgstr ""
+msgstr "Full tilgang"
 
 #. module: base
 #: field:res.partner.category,parent_id:0
@@ -8184,7 +8879,7 @@ msgstr "Finland"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_shortcuts
 msgid "Web Shortcuts"
-msgstr ""
+msgstr "Websnarveier"
 
 #. module: base
 #: view:res.partner:0
@@ -8197,7 +8892,7 @@ msgstr "Kontakt"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_at
 msgid "Austria - Accounting"
-msgstr ""
+msgstr "Sveits - Regnskapsføring"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_ui_menu
@@ -8207,7 +8902,7 @@ msgstr "ir.ui.menu"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_project
 msgid "Project Management"
-msgstr ""
+msgstr "Prosjektstyring"
 
 #. module: base
 #: view:ir.module.module:0
@@ -8222,22 +8917,22 @@ msgstr "Kommunikasjon"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_analytic
 msgid "Analytic Accounting"
-msgstr ""
+msgstr "Analytisk bokføring"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_model_constraint
 msgid "ir.model.constraint"
-msgstr ""
+msgstr "ir.model.constraint"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_graph
 msgid "Graph Views"
-msgstr ""
+msgstr "Grafvisninger"
 
 #. module: base
 #: help:ir.model.relation,name:0
 msgid "PostgreSQL table name implementing a many2many relation."
-msgstr ""
+msgstr "PostgreSQL tabellnavn som implementerer en mange-til-mange relasjon"
 
 #. module: base
 #: model:ir.module.module,description:base.module_base
@@ -8246,6 +8941,9 @@ msgid ""
 "The kernel of OpenERP, needed for all installation.\n"
 "===================================================\n"
 msgstr ""
+"\n"
+"Kjernen av OpenERP, nødvendig for alle installasjoner.\n"
+"===================================================\n"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_server_object_lines
@@ -8255,12 +8953,12 @@ msgstr "ir.server.object.lines"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_be
 msgid "Belgium - Accounting"
-msgstr ""
+msgstr "Belgia - Regnskapsføring"
 
 #. module: base
 #: view:ir.model.access:0
 msgid "Access Control"
-msgstr ""
+msgstr "Tilgangskontroll"
 
 #. module: base
 #: model:res.country,name:base.kw
@@ -8270,7 +8968,7 @@ msgstr "Kuwait"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_followup
 msgid "Payment Follow-up Management"
-msgstr ""
+msgstr "Betalingsoppfølging"
 
 #. module: base
 #: field:workflow.workitem,inst_id:0
@@ -8285,20 +8983,20 @@ msgid ""
 "with the object and time variables."
 msgstr ""
 "Dette er filnavnet til vedlegget som benyttes til å lagre resultatet av "
-"utskriften. Behold blankt for ikke å lagre utskrevne rapporter. Du kan "
-"benytte et python uttrykk på objektet og variabler for tid/dato."
+"utskriften. La det være blankt for å ikke lagre utskrevne rapporter. Du kan "
+"benytte et python-uttrykk på objektet, og variabler for tid/dato."
 
 #. module: base
 #: sql_constraint:ir.model.data:0
 msgid ""
 "You cannot have multiple records with the same external ID in the same "
 "module!"
-msgstr ""
+msgstr "Du kan ikke ha flere poster med samme eksterne ID i samme modul!"
 
 #. module: base
 #: selection:ir.property,type:0
 msgid "Many2One"
-msgstr ""
+msgstr "Mange-til-en"
 
 #. module: base
 #: model:res.country,name:base.ng
@@ -8309,27 +9007,27 @@ msgstr "Nigeria"
 #: code:addons/base/ir/ir_model.py:339
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
-msgstr ""
+msgstr "For utvalgsfelt må utvalgsalternativer velges!"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_base_iban
 msgid "IBAN Bank Accounts"
-msgstr ""
+msgstr "IBAN bankkontoer"
 
 #. module: base
 #: field:res.company,user_ids:0
 msgid "Accepted Users"
-msgstr ""
+msgstr "Godkjente brukere"
 
 #. module: base
 #: field:ir.ui.menu,web_icon_data:0
 msgid "Web Icon Image"
-msgstr ""
+msgstr "Webikon bilde"
 
 #. module: base
 #: field:ir.actions.server,wkf_model_id:0
 msgid "Target Object"
-msgstr ""
+msgstr "Målobjekt"
 
 #. module: base
 #: selection:ir.model.fields,select_level:0
@@ -8339,7 +9037,7 @@ msgstr "Alltid søkbar"
 #. module: base
 #: help:res.country.state,code:0
 msgid "The state code in max. three chars."
-msgstr ""
+msgstr "Statskode med maksimalt tre bokstaver."
 
 #. module: base
 #: model:res.country,name:base.hk
@@ -8377,11 +9075,13 @@ msgid ""
 "Model to which this entry applies - helper field for setting a model, will "
 "automatically set the correct model name"
 msgstr ""
+"Modell relatert til denne posten - hjelpefelt for å sette en modell, blir "
+"automatisk oppdatert med korrekt modellnavn"
 
 #. module: base
 #: view:res.lang:0
 msgid "2.  %a ,%A         ==> Fri, Friday"
-msgstr "2.  %a ,%A         ==> Fri, Friday"
+msgstr "2.  %a ,%A         ==> Fre, Fredag"
 
 #. module: base
 #: code:addons/base/ir/ir_translation.py:341
@@ -8390,6 +9090,8 @@ msgid ""
 "Translation features are unavailable until you install an extra OpenERP "
 "translation."
 msgstr ""
+"Oversettelsesfunksjoner er ikke tilgjengelige før du installerer en OpenERP "
+"oversettelse."
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_nl
@@ -8438,6 +9140,7 @@ msgstr ""
 #: help:ir.rule,global:0
 msgid "If no group is specified the rule is global and applied to everyone"
 msgstr ""
+"Hvis ingen grupper er spesifisert, er regelen global og gjelder for alle"
 
 #. module: base
 #: model:res.country,name:base.td
@@ -8450,6 +9153,8 @@ msgid ""
 "The priority of the job, as an integer: 0 means higher priority, 10 means "
 "lower priority."
 msgstr ""
+"Jobbens prioritet, som et heltall: 0 betyr høyest prioritet, 10 er lavere "
+"prioritet."
 
 #. module: base
 #: model:ir.model,name:base.model_workflow_transition
@@ -8469,12 +9174,12 @@ msgstr "Undermenyer"
 #. module: base
 #: report:ir.module.reference:0
 msgid "Introspection report on objects"
-msgstr "Introspektiv rapport på objekter"
+msgstr "Introspektiv objektrapport"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_analytics
 msgid "Google Analytics"
-msgstr ""
+msgstr "Google Analytics"
 
 #. module: base
 #: model:ir.module.module,description:base.module_note
@@ -8502,12 +9207,12 @@ msgstr "Dominica"
 #. module: base
 #: field:ir.translation,name:0
 msgid "Translated field"
-msgstr ""
+msgstr "Oversatt felt"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_stock_location
 msgid "Advanced Routes"
-msgstr ""
+msgstr "Avanserte Ruter"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_pad
@@ -8522,38 +9227,38 @@ msgstr "Nepal"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_document_page
 msgid "Document Page"
-msgstr ""
+msgstr "Dokumentside"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_ar
 msgid "Argentina Localization Chart Account"
-msgstr ""
+msgstr "Argentina lokalisert kontoplan"
 
 #. module: base
 #: field:ir.module.module,description_html:0
 msgid "Description HTML"
-msgstr ""
+msgstr "Beskrivelse HTML"
 
 #. module: base
 #: help:res.groups,implied_ids:0
 msgid "Users of this group automatically inherit those groups"
-msgstr ""
+msgstr "Brukere i denne gruppen arver automatisk disse gruppene"
 
 #. module: base
 #: model:ir.module.module,summary:base.module_note
 msgid "Sticky notes, Collaborative, Memos"
-msgstr ""
+msgstr "Notater, samarbeid, memoer"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_attendance
 #: model:res.groups,name:base.group_hr_attendance
 msgid "Attendances"
-msgstr ""
+msgstr "Tilskuertall"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_warning
 msgid "Warning Messages and Alerts"
-msgstr ""
+msgstr "Advarsler, meldinger og varsler"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_ui_view_custom
@@ -8566,14 +9271,14 @@ msgstr "Tilpassede visninger"
 #: view:base.module.import:0
 #: model:ir.actions.act_window,name:base.action_view_base_module_import
 msgid "Module Import"
-msgstr "Importer modul"
+msgstr "Modulimport"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.act_values_form_action
 #: model:ir.ui.menu,name:base.menu_values_form_action
 #: view:ir.values:0
 msgid "Action Bindings"
-msgstr ""
+msgstr "Handlingsbindinger"
 
 #. module: base
 #: help:res.partner,lang:0
@@ -8581,6 +9286,9 @@ msgid ""
 "If the selected language is loaded in the system, all documents related to "
 "this contact will be printed in this language. If not, it will be English."
 msgstr ""
+"Hvis det valgte språket lastes inn i systemet, vil alle dokumenter relatert "
+"til denne kontakten skrives ut i det språket. Hvis ikke, skrives de ut på "
+"engelsk."
 
 #. module: base
 #: model:ir.module.module,description:base.module_hr_evaluation
@@ -8618,7 +9326,7 @@ msgstr ""
 #. module: base
 #: model:ir.ui.menu,name:base.menu_view_base_module_update
 msgid "Update Modules List"
-msgstr "Oppdater liste over moduler"
+msgstr "Oppdater modulliste"
 
 #. module: base
 #: code:addons/base/module/module.py:359
@@ -8626,11 +9334,13 @@ msgstr "Oppdater liste over moduler"
 msgid ""
 "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
 msgstr ""
+"Kunne ikke oppdatere modulen \"%s\" fordi en ekstern avhengighet ikke er "
+"møtt: %s"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account
 msgid "eInvoicing"
-msgstr ""
+msgstr "eFaktura"
 
 #. module: base
 #: code:addons/base/res/res_users.py:171
@@ -14603,7 +15313,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_anglo_saxon
 msgid "Anglo-Saxon Accounting"
-msgstr ""
+msgstr "Anglo-Saxonsk bokføring"
 
 #. module: base
 #: model:res.country,name:base.vg
diff --git a/openerp/addons/base/i18n/nl.po b/openerp/addons/base/i18n/nl.po
index b4aaf816891..4a4f6f7c658 100644
--- a/openerp/addons/base/i18n/nl.po
+++ b/openerp/addons/base/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-17 06:27+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/nl_BE.po b/openerp/addons/base/i18n/nl_BE.po
index 77072d7c2fe..6e5e9dfda30 100644
--- a/openerp/addons/base/i18n/nl_BE.po
+++ b/openerp/addons/base/i18n/nl_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-06 06:10+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-17 06:39+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/pl.po b/openerp/addons/base/i18n/pl.po
index e5937949593..fd1732b84bd 100644
--- a/openerp/addons/base/i18n/pl.po
+++ b/openerp/addons/base/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-06 06:02+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-17 06:34+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/pt.po b/openerp/addons/base/i18n/pt.po
index c5d033ae761..52a78a2d996 100644
--- a/openerp/addons/base/i18n/pt.po
+++ b/openerp/addons/base/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-06 06:02+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-17 06:34+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/pt_BR.po b/openerp/addons/base/i18n/pt_BR.po
index c3e8cbc8b04..9046510ff23 100644
--- a/openerp/addons/base/i18n/pt_BR.po
+++ b/openerp/addons/base/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-06 06:08+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-17 06:38+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/ro.po b/openerp/addons/base/i18n/ro.po
index 0514b89f49a..f6673dbac48 100644
--- a/openerp/addons/base/i18n/ro.po
+++ b/openerp/addons/base/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-06 06:03+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-17 06:34+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/ru.po b/openerp/addons/base/i18n/ru.po
index b62b98ad974..3a27e13002e 100644
--- a/openerp/addons/base/i18n/ru.po
+++ b/openerp/addons/base/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-06 06:03+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-17 06:35+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/sk.po b/openerp/addons/base/i18n/sk.po
index 5cbded31996..96715829706 100644
--- a/openerp/addons/base/i18n/sk.po
+++ b/openerp/addons/base/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-06 06:05+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-17 06:35+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/sl.po b/openerp/addons/base/i18n/sl.po
index 4331b2fabae..38afbdec884 100644
--- a/openerp/addons/base/i18n/sl.po
+++ b/openerp/addons/base/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-06 06:05+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-17 06:36+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/sq.po b/openerp/addons/base/i18n/sq.po
index ede68058c21..c437e3239fc 100644
--- a/openerp/addons/base/i18n/sq.po
+++ b/openerp/addons/base/i18n/sq.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-06 05:52+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-17 06:24+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/sr.po b/openerp/addons/base/i18n/sr.po
index 54b7905926f..b874a563125 100644
--- a/openerp/addons/base/i18n/sr.po
+++ b/openerp/addons/base/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-06 06:04+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-17 06:35+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/sr@latin.po b/openerp/addons/base/i18n/sr@latin.po
index 74ee567bb2e..cbe7efbd734 100644
--- a/openerp/addons/base/i18n/sr@latin.po
+++ b/openerp/addons/base/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-06 06:13+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-17 06:42+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/sv.po b/openerp/addons/base/i18n/sv.po
index 211033ce83d..6a0cf79e125 100644
--- a/openerp/addons/base/i18n/sv.po
+++ b/openerp/addons/base/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-06 06:06+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-17 06:36+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/th.po b/openerp/addons/base/i18n/th.po
index 1885ab012d4..05505bbcfd2 100644
--- a/openerp/addons/base/i18n/th.po
+++ b/openerp/addons/base/i18n/th.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-06 06:06+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-17 06:37+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/tlh.po b/openerp/addons/base/i18n/tlh.po
index e0e6d635699..5f7ab750b7d 100644
--- a/openerp/addons/base/i18n/tlh.po
+++ b/openerp/addons/base/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-06 06:06+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-17 06:37+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/tr.po b/openerp/addons/base/i18n/tr.po
index 4c3df367ba5..b7b611baf8c 100644
--- a/openerp/addons/base/i18n/tr.po
+++ b/openerp/addons/base/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-06 06:07+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-17 06:37+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/uk.po b/openerp/addons/base/i18n/uk.po
index 8664044d114..e2f348bd5bb 100644
--- a/openerp/addons/base/i18n/uk.po
+++ b/openerp/addons/base/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-06 06:07+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-17 06:37+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/ur.po b/openerp/addons/base/i18n/ur.po
index 848aed92bd9..353c7916bdc 100644
--- a/openerp/addons/base/i18n/ur.po
+++ b/openerp/addons/base/i18n/ur.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-06 06:07+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-17 06:37+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/vi.po b/openerp/addons/base/i18n/vi.po
index 94c5f8cc144..4797698d6a4 100644
--- a/openerp/addons/base/i18n/vi.po
+++ b/openerp/addons/base/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-06 06:07+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-17 06:38+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/zh_CN.po b/openerp/addons/base/i18n/zh_CN.po
index 3410c26e157..88eb3e5e1f8 100644
--- a/openerp/addons/base/i18n/zh_CN.po
+++ b/openerp/addons/base/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-06 06:12+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-17 06:41+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/zh_HK.po b/openerp/addons/base/i18n/zh_HK.po
index e2e5c334fbb..b88a1fe518a 100644
--- a/openerp/addons/base/i18n/zh_HK.po
+++ b/openerp/addons/base/i18n/zh_HK.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-06 06:08+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-17 06:38+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/zh_TW.po b/openerp/addons/base/i18n/zh_TW.po
index 48c5cb8a86e..65a64cd2ad1 100644
--- a/openerp/addons/base/i18n/zh_TW.po
+++ b/openerp/addons/base/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-06 06:11+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-17 06:40+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing

From 9f5c423fb798dbee4076c49d62e76ff532483ef4 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Sat, 17 May 2014 07:10:05 +0000
Subject: [PATCH 180/225] Launchpad automatic translations update.

---
 openerp/addons/base/i18n/nb.po | 50 +++++++++++++++++++++-------------
 1 file changed, 31 insertions(+), 19 deletions(-)

diff --git a/openerp/addons/base/i18n/nb.po b/openerp/addons/base/i18n/nb.po
index e6c676b6d1a..6cfd6b705e3 100644
--- a/openerp/addons/base/i18n/nb.po
+++ b/openerp/addons/base/i18n/nb.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:35+0000\n"
-"PO-Revision-Date: 2014-05-14 23:06+0000\n"
+"PO-Revision-Date: 2014-05-16 12:16+0000\n"
 "Last-Translator: Kenneth Aalberg <kenneaal@gmail.com>\n"
 "Language-Team: Norwegian Bokmal <nb@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: 2014-05-15 06:10+0000\n"
+"X-Launchpad-Export-Date: 2014-05-17 07:10+0000\n"
 "X-Generator: Launchpad (build 17007)\n"
 
 #. module: base
@@ -9316,11 +9316,13 @@ msgid ""
 "Model to which this entry applies - helper field for setting a model, will "
 "automatically set the correct model name"
 msgstr ""
+"Modell relatert til denne posten - hjelpefelt for å sette en modell, blir "
+"automatisk oppdatert med korrekt modellnavn"
 
 #. module: base
 #: view:res.lang:0
 msgid "2.  %a ,%A         ==> Fri, Friday"
-msgstr "2.  %a ,%A         ==> Fri, Friday"
+msgstr "2.  %a ,%A         ==> Fre, Fredag"
 
 #. module: base
 #: code:addons/base/ir/ir_translation.py:341
@@ -9329,6 +9331,8 @@ msgid ""
 "Translation features are unavailable until you install an extra OpenERP "
 "translation."
 msgstr ""
+"Oversettelsesfunksjoner er ikke tilgjengelige før du installerer en OpenERP "
+"oversettelse."
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_nl
@@ -9377,6 +9381,7 @@ msgstr ""
 #: help:ir.rule,global:0
 msgid "If no group is specified the rule is global and applied to everyone"
 msgstr ""
+"Hvis ingen grupper er spesifisert, er regelen global og gjelder for alle"
 
 #. module: base
 #: model:res.country,name:base.td
@@ -9389,6 +9394,8 @@ msgid ""
 "The priority of the job, as an integer: 0 means higher priority, 10 means "
 "lower priority."
 msgstr ""
+"Jobbens prioritet, som et heltall: 0 betyr høyest prioritet, 10 er lavere "
+"prioritet."
 
 #. module: base
 #: model:ir.model,name:base.model_workflow_transition
@@ -9408,12 +9415,12 @@ msgstr "Undermenyer"
 #. module: base
 #: report:ir.module.reference:0
 msgid "Introspection report on objects"
-msgstr "Introspektiv rapport på objekter"
+msgstr "Introspektiv objektrapport"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_analytics
 msgid "Google Analytics"
-msgstr ""
+msgstr "Google Analytics"
 
 #. module: base
 #: model:ir.module.module,description:base.module_note
@@ -9441,12 +9448,12 @@ msgstr "Dominica"
 #. module: base
 #: field:ir.translation,name:0
 msgid "Translated field"
-msgstr ""
+msgstr "Oversatt felt"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_stock_location
 msgid "Advanced Routes"
-msgstr ""
+msgstr "Avanserte Ruter"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_pad
@@ -9456,7 +9463,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_anglo_saxon
 msgid "Anglo-Saxon Accounting"
-msgstr ""
+msgstr "Anglo-Saxonsk bokføring"
 
 #. module: base
 #: model:res.country,name:base.np
@@ -9466,38 +9473,38 @@ msgstr "Nepal"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_document_page
 msgid "Document Page"
-msgstr ""
+msgstr "Dokumentside"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_ar
 msgid "Argentina Localization Chart Account"
-msgstr ""
+msgstr "Argentina lokalisert kontoplan"
 
 #. module: base
 #: field:ir.module.module,description_html:0
 msgid "Description HTML"
-msgstr ""
+msgstr "Beskrivelse HTML"
 
 #. module: base
 #: help:res.groups,implied_ids:0
 msgid "Users of this group automatically inherit those groups"
-msgstr ""
+msgstr "Brukere i denne gruppen arver automatisk disse gruppene"
 
 #. module: base
 #: model:ir.module.module,summary:base.module_note
 msgid "Sticky notes, Collaborative, Memos"
-msgstr ""
+msgstr "Notater, samarbeid, memoer"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_attendance
 #: model:res.groups,name:base.group_hr_attendance
 msgid "Attendances"
-msgstr ""
+msgstr "Tilskuertall"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_warning
 msgid "Warning Messages and Alerts"
-msgstr ""
+msgstr "Advarsler, meldinger og varsler"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_ui_view_custom
@@ -9510,14 +9517,14 @@ msgstr "Tilpassede visninger"
 #: view:base.module.import:0
 #: model:ir.actions.act_window,name:base.action_view_base_module_import
 msgid "Module Import"
-msgstr "Importer modul"
+msgstr "Modulimport"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.act_values_form_action
 #: model:ir.ui.menu,name:base.menu_values_form_action
 #: view:ir.values:0
 msgid "Action Bindings"
-msgstr ""
+msgstr "Handlingsbindinger"
 
 #. module: base
 #: help:res.partner,lang:0
@@ -9525,6 +9532,9 @@ msgid ""
 "If the selected language is loaded in the system, all documents related to "
 "this contact will be printed in this language. If not, it will be English."
 msgstr ""
+"Hvis det valgte språket lastes inn i systemet, vil alle dokumenter relatert "
+"til denne kontakten skrives ut i det språket. Hvis ikke, skrives de ut på "
+"engelsk."
 
 #. module: base
 #: model:ir.module.module,description:base.module_hr_evaluation
@@ -9562,7 +9572,7 @@ msgstr ""
 #. module: base
 #: model:ir.ui.menu,name:base.menu_view_base_module_update
 msgid "Update Modules List"
-msgstr "Oppdater liste over moduler"
+msgstr "Oppdater modulliste"
 
 #. module: base
 #: code:addons/base/module/module.py:359
@@ -9570,11 +9580,13 @@ msgstr "Oppdater liste over moduler"
 msgid ""
 "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
 msgstr ""
+"Kunne ikke oppdatere modulen \"%s\" fordi en ekstern avhengighet ikke er "
+"møtt: %s"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account
 msgid "eInvoicing"
-msgstr ""
+msgstr "eFaktura"
 
 #. module: base
 #: code:addons/base/res/res_users.py:171

From 6ab0f645bc9cfb23ac303e47a1b1eb0ceab19117 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Sat, 17 May 2014 07:10:37 +0000
Subject: [PATCH 181/225] Launchpad automatic translations update.

---
 addons/procurement/i18n/tr.po             |  50 ++--
 addons/product/i18n/tr.po                 |  34 +--
 addons/product_expiry/i18n/tr.po          |  16 +-
 addons/product_margin/i18n/tr.po          |  20 +-
 addons/purchase/i18n/tr.po                |  42 +--
 addons/purchase_analytic_plans/i18n/tr.po |  10 +-
 addons/purchase_requisition/i18n/tr.po    |  12 +-
 addons/sale/i18n/tr.po                    |  36 +--
 addons/sale_analytic_plans/i18n/tr.po     |  10 +-
 addons/sale_journal/i18n/tr.po            |  10 +-
 addons/sale_margin/i18n/tr.po             |  10 +-
 addons/sale_stock/i18n/tr.po              |  32 +-
 addons/stock/i18n/tr.po                   | 346 +++++++++-------------
 addons/stock_location/i18n/tr.po          |  20 +-
 addons/warning/i18n/tr.po                 |  32 +-
 15 files changed, 315 insertions(+), 365 deletions(-)

diff --git a/addons/procurement/i18n/tr.po b/addons/procurement/i18n/tr.po
index e9b270ba7c6..192cc26c41c 100644
--- a/addons/procurement/i18n/tr.po
+++ b/addons/procurement/i18n/tr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2013-11-30 15:08+0000\n"
+"PO-Revision-Date: 2014-05-17 04:51+0000\n"
 "Last-Translator: Ediz Duman <neps1192@gmail.com>\n"
 "Language-Team: Turkish <tr@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: 2013-12-01 05:45+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2014-05-17 07:10+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: procurement
 #: model:ir.ui.menu,name:procurement.menu_stock_sched
@@ -121,7 +121,7 @@ msgstr "Şirket"
 #. module: procurement
 #: field:procurement.order,product_uos_qty:0
 msgid "UoS Quantity"
-msgstr "Satış Birimi Miktarı"
+msgstr "Satış Birim Miktarı"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -158,12 +158,12 @@ msgstr "Tedarikleri Hesapla"
 #. module: procurement
 #: field:procurement.order,message:0
 msgid "Latest error"
-msgstr "Enson hata"
+msgstr "En Son Hata"
 
 #. module: procurement
 #: field:stock.warehouse.orderpoint,product_min_qty:0
 msgid "Minimum Quantity"
-msgstr "Enaz Miktar"
+msgstr "En Az Miktar"
 
 #. module: procurement
 #: help:mrp.property,composition:0
@@ -173,7 +173,7 @@ msgstr "Sadece bilgi amaçlıdır, hesaplamalarda kullanılmaz."
 #. module: procurement
 #: field:stock.warehouse.orderpoint,procurement_id:0
 msgid "Latest procurement"
-msgstr "Enson tedarik"
+msgstr "En Son Tedarik"
 
 #. module: procurement
 #: field:procurement.order,message_ids:0
@@ -183,7 +183,7 @@ msgstr "Mesajlar"
 #. module: procurement
 #: view:procurement.order:0
 msgid "Cancel Procurement"
-msgstr "Tedarik İptal et"
+msgstr "Tedarik İptal Et"
 
 #. module: procurement
 #: view:product.product:0
@@ -193,7 +193,7 @@ msgstr "Ürünler"
 #. module: procurement
 #: selection:procurement.order,state:0
 msgid "Cancelled"
-msgstr "İptal edildi"
+msgstr "İptal Edildi"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -224,7 +224,7 @@ msgstr "Stoklanabilir ürünler"
 #: code:addons/procurement/procurement.py:138
 #, python-format
 msgid "Invalid Action!"
-msgstr "Geçersiz Eylem!"
+msgstr "Geçersiz İşlem!"
 
 #. module: procurement
 #: help:procurement.order,message_summary:0
@@ -299,7 +299,7 @@ msgstr "Onayla"
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
 msgid "Quantity Multiple"
-msgstr "Çok Miktarlı"
+msgstr "Çoklu Miktar"
 
 #. module: procurement
 #: help:procurement.order,origin:0
@@ -318,7 +318,7 @@ msgstr "İşlenecek Tedarik Emirleri"
 #. module: procurement
 #: model:ir.model,name:procurement.model_stock_warehouse_orderpoint
 msgid "Minimum Inventory Rule"
-msgstr "Enaz Envanter Kuralı"
+msgstr "En Az Envanter Kuralı"
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:370
@@ -384,7 +384,7 @@ msgstr "Tedarik Hesapla"
 #. module: procurement
 #: field:res.company,schedule_range:0
 msgid "Scheduler Range Days"
-msgstr "Planlamacı Aralığı Günleri"
+msgstr "Zamanlayıcı Kapsama Günleri"
 
 #. module: procurement
 #: view:make.procurement:0
@@ -541,7 +541,7 @@ msgstr "İlgili Tedarik Emirleri"
 #. module: procurement
 #: field:procurement.order,message_unread:0
 msgid "Unread Messages"
-msgstr "Okunmamış mesajlar"
+msgstr "Okunmamış Mesajlar"
 
 #. module: procurement
 #: selection:mrp.property,composition:0
@@ -606,7 +606,7 @@ msgstr ""
 #. module: procurement
 #: view:procurement.order:0
 msgid "Procurement Lines"
-msgstr "Tedarik Kalemleri"
+msgstr "Tedarik Satırları"
 
 #. module: procurement
 #: view:product.product:0
@@ -684,7 +684,7 @@ msgstr ""
 #. module: procurement
 #: field:stock.warehouse.orderpoint,product_max_qty:0
 msgid "Maximum Quantity"
-msgstr "Ençok Miktar"
+msgstr "En Çok Miktar"
 
 #. module: procurement
 #: field:procurement.order,message_is_follower:0
@@ -705,7 +705,7 @@ msgstr "Etkin"
 #. module: procurement
 #: model:process.node,name:procurement.process_node_procureproducts0
 msgid "Procure Products"
-msgstr "Ürün Tedarik et"
+msgstr "Ürün Tedarikleri"
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:312
@@ -778,7 +778,7 @@ msgstr "Şirketler"
 #. module: procurement
 #: view:procurement.order:0
 msgid "Extra Information"
-msgstr "Ek Bilgiler"
+msgstr "Ek Bilgisi"
 
 #. module: procurement
 #: field:procurement.order,message_summary:0
@@ -793,7 +793,7 @@ msgstr "Mkt. Çarpanı 0'dan büyük olmalıdır."
 #. module: procurement
 #: selection:stock.warehouse.orderpoint,logic:0
 msgid "Order to Max"
-msgstr "Ençoğa Sipariş yap"
+msgstr "En Çoğa Sipariş Yap"
 
 #. module: procurement
 #: field:procurement.order,date_close:0
@@ -819,7 +819,7 @@ msgstr ""
 #. module: procurement
 #: field:mrp.property,composition:0
 msgid "Properties composition"
-msgstr "Bileşim Özellikleri"
+msgstr "Bileşen Özellikleri"
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:311
@@ -852,7 +852,7 @@ msgstr "Tedarik Çalıştır"
 #. module: procurement
 #: selection:procurement.order,state:0
 msgid "Done"
-msgstr "Yapıldı"
+msgstr "Biten"
 
 #. module: procurement
 #: view:make.procurement:0
@@ -904,7 +904,7 @@ msgstr "Tüm Planlamacıları Hesapla"
 #. module: procurement
 #: view:procurement.order:0
 msgid "Late"
-msgstr "Geç"
+msgstr "Geciken"
 
 #. module: procurement
 #: view:board.board:0
@@ -920,7 +920,7 @@ msgstr "Sipariş Noktaları"
 #. module: procurement
 #: field:product.product,orderpoint_ids:0
 msgid "Minimum Stock Rules"
-msgstr "Enaz Stok Kuralları"
+msgstr "En Az Stok Kuralları"
 
 #. module: procurement
 #: view:make.procurement:0
@@ -984,7 +984,7 @@ msgstr "Yürütülüyor"
 #: selection:procurement.order,procure_method:0
 #: selection:product.template,procure_method:0
 msgid "Make to Order"
-msgstr "Sipariş Ver"
+msgstr "Sipariş Verme"
 
 #. module: procurement
 #: field:product.template,supply_method:0
@@ -1057,7 +1057,7 @@ msgstr ""
 #. module: procurement
 #: view:procurement.order:0
 msgid "Search Procurement"
-msgstr "Tedarik Ara"
+msgstr "Tedarik Arama"
 
 #. module: procurement
 #: help:procurement.order,message:0
diff --git a/addons/product/i18n/tr.po b/addons/product/i18n/tr.po
index a1be39f49c1..d4de293d97b 100644
--- a/addons/product/i18n/tr.po
+++ b/addons/product/i18n/tr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2013-11-28 13:52+0000\n"
+"PO-Revision-Date: 2014-05-17 04:51+0000\n"
 "Last-Translator: Ediz Duman <neps1192@gmail.com>\n"
 "Language-Team: Turkish <tr@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: 2013-11-29 05:30+0000\n"
-"X-Generator: Launchpad (build 16847)\n"
+"X-Launchpad-Export-Date: 2014-05-17 07:10+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: product
 #: field:product.packaging,rows:0
@@ -148,7 +148,7 @@ msgstr "Bu fiyat listesi satırı için belirgin kural adı"
 #. module: product
 #: field:product.template,uos_coeff:0
 msgid "Unit of Measure -> UOS Coeff"
-msgstr "Ölçü Birimi -> Satış Birimi Kats"
+msgstr "Ölçü Birimi -> UOS Katsayı"
 
 #. module: product
 #: field:product.price_list,price_list:0
@@ -480,7 +480,7 @@ msgstr "Tedarikler"
 #. module: product
 #: model:res.groups,name:product.group_mrp_properties
 msgid "Manage Properties of Product"
-msgstr "Ürün Özellikleri Yönetimi"
+msgstr "Ürün Özelliklerini Yönetme"
 
 #. module: product
 #: help:product.uom,factor:0
@@ -652,7 +652,7 @@ msgstr "Görünüm"
 #. module: product
 #: model:ir.actions.act_window,name:product.product_template_action_tree
 msgid "Product Templates"
-msgstr "Ürün  Şablonu"
+msgstr "Ürün Şablonu"
 
 #. module: product
 #: field:product.category,parent_left:0
@@ -1000,7 +1000,7 @@ msgstr "Bir İzleyicidir"
 #. module: product
 #: field:product.product,price_extra:0
 msgid "Variant Price Extra"
-msgstr "Değişke Fiyat Ek"
+msgstr "Değişken Ekstra Fiyatı"
 
 #. module: product
 #: model:ir.model,name:product.model_product_supplierinfo
@@ -1299,7 +1299,7 @@ msgstr "Satış Birimi"
 #. module: product
 #: field:product.product,message_unread:0
 msgid "Unread Messages"
-msgstr "Okunmamış mesajlar"
+msgstr "Okunmamış Mesajlar"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_uom_categ_form_action
@@ -1462,7 +1462,7 @@ msgstr "Ölçü Birimi"
 #. module: product
 #: field:product.supplierinfo,min_qty:0
 msgid "Minimal Quantity"
-msgstr "Enaz Miktar"
+msgstr "En Az Miktar"
 
 #. module: product
 #: view:product.supplierinfo:0
@@ -1506,7 +1506,7 @@ msgstr ""
 #: view:product.product:0
 #: selection:product.template,type:0
 msgid "Consumable"
-msgstr "Tüketilebilir"
+msgstr "Hammadde"
 
 #. module: product
 #: help:product.price.type,currency_id:0
@@ -1653,7 +1653,7 @@ msgstr "Yuvarlama Hassasiyeti"
 #. module: product
 #: view:product.product:0
 msgid "Consumable products"
-msgstr "Tüketilebilir ürünler"
+msgstr "Sarf ürünler"
 
 #. module: product
 #: model:product.template,name:product.product_product_21_product_template
@@ -1888,7 +1888,7 @@ msgstr "Hata!Enaz oran ençok orandan daha düşük olmalıdır."
 #. module: product
 #: model:res.groups,name:product.group_uos
 msgid "Manage Secondary Unit of Measure"
-msgstr "İkinci Ölçü Birimi Yönetimi"
+msgstr "İkinci Ölçü Birimini Yönetme"
 
 #. module: product
 #: help:product.uom,rounding:0
@@ -2186,7 +2186,7 @@ msgstr "Tedarikçi Açıklaması"
 #. module: product
 #: field:product.supplierinfo,delay:0
 msgid "Delivery Lead Time"
-msgstr "Teslimat Süresi"
+msgstr "Teslim Süresi"
 
 #. module: product
 #: view:product.product:0
@@ -2336,7 +2336,7 @@ msgstr "Resim"
 #. module: product
 #: view:product.uom.categ:0
 msgid "Units of Measure categories"
-msgstr "Ölçü Birimi kategorileri"
+msgstr "Ölçü Birimi Kategorileri"
 
 #. module: product
 #: model:product.template,description_sale:product.product_product_4_product_template
@@ -2359,7 +2359,7 @@ msgstr "Açıklamalar"
 #. module: product
 #: model:res.groups,name:product.group_stock_packaging
 msgid "Manage Product Packaging"
-msgstr "Ürün Ambalaj Yönetimi"
+msgstr "Ürün Paketleme Yönetimi"
 
 #. module: product
 #: model:product.category,name:product.product_category_2
@@ -2488,7 +2488,7 @@ msgstr "Bütün paketin ağırlığı(palet ya da kutu)"
 #. module: product
 #: view:product.uom:0
 msgid "e.g: 1 * (this unit) = ratio * (reference unit)"
-msgstr "örn: 1 * (bu birim) = oran * (referans birim)"
+msgstr "örn: 1 * (bu birim) = oran * (referans birimi)"
 
 #. module: product
 #: model:product.template,description:product.product_product_25_product_template
@@ -2523,7 +2523,7 @@ msgstr ""
 #. module: product
 #: model:product.template,name:product.product_assembly_product_template
 msgid "Assembly Service Cost"
-msgstr "Montaj Hizmeti Maliyeti"
+msgstr "Montaj Hizmet Maliyeti"
 
 #. module: product
 #: model:ir.model,name:product.model_product_pricelist_item
diff --git a/addons/product_expiry/i18n/tr.po b/addons/product_expiry/i18n/tr.po
index a453b3e5bfd..af4826769c2 100644
--- a/addons/product_expiry/i18n/tr.po
+++ b/addons/product_expiry/i18n/tr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2013-04-27 16:09+0000\n"
-"Last-Translator: Ayhan KIZILTAN <Unknown>\n"
+"PO-Revision-Date: 2014-05-17 04:51+0000\n"
+"Last-Translator: Ediz Duman <neps1192@gmail.com>\n"
 "Language-Team: Turkish <tr@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: 2013-11-21 06:27+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-05-17 07:10+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: product_expiry
 #: model:product.template,name:product_expiry.product_product_from_product_template
@@ -30,7 +30,7 @@ msgstr "İnek Sütü"
 #. module: product_expiry
 #: field:product.product,life_time:0
 msgid "Product Life Time"
-msgstr "Ürünün ömrü"
+msgstr "Ürünün Kulanım Tarihi"
 
 #. module: product_expiry
 #: help:stock.production.lot,removal_date:0
@@ -51,7 +51,7 @@ msgstr ""
 #. module: product_expiry
 #: field:product.product,use_time:0
 msgid "Product Use Time"
-msgstr "Ürün kullanım süresi"
+msgstr "Ürün Kullanım Süresi"
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_product_product
@@ -111,12 +111,12 @@ msgstr "Tarihler"
 #. module: product_expiry
 #: field:stock.production.lot,life_date:0
 msgid "End of Life Date"
-msgstr "Ömür Sonu Tarihi"
+msgstr "Sonlanma Tarihi"
 
 #. module: product_expiry
 #: field:stock.production.lot,use_date:0
 msgid "Best before Date"
-msgstr "Son kullanım Tarihi"
+msgstr "Son Kullanım Tarihi"
 
 #. module: product_expiry
 #: model:product.template,name:product_expiry.product_product_jambon_product_template
diff --git a/addons/product_margin/i18n/tr.po b/addons/product_margin/i18n/tr.po
index d531c57c2a9..5b0cac8755c 100644
--- a/addons/product_margin/i18n/tr.po
+++ b/addons/product_margin/i18n/tr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2013-04-02 11:48+0000\n"
-"Last-Translator: Ayhan KIZILTAN <Unknown>\n"
+"PO-Revision-Date: 2014-05-17 04:51+0000\n"
+"Last-Translator: Ediz Duman <neps1192@gmail.com>\n"
 "Language-Team: Turkish <tr@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: 2013-11-21 06:28+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-05-17 07:10+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: product_margin
 #: view:product.product:0
@@ -83,7 +83,7 @@ msgstr "# Satışda Faturalandı"
 #. module: product_margin
 #: view:product.product:0
 msgid "Catalog Price"
-msgstr "Katalog fiyatı"
+msgstr "Katalog Fiyatı"
 
 #. module: product_margin
 #: selection:product.margin,invoice_state:0
@@ -125,7 +125,7 @@ msgstr "Oran Tarihi Başı"
 #. module: product_margin
 #: view:product.product:0
 msgid "Analysis Criteria"
-msgstr "Analiz kriteri"
+msgstr "Analiz Kriteri"
 
 #. module: product_margin
 #: view:product.product:0
@@ -156,7 +156,7 @@ msgstr "Tahmini Kâr * 100 / Tahmini Satış"
 #. module: product_margin
 #: help:product.product,sale_avg_price:0
 msgid "Avg. Price in Customer Invoices."
-msgstr "Ort. Müşteri Faturalar Fiyat."
+msgstr "Ort. Müşteri Faturalar Fiyatları."
 
 #. module: product_margin
 #: help:product.product,purchase_avg_price:0
@@ -229,7 +229,7 @@ msgstr "Toplam margin * 100 / Ciro"
 #. module: product_margin
 #: view:product.margin:0
 msgid "Open Margins"
-msgstr "Marj Aç"
+msgstr "Açık Marj"
 
 #. module: product_margin
 #: selection:product.margin,invoice_state:0
@@ -250,7 +250,7 @@ msgstr "Ürün"
 #. module: product_margin
 #: view:product.margin:0
 msgid "General Information"
-msgstr "Genel Bilgiler"
+msgstr "Genel Bilgisi"
 
 #. module: product_margin
 #: field:product.product,purchase_gap:0
@@ -280,4 +280,4 @@ msgstr "ya da"
 #. module: product_margin
 #: model:ir.model,name:product_margin.model_product_margin
 msgid "Product Margin"
-msgstr "Ürün kar marjı"
+msgstr "Ürün Kar Marjı"
diff --git a/addons/purchase/i18n/tr.po b/addons/purchase/i18n/tr.po
index 672866e64e8..1df49ea4e16 100644
--- a/addons/purchase/i18n/tr.po
+++ b/addons/purchase/i18n/tr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2014-03-05 10:43+0000\n"
+"PO-Revision-Date: 2014-05-17 04:51+0000\n"
 "Last-Translator: Ediz Duman <neps1192@gmail.com>\n"
 "Language-Team: Turkish <tr@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: 2014-03-06 06:14+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-05-17 07:10+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: purchase
 #: model:res.groups,name:purchase.group_analytic_accounting
@@ -390,7 +390,7 @@ msgstr "Mali Durumu"
 #. module: purchase
 #: field:purchase.config.settings,default_invoice_method:0
 msgid "Default invoicing control method"
-msgstr "Varsayılan fatura denetim yöntemi"
+msgstr "Varsayılan faturalama kontrol yöntemi"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_stock_picking_in
@@ -636,7 +636,7 @@ msgstr "Ara Toplam"
 #. module: purchase
 #: field:purchase.order,shipped:0
 msgid "Received"
-msgstr "Alındı"
+msgstr "Kabul Edildi"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -825,7 +825,7 @@ msgstr "Sipariş Tarihi"
 #. module: purchase
 #: field:purchase.config.settings,group_uom:0
 msgid "Manage different units of measure for products"
-msgstr "Ürünler için farklı ölçü birimlerini yönetin"
+msgstr "Ürünler için farklı ölçü birimlerini yönetme"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_invoiceafterpacking0
@@ -1082,7 +1082,7 @@ msgstr "Mesajlar ve iletişim geçmişi"
 #: field:purchase.order,warehouse_id:0
 #: field:stock.picking.in,warehouse_id:0
 msgid "Destination Warehouse"
-msgstr "Varış Deposu"
+msgstr "Hedef Konum"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:967
@@ -1107,7 +1107,7 @@ msgstr "Ölçü Birimi"
 #. module: purchase
 #: field:purchase.config.settings,group_purchase_pricelist:0
 msgid "Manage pricelist per supplier"
-msgstr "Her tedarikçi için fiyat listesi yürüt"
+msgstr "Her tedarikçi için fiyat listesi yürütme"
 
 #. module: purchase
 #: view:board.board:0
@@ -1180,7 +1180,7 @@ msgstr "Notlar"
 #. module: purchase
 #: field:purchase.config.settings,module_purchase_requisition:0
 msgid "Manage purchase requisitions"
-msgstr "Satınalma istekleri yürüt"
+msgstr "Satınalma isteklerini yürütme"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1216,7 +1216,7 @@ msgstr "İşlem Geçersiz!"
 #: field:purchase.order,validator:0
 #: view:purchase.report:0
 msgid "Validated by"
-msgstr "Doğrulayan"
+msgstr "Onaylayan"
 
 #. module: purchase
 #: view:purchase.report:0
@@ -1259,7 +1259,7 @@ msgstr "Bir satınalma siparişi için oluşturulan faturalar"
 #. module: purchase
 #: selection:purchase.config.settings,default_invoice_method:0
 msgid "Pre-generate draft invoices based on purchase orders"
-msgstr "Satınalma siparişlerine göre taslak fatura ön oluşturma"
+msgstr "Satınalma siparişinden oluşturulan taslak faturalardan"
 
 #. module: purchase
 #: help:product.template,purchase_ok:0
@@ -1498,7 +1498,7 @@ msgstr ""
 #. module: purchase
 #: field:purchase.config.settings,module_purchase_double_validation:0
 msgid "Force two levels of approvals"
-msgstr "Onayları iki seviye zorlayın"
+msgstr "Onayları ikili düzeye zorlama"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase_type
@@ -1600,7 +1600,7 @@ msgstr "Siparişleri birleştir"
 #. module: purchase
 #: field:purchase.config.settings,module_purchase_analytic_plans:0
 msgid "Use multiple analytic accounts on purchase orders"
-msgstr "Satınalma siparişlerinde birden çok analitik hesap kullanın"
+msgstr "Satınalma siparişlerinde birden çok analitik hesap kullanma"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_procurement_management
@@ -1623,7 +1623,7 @@ msgstr "Elle Düzeltildi"
 #. module: purchase
 #: field:purchase.config.settings,group_costing_method:0
 msgid "Compute product cost price based on average cost"
-msgstr "Maliyet fiyatını ortalama fiyata göre hesaplayın"
+msgstr "Maliyet fiyatını ortalama fiyata göre hesaplama"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:352
@@ -1684,12 +1684,12 @@ msgstr ""
 #. module: purchase
 #: field:purchase.order,invoiced:0
 msgid "Invoice Received"
-msgstr "Fatura Alındı"
+msgstr "Fatura Kabulu"
 
 #. module: purchase
 #: field:purchase.order,invoice_method:0
 msgid "Invoicing Control"
-msgstr "Faturalama Denetimi"
+msgstr "Fatura Kontrolu"
 
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_approvingpurchaseorder0
@@ -1739,7 +1739,7 @@ msgstr ""
 #: view:purchase.report:0
 #: field:purchase.report,location_id:0
 msgid "Destination"
-msgstr "Varış yeri"
+msgstr "Hedef Konum"
 
 #. module: purchase
 #: field:purchase.order,dest_address_id:0
@@ -1863,7 +1863,7 @@ msgstr ""
 #: selection:purchase.order.line,state:0
 #: selection:purchase.report,state:0
 msgid "Cancelled"
-msgstr "İptal edildi"
+msgstr "İptal Edildi"
 
 #. module: purchase
 #: field:res.partner,purchase_order_count:0
@@ -2013,7 +2013,7 @@ msgstr "Referans Ölçü Birimi"
 #: report:purchase.order:0
 #: field:purchase.report,validator:0
 msgid "Validated By"
-msgstr "Doğrulayan"
+msgstr "Onaylayan"
 
 #. module: purchase
 #: view:purchase.report:0
@@ -2078,7 +2078,7 @@ msgstr "Faturalandı"
 #: view:purchase.order.line:0
 #: field:stock.move,purchase_line_id:0
 msgid "Purchase Order Line"
-msgstr "Satınalma Siparişi Kalemi"
+msgstr "Satınalma Sipariş Satırı"
 
 #. module: purchase
 #: selection:purchase.order.line,state:0
@@ -2451,7 +2451,7 @@ msgstr "Yıl"
 #. module: purchase
 #: selection:purchase.config.settings,default_invoice_method:0
 msgid "Based on purchase order lines"
-msgstr "Satınalma sipariş kalemlerine göre"
+msgstr "Satınalma sipariş satırlarına istinaden"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.act_res_partner_2_purchase_order
diff --git a/addons/purchase_analytic_plans/i18n/tr.po b/addons/purchase_analytic_plans/i18n/tr.po
index aa9d1499655..c1a57ef737e 100644
--- a/addons/purchase_analytic_plans/i18n/tr.po
+++ b/addons/purchase_analytic_plans/i18n/tr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2013-03-04 00:47+0000\n"
-"Last-Translator: Ayhan KIZILTAN <Unknown>\n"
+"PO-Revision-Date: 2014-05-17 04:51+0000\n"
+"Last-Translator: Ediz Duman <neps1192@gmail.com>\n"
 "Language-Team: Turkish <tr@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: 2013-11-21 06:31+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-05-17 07:10+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
@@ -25,7 +25,7 @@ msgstr "Analitik Dağıtım"
 #. module: purchase_analytic_plans
 #: model:ir.model,name:purchase_analytic_plans.model_purchase_order_line
 msgid "Purchase Order Line"
-msgstr "Satınalma Siparişi Kalemi"
+msgstr "Satınalma Sipariş Satırı"
 
 #. module: purchase_analytic_plans
 #: model:ir.model,name:purchase_analytic_plans.model_purchase_order
diff --git a/addons/purchase_requisition/i18n/tr.po b/addons/purchase_requisition/i18n/tr.po
index 7ca648b593e..0d196e04544 100644
--- a/addons/purchase_requisition/i18n/tr.po
+++ b/addons/purchase_requisition/i18n/tr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2013-04-14 17:11+0000\n"
-"Last-Translator: Ayhan KIZILTAN <Unknown>\n"
+"PO-Revision-Date: 2014-05-17 04:51+0000\n"
+"Last-Translator: Ediz Duman <neps1192@gmail.com>\n"
 "Language-Team: Turkish <tr@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: 2013-11-21 06:32+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-05-17 07:10+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -72,7 +72,7 @@ msgstr "Sorumlu"
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Cancel Requisition"
-msgstr "İsteği İptal et"
+msgstr "İsteği İptal Et"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -428,7 +428,7 @@ msgstr "Depo"
 #. module: purchase_requisition
 #: field:procurement.order,requisition_id:0
 msgid "Latest Requisition"
-msgstr "Enson İstek"
+msgstr "En Son İstek"
 
 #. module: purchase_requisition
 #: model:res.groups,name:purchase_requisition.group_purchase_requisition_manager
diff --git a/addons/sale/i18n/tr.po b/addons/sale/i18n/tr.po
index 814cea821c9..c7805a6826b 100644
--- a/addons/sale/i18n/tr.po
+++ b/addons/sale/i18n/tr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2014-03-05 10:43+0000\n"
+"PO-Revision-Date: 2014-05-17 04:51+0000\n"
 "Last-Translator: Ediz Duman <neps1192@gmail.com>\n"
 "Language-Team: Turkish <tr@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: 2014-03-06 06:15+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-05-17 07:10+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: sale
 #: model:ir.model,name:sale.model_account_config_settings
@@ -53,7 +53,7 @@ msgstr "Gün"
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
 #: view:sale.order:0
 msgid "Cancel Order"
-msgstr "Sipariş İptal et"
+msgstr "Siparişi İptal Et"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:101
@@ -161,7 +161,7 @@ msgstr "Varsayılan Ödeme Koşulu"
 #. module: sale
 #: field:sale.config.settings,group_uom:0
 msgid "Allow using different units of measures"
-msgstr "Farklı ölçü birimleri kullanmaya izin ver"
+msgstr "Farklı ölçü birimleri kullanmaya izin verme"
 
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
@@ -188,7 +188,7 @@ msgstr "Toplam Fiyat"
 #. module: sale
 #: field:sale.config.settings,group_invoice_so_lines:0
 msgid "Generate invoices based on the sales order lines"
-msgstr "Satış siparişi kalemlerine göre fatura oluştur"
+msgstr "Satış siparişi satırlarına göre fatura oluşturma"
 
 #. module: sale
 #: help:sale.make.invoice,grouped:0
@@ -286,7 +286,7 @@ msgstr "Tekliflerim"
 #. module: sale
 #: field:sale.config.settings,module_warning:0
 msgid "Allow configuring alerts by customer or products"
-msgstr "Müşteri ya da ürünlere göre uyarıları yapılandırma"
+msgstr "Müşteri veya ürünlere göre uyarıları yapılandırma"
 
 #. module: sale
 #: field:sale.shop,name:0
@@ -461,7 +461,7 @@ msgstr "KDV :"
 #. module: sale
 #: model:res.groups,name:sale.group_invoice_so_lines
 msgid "Enable Invoicing Sales order lines"
-msgstr "SatışSiparişi Kalemlerini Faturalamayı Etkinleştir"
+msgstr "SatışSiparişi Satırında Faturalamayı Etkinleştirme"
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -676,7 +676,7 @@ msgstr "Satış Siparişi Kalemi"
 #. module: sale
 #: field:sale.config.settings,module_analytic_user_function:0
 msgid "One employee can have different roles per contract"
-msgstr "Bir çalışan her sözleşmede farklı rollere sahip olabilir"
+msgstr "Bir çalışanın sözleşme başına farklı rollere sahip olma özelliği"
 
 #. module: sale
 #: view:sale.order:0
@@ -988,7 +988,7 @@ msgstr "Geçerli fiyat listesi kalemi bulunamadı!:"
 #. module: sale
 #: field:sale.config.settings,module_sale_margin:0
 msgid "Display margins on sales orders"
-msgstr "Satış siparişlerinde oranları görüntüle"
+msgstr "Satış siparişlerinde karlılık oranını gösterme"
 
 #. module: sale
 #: help:sale.order,invoice_ids:0
@@ -1364,7 +1364,7 @@ msgstr ""
 #. module: sale
 #: view:sale.order:0
 msgid "Cancel Quotation"
-msgstr "Teklif İptal et"
+msgstr "Teklifi İptal Et"
 
 #. module: sale
 #: selection:sale.order,state:0
@@ -1417,7 +1417,7 @@ msgstr "Tedarik ve faturalamayı yürütür"
 #. module: sale
 #: field:sale.order,invoiced:0
 msgid "Paid"
-msgstr "Ödenmdi"
+msgstr "Ödendi"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_report_all
@@ -1448,7 +1448,7 @@ msgstr ""
 #. module: sale
 #: field:sale.config.settings,group_discount_per_so_line:0
 msgid "Allow setting a discount on the sales order lines"
-msgstr "Satış siparişi kalemlerine indirim uygulamanızı sağlar"
+msgstr "Satış sipariş satırında indirim uygulama"
 
 #. module: sale
 #: field:sale.order,paypal_url:0
@@ -1458,7 +1458,7 @@ msgstr "Paypal Url"
 #. module: sale
 #: field:sale.config.settings,group_sale_pricelist:0
 msgid "Use pricelists to adapt your price per customers"
-msgstr "Her müşteriye fiyat ayarlaması için fiyat listeleri kullanın"
+msgstr "Her müşteriye farklı fiyat ayarlaması için fiyat listeleri kullanma"
 
 #. module: sale
 #: code:addons/sale/sale.py:185
@@ -1932,7 +1932,7 @@ msgstr "Tanımlı Müşteri Yok!"
 #. module: sale
 #: field:sale.order,partner_shipping_id:0
 msgid "Delivery Address"
-msgstr "Teslimat Adresi"
+msgstr "Teslim Adresi"
 
 #. module: sale
 #: selection:sale.order,state:0
@@ -1947,7 +1947,7 @@ msgstr "Depo Özellikleri"
 #. module: sale
 #: view:sale.order.line:0
 msgid "Cancel Line"
-msgstr "Satırı İptal et"
+msgstr "Satırı İptal Et"
 
 #. module: sale
 #: field:sale.order,message_ids:0
@@ -2258,7 +2258,7 @@ msgstr "İşlemdeki Satış Siparişleri"
 #. module: sale
 #: field:sale.config.settings,timesheet:0
 msgid "Prepare invoices based on timesheets"
-msgstr "Zaman çizelgelerine göre fatura hazırla"
+msgstr "Zaman çizelgelerine göre fatura hazırlama"
 
 #. module: sale
 #: help:sale.order,origin:0
@@ -2315,7 +2315,7 @@ msgstr "Satış Siparişi "
 #. module: sale
 #: field:sale.config.settings,module_account_analytic_analysis:0
 msgid "Use contracts management"
-msgstr "Sözleşme yönetimi kullanma"
+msgstr "Sözleşme yönetimini kullanma"
 
 #. module: sale
 #: help:sale.order,invoiced:0
diff --git a/addons/sale_analytic_plans/i18n/tr.po b/addons/sale_analytic_plans/i18n/tr.po
index 54d265e6468..33f3071e426 100644
--- a/addons/sale_analytic_plans/i18n/tr.po
+++ b/addons/sale_analytic_plans/i18n/tr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2013-04-13 18:23+0000\n"
-"Last-Translator: Ayhan KIZILTAN <Unknown>\n"
+"PO-Revision-Date: 2014-05-17 04:51+0000\n"
+"Last-Translator: Ediz Duman <neps1192@gmail.com>\n"
 "Language-Team: Turkish <tr@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: 2013-11-21 06:33+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-05-17 07:10+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
@@ -30,4 +30,4 @@ msgstr "Satış Siparişi"
 #. module: sale_analytic_plans
 #: model:ir.model,name:sale_analytic_plans.model_sale_order_line
 msgid "Sales Order Line"
-msgstr "Satış Siparişi Kalemi"
+msgstr "Satış Sipariş Satırı"
diff --git a/addons/sale_journal/i18n/tr.po b/addons/sale_journal/i18n/tr.po
index cae6d28ce2e..3b4392dde4d 100644
--- a/addons/sale_journal/i18n/tr.po
+++ b/addons/sale_journal/i18n/tr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2013-02-25 18:56+0000\n"
-"Last-Translator: Ayhan KIZILTAN <Unknown>\n"
+"PO-Revision-Date: 2014-05-17 04:51+0000\n"
+"Last-Translator: Ediz Duman <neps1192@gmail.com>\n"
 "Language-Team: Turkish <tr@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: 2013-11-21 06:34+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-05-17 07:10+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
@@ -37,7 +37,7 @@ msgstr ""
 #. module: sale_journal
 #: view:res.partner:0
 msgid "Sales & Purchases"
-msgstr "Satışlar & Satınalmalar"
+msgstr "Satış & Satınalma"
 
 #. module: sale_journal
 #: view:res.partner:0
diff --git a/addons/sale_margin/i18n/tr.po b/addons/sale_margin/i18n/tr.po
index f5ca9b38540..ecc18dfb111 100644
--- a/addons/sale_margin/i18n/tr.po
+++ b/addons/sale_margin/i18n/tr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2013-03-04 00:46+0000\n"
-"Last-Translator: Ayhan KIZILTAN <Unknown>\n"
+"PO-Revision-Date: 2014-05-17 04:51+0000\n"
+"Last-Translator: Ediz Duman <neps1192@gmail.com>\n"
 "Language-Team: Turkish <tr@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: 2013-11-21 06:34+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-05-17 07:10+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: sale_margin
 #: field:sale.order.line,purchase_price:0
@@ -36,7 +36,7 @@ msgstr "Oran"
 #. module: sale_margin
 #: model:ir.model,name:sale_margin.model_sale_order_line
 msgid "Sales Order Line"
-msgstr "Satış Siparişi Kalemi"
+msgstr "Satış Sipariş Satırı"
 
 #. module: sale_margin
 #: help:sale.order,margin:0
diff --git a/addons/sale_stock/i18n/tr.po b/addons/sale_stock/i18n/tr.po
index 011cefe3558..54dff3ed1bf 100644
--- a/addons/sale_stock/i18n/tr.po
+++ b/addons/sale_stock/i18n/tr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2013-11-24 21:03+0000\n"
+"PO-Revision-Date: 2014-05-17 04:51+0000\n"
 "Last-Translator: Ediz Duman <neps1192@gmail.com>\n"
 "Language-Team: Turkish <tr@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: 2013-11-25 06:01+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-05-17 07:10+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: sale_stock
 #: help:sale.config.settings,group_invoice_deli_orders:0
@@ -70,7 +70,7 @@ msgstr "Çıkışa ya da müşteriye yapılan hareket belgesi."
 #. module: sale_stock
 #: field:sale.config.settings,group_multiple_shops:0
 msgid "Manage multiple shops"
-msgstr "Birden çok mağaza yönet"
+msgstr "Çoklu mağaza yönetme"
 
 #. module: sale_stock
 #: model:process.transition.action,name:sale_stock.process_transition_action_validate0
@@ -80,7 +80,7 @@ msgstr "Doğrula"
 #. module: sale_stock
 #: view:sale.order:0
 msgid "Cancel Order"
-msgstr "Sipariş İptal Et"
+msgstr "Siparişi İptal Et"
 
 #. module: sale_stock
 #: code:addons/sale_stock/sale_stock.py:209
@@ -144,7 +144,7 @@ msgstr "Proje Zaman Çizelgesi"
 #. module: sale_stock
 #: field:sale.config.settings,group_sale_delivery_address:0
 msgid "Allow a different address for delivery and invoicing "
-msgstr "Teslimat ve faturalama için farklı bir adrese izin verir "
+msgstr "Teslimat ve faturalama için farklı bir adrese izin verme "
 
 #. module: sale_stock
 #: code:addons/sale_stock/sale_stock.py:572
@@ -183,7 +183,7 @@ msgstr "Teslimat Emirleri"
 #: model:ir.model,name:sale_stock.model_sale_order_line
 #: field:stock.move,sale_line_id:0
 msgid "Sales Order Line"
-msgstr "Satış Siparişi Kalemi"
+msgstr "Satış Sipariş Satırı"
 
 #. module: sale_stock
 #: model:process.transition,note:sale_stock.process_transition_packing0
@@ -211,7 +211,7 @@ msgstr "Depo"
 #. module: sale_stock
 #: model:process.transition.action,name:sale_stock.process_transition_action_forceassignation0
 msgid "Force Assignation"
-msgstr "Güç Tahsisi"
+msgstr "Tahsisi Zorla"
 
 #. module: sale_stock
 #: field:sale.config.settings,default_order_policy:0
@@ -221,7 +221,7 @@ msgstr "Varsayılan faturalama yöntemi"
 #. module: sale_stock
 #: field:sale.order.line,delay:0
 msgid "Delivery Lead Time"
-msgstr "Teslimat Süresi"
+msgstr "Teslim Süresi"
 
 #. module: sale_stock
 #: model:process.node,note:sale_stock.process_node_deliveryorder0
@@ -303,17 +303,17 @@ msgstr ""
 #. module: sale_stock
 #: field:sale.config.settings,group_invoice_deli_orders:0
 msgid "Generate invoices after and based on delivery orders"
-msgstr "Faturaları sonra ve teslim emirlerine göre oluştur"
+msgstr "Faturaları sonra ve teslim emirlerine göre oluşturma"
 
 #. module: sale_stock
 #: field:sale.config.settings,module_delivery:0
 msgid "Allow adding shipping costs"
-msgstr "Sevkiyat maliyetlerini eklemeye izin verir"
+msgstr "Sevkiyat maliyetlerini eklemeye izin verme"
 
 #. module: sale_stock
 #: view:sale.order:0
 msgid "days"
-msgstr "günler"
+msgstr "gün"
 
 #. module: sale_stock
 #: field:sale.order.line,product_packaging:0
@@ -351,7 +351,7 @@ msgstr "Tüm ürünler mevcut olduğunda bir kerede teslim et."
 #. module: sale_stock
 #: model:res.groups,name:sale_stock.group_invoice_deli_orders
 msgid "Enable Invoicing Delivery orders"
-msgstr "Teslimat emirlerini faturalamayı etkinleştir"
+msgstr "Teslimat Emirlerinde Faturalamayı Etkinleştirme"
 
 #. module: sale_stock
 #: field:res.company,security_lead:0
@@ -410,7 +410,7 @@ msgstr ""
 #. module: sale_stock
 #: field:sale.config.settings,group_mrp_properties:0
 msgid "Product properties on order lines"
-msgstr "Sipariş kalemlerindeki ürün özellikleri"
+msgstr "Sipariş satırında ürün özellikleri"
 
 #. module: sale_stock
 #: help:sale.config.settings,default_order_policy:0
@@ -524,7 +524,7 @@ msgstr ""
 #. module: sale_stock
 #: field:sale.order.line,number_packages:0
 msgid "Number Packages"
-msgstr "Paketleri Numarala"
+msgstr "Paket Numaraları"
 
 #. module: sale_stock
 #: field:sale.order,shipped:0
@@ -539,7 +539,7 @@ msgstr "Fatura Oluştur"
 #. module: sale_stock
 #: field:sale.config.settings,task_work:0
 msgid "Prepare invoices based on task's activities"
-msgstr "Görevlerin eylemlerine göre fatura hazırla"
+msgstr "Görev faaliyetlerine göre faturalar hazırlama"
 
 #. module: sale_stock
 #: model:ir.model,name:sale_stock.model_sale_advance_payment_inv
diff --git a/addons/stock/i18n/tr.po b/addons/stock/i18n/tr.po
index afdd99135c5..edf2e1fa4af 100644
--- a/addons/stock/i18n/tr.po
+++ b/addons/stock/i18n/tr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2014-02-06 15:56+0000\n"
-"PO-Revision-Date: 2014-03-30 09:58+0000\n"
-"Last-Translator: Ayhan KIZILTAN <Unknown>\n"
+"PO-Revision-Date: 2014-05-17 04:51+0000\n"
+"Last-Translator: Ediz Duman <neps1192@gmail.com>\n"
 "Language-Team: Turkish <tr@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: 2014-03-31 06:40+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-05-17 07:10+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -40,7 +40,7 @@ msgstr ""
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move_split_lines
 msgid "Stock move Split lines"
-msgstr "Stok hareketi Bölünmüş Satırları"
+msgstr "Stok Hareketi Bölünmüş Satırları"
 
 #. module: stock
 #: help:product.category,property_stock_account_input_categ:0
@@ -59,7 +59,7 @@ msgstr ""
 #. module: stock
 #: view:stock.picking.out:0
 msgid "Confirm & Deliver"
-msgstr "Onay & Teslimat"
+msgstr "Onay & Teslim"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_view_change_product_quantity
@@ -70,7 +70,7 @@ msgstr "Ürün Miktarını Güncelle"
 #. module: stock
 #: field:stock.location,chained_location_id:0
 msgid "Chained Location If Fixed"
-msgstr "Zincirli Konum Sabit ise"
+msgstr "Zincirlenmiş Konum Sabit İse"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -129,8 +129,8 @@ msgid "Product Moves"
 msgstr "Ürün Hareketleri"
 
 #. module: stock
-#: code:addons/stock/stock.py:2568
-#: code:addons/stock/stock.py:2629
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
 #, python-format
 msgid "Please provide proper quantity."
 msgstr "Uygun miktarı belirtiniz"
@@ -149,13 +149,13 @@ msgstr ""
 "Üretici seri numarasından farklı olması durumunda dahili referans numarası"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_fill_inventory.py:63
+#: code:addons/stock/wizard/stock_fill_inventory.py:59
 #, python-format
 msgid "You cannot perform this operation on more than one Stock Inventories."
 msgstr "Bu işlemi birden fazla stok kalemi üzerinde uygulayamazsınız."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:95
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
 #, python-format
 msgid "Quantity cannot be negative."
 msgstr "Miktar eksi olamaz"
@@ -188,8 +188,6 @@ msgstr "örn. Yıllık Sayım"
 #: field:stock.partial.move.line,quantity:0
 #: field:stock.partial.picking.line,quantity:0
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 #: field:stock.report.prodlots,qty:0
 #: field:stock.report.tracklots,name:0
 #: field:stock.return.picking.memory,quantity:0
@@ -243,7 +241,7 @@ msgstr ""
 #. module: stock
 #: model:ir.actions.server,name:stock.action_partial_move_server
 msgid "Deliver/Receive Products"
-msgstr "Teslimat/Kabul Ürünler"
+msgstr "Teslim/Kabul Ürünler"
 
 #. module: stock
 #: code:addons/stock/report/report_stock.py:78
@@ -302,7 +300,7 @@ msgstr "Gelen Ürünler"
 #. module: stock
 #: view:report.stock.lines.date:0
 msgid "Non Inv"
-msgstr "Faturalandırılmamış"
+msgstr "Faturasız"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_traceability.py:54
@@ -323,7 +321,7 @@ msgid "Reference"
 msgstr "Referans"
 
 #. module: stock
-#: code:addons/stock/stock.py:1565
+#: code:addons/stock/stock.py:1548
 #, python-format
 msgid "Products to Process"
 msgstr "İşlenecek Ürünler"
@@ -364,12 +362,12 @@ msgstr ""
 "eklenebilmesi için html biçimindedir."
 
 #. module: stock
-#: code:addons/stock/stock.py:782
-#: code:addons/stock/stock.py:2517
-#: code:addons/stock/stock.py:2568
-#: code:addons/stock/stock.py:2629
-#: code:addons/stock/wizard/stock_change_product_qty.py:95
-#: code:addons/stock/wizard/stock_fill_inventory.py:128
+#: code:addons/stock/stock.py:768
+#: code:addons/stock/stock.py:2475
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
+#: code:addons/stock/wizard/stock_fill_inventory.py:124
 #: code:addons/stock/wizard/stock_inventory_merge.py:43
 #: code:addons/stock/wizard/stock_inventory_merge.py:63
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
@@ -377,9 +375,9 @@ msgstr ""
 #: code:addons/stock/wizard/stock_partial_picking.py:174
 #: code:addons/stock/wizard/stock_partial_picking.py:181
 #: code:addons/stock/wizard/stock_partial_picking.py:192
-#: code:addons/stock/wizard/stock_return_picking.py:102
-#: code:addons/stock/wizard/stock_return_picking.py:109
-#: code:addons/stock/wizard/stock_return_picking.py:212
+#: code:addons/stock/wizard/stock_return_picking.py:99
+#: code:addons/stock/wizard/stock_return_picking.py:106
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Warning!"
 msgstr "Uyarı!"
@@ -412,7 +410,7 @@ msgstr "İş Ortağı"
 #. module: stock
 #: field:stock.config.settings,module_claim_from_delivery:0
 msgid "Allow claim on deliveries"
-msgstr "Teslimatlarda şikayete izin ver"
+msgstr "Teslimatlarda şikayete izin verme"
 
 #. module: stock
 #: selection:stock.return.picking,invoice_state:0
@@ -464,7 +462,7 @@ msgstr "İç Konum"
 #. module: stock
 #: view:stock.move:0
 msgid "Split in Serial Number"
-msgstr "Deri Numaralarına ayır"
+msgstr "Seri Numaralarına Ayır"
 
 #. module: stock
 #: view:stock.location:0
@@ -484,7 +482,7 @@ msgstr "Gecikme (Gün)"
 #. module: stock
 #: selection:stock.picking.out,state:0
 msgid "Ready to Deliver"
-msgstr "Teslimata Hazırla"
+msgstr "Teslime Hazırla"
 
 #. module: stock
 #: code:addons/stock/stock.py:2525
@@ -500,9 +498,6 @@ msgstr ""
 #: selection:stock.move,state:0
 #: selection:stock.picking,state:0
 #: selection:stock.picking.in,state:0
-#: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 #: selection:stock.picking.out,state:0
 msgid "Waiting Availability"
 msgstr "Uygunluk Bekliyor"
@@ -511,9 +506,6 @@ msgstr "Uygunluk Bekliyor"
 #: selection:report.stock.inventory,state:0
 #: selection:report.stock.move,state:0
 #: selection:stock.move,state:0
-#: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 #: view:stock.production.lot:0
 #: field:stock.production.lot,stock_available:0
 msgid "Available"
@@ -573,7 +565,7 @@ msgstr ""
 #. module: stock
 #: field:stock.config.settings,group_stock_tracking_lot:0
 msgid "Track serial number on logistic units (pallets)"
-msgstr "Lojistik birimlerinde (paletler) seri numaralarını izle"
+msgstr "Lojistik birimlerde (paletler) seri numaralarını izleme"
 
 #. module: stock
 #: help:product.template,sale_delay:0
@@ -586,7 +578,7 @@ msgstr ""
 "sayısı. Bu müşterilerine söz verdiğiniz süredir."
 
 #. module: stock
-#: code:addons/stock/product.py:195
+#: code:addons/stock/product.py:196
 #, python-format
 msgid "Products: "
 msgstr "Ürünler: "
@@ -603,7 +595,7 @@ msgid "Draft Physical Inventories"
 msgstr "Fiziksel Taslak Envanterler"
 
 #. module: stock
-#: code:addons/stock/stock.py:1806
+#: code:addons/stock/stock.py:1777
 #, python-format
 msgid ""
 "Quantities, Units of Measure, Products and Locations cannot be modified on "
@@ -649,7 +641,7 @@ msgid "Item Labels"
 msgstr "Öğe Etiketleri"
 
 #. module: stock
-#: code:addons/stock/stock.py:1373
+#: code:addons/stock/stock.py:1356
 #, python-format
 msgid "Back order <em>%s</em> has been <b>created</b>."
 msgstr "Sipariş bakiyesi <em>%s</em>  <b>oluşturulmuştur</b>."
@@ -702,7 +694,7 @@ msgstr "Dahili Hareketler"
 #. module: stock
 #: field:stock.move,location_dest_id:0
 msgid "Destination Location"
-msgstr "Varış Konumu"
+msgstr "Hedef Konumu"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_move_line
@@ -730,8 +722,6 @@ msgstr ""
 
 #. module: stock
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 msgid "Order(Origin)"
 msgstr "Sipariş (Orjini)"
 
@@ -768,10 +758,9 @@ msgstr "Konum / Ürün"
 #. module: stock
 #: field:stock.move,partner_id:0
 msgid "Destination Address "
-msgstr "Varış Adresi "
+msgstr "Hedef Adresi "
 
 #. module: stock
-#: view:product.product:0
 #: field:product.product,reception_count:0
 msgid "Reception"
 msgstr "Kabul"
@@ -822,8 +811,6 @@ msgstr "Planlanan Yıl"
 #: view:stock.picking.in:0
 #: field:stock.picking.in,state:0
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 #: field:stock.picking.out,state:0
 msgid "Status"
 msgstr "Durumu"
@@ -922,7 +909,7 @@ msgstr ""
 "Defteridir."
 
 #. module: stock
-#: code:addons/stock/stock.py:2296
+#: code:addons/stock/stock.py:2252
 #, python-format
 msgid ""
 "Please define stock output account for this product or its category: \"%s\" "
@@ -951,7 +938,7 @@ msgid "Reference must be unique per Company!"
 msgstr "Referans her şirket için tekil olmalı!"
 
 #. module: stock
-#: code:addons/stock/product.py:448
+#: code:addons/stock/product.py:447
 #, python-format
 msgid "Future Receptions"
 msgstr "Gelecek Kabuller"
@@ -981,7 +968,7 @@ msgstr "Konum Adresi"
 #: view:stock.move:0
 #: view:stock.move.scrap:0
 msgid "Scrap Products"
-msgstr "Hurda Ürünler"
+msgstr "Fire Ürünler"
 
 #. module: stock
 #: view:product.product:0
@@ -990,8 +977,6 @@ msgstr "- güncelle"
 
 #. module: stock
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 msgid "Weight"
 msgstr "Ağırlık"
 
@@ -1037,7 +1022,7 @@ msgid "December"
 msgstr "Aralık"
 
 #. module: stock
-#: code:addons/stock/stock.py:1204
+#: code:addons/stock/stock.py:1190
 #, python-format
 msgid ""
 "You cannot cancel the picking as some moves have been done. You should "
@@ -1062,7 +1047,7 @@ msgid "Change Product Quantity"
 msgstr "Ürün Miktarını Değiştir"
 
 #. module: stock
-#: code:addons/stock/product.py:464
+#: code:addons/stock/product.py:463
 #, python-format
 msgid "Future P&L"
 msgstr "Gelecek Kâr&Zarar"
@@ -1086,7 +1071,7 @@ msgstr "Oluşturma tarihi, genellikle sipariş tarihidir."
 #: view:report.stock.inventory:0
 #: view:stock.move:0
 msgid "Scrap"
-msgstr "Hurda"
+msgstr "Fire"
 
 #. module: stock
 #: field:product.template,property_stock_inventory:0
@@ -1099,7 +1084,7 @@ msgid "You must assign a serial number for this product."
 msgstr "Bu ürün için seri numarası atamanız gerekir."
 
 #. module: stock
-#: code:addons/stock/stock.py:2299
+#: code:addons/stock/stock.py:2255
 #, python-format
 msgid "Please define journal on the product category: \"%s\" (id: %d)"
 msgstr "Ürün kategorisi ile ilgili yevmiye tanımlayınız: \"%s\" (id: %d)"
@@ -1124,7 +1109,7 @@ msgstr "Birim Fiyat"
 #. module: stock
 #: field:stock.move,date_expected:0
 msgid "Scheduled Date"
-msgstr "Zamanlan Tarih"
+msgstr "Planlanan Tarih"
 
 #. module: stock
 #: view:stock.tracking:0
@@ -1146,8 +1131,6 @@ msgstr "ParaBirimi"
 #: view:stock.picking:0
 #: view:stock.picking.in:0
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 msgid "Journal"
 msgstr "Yevmiye"
 
@@ -1207,7 +1190,7 @@ msgstr "Ters Tranferler"
 #. module: stock
 #: field:stock.config.settings,group_uos:0
 msgid "Invoice products in a different unit of measure than the sales order"
-msgstr "Satış siparişinde ürünleri farklı ölçü biriminde faturalandırma"
+msgstr "Satış siparişinde ürünleri farklı ölçü biriminden faturalama"
 
 #. module: stock
 #: help:stock.location,active:0
@@ -1226,7 +1209,7 @@ msgstr ""
 "seçin."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:109
+#: code:addons/stock/wizard/stock_return_picking.py:106
 #, python-format
 msgid ""
 "No products to return (only lines in Done state and not fully returned yet "
@@ -1353,7 +1336,7 @@ msgid "Author"
 msgstr "Yazar"
 
 #. module: stock
-#: code:addons/stock/stock.py:1851
+#: code:addons/stock/stock.py:1822
 #, python-format
 msgid ""
 "You are moving %.2f %s but only %.2f %s available for this serial number."
@@ -1362,8 +1345,6 @@ msgstr ""
 
 #. module: stock
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 msgid "Internal Shipment :"
 msgstr "Dahili Sevkiyat :"
 
@@ -1391,7 +1372,7 @@ msgid "Supplier"
 msgstr "Tedarikçi"
 
 #. module: stock
-#: code:addons/stock/stock.py:2908
+#: code:addons/stock/stock.py:2859
 #, python-format
 msgid ""
 "In order to cancel this inventory, you must first unpost related journal "
@@ -1478,7 +1459,7 @@ msgstr ""
 #. module: stock
 #: model:stock.location,name:stock.stock_location_locations_partner
 msgid "Partner Locations"
-msgstr "İş Ortağı Konumları"
+msgstr "İş Ortağı Konumu"
 
 #. module: stock
 #: selection:stock.picking.in,state:0
@@ -1502,12 +1483,10 @@ msgstr "Planlanmış Zaman"
 #: model:ir.actions.act_window,name:stock.move_consume
 #: view:stock.move.consume:0
 msgid "Consume Move"
-msgstr "Tüketim Hareketi"
+msgstr "Sarf Hareketi"
 
 #. module: stock
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 msgid "Delivery Order :"
 msgstr "Teslimat Siparişi:"
 
@@ -1609,7 +1588,7 @@ msgstr ""
 "kullanılırken)"
 
 #. module: stock
-#: code:addons/stock/stock.py:1919
+#: code:addons/stock/stock.py:1890
 #, python-format
 msgid "Warning: No Back Order"
 msgstr "Uyarı: No Back Order"
@@ -1631,13 +1610,13 @@ msgid "To be refunded/invoiced"
 msgstr "İade edilecek/faturalanacak"
 
 #. module: stock
-#: code:addons/stock/stock.py:2492
+#: code:addons/stock/stock.py:2450
 #, python-format
 msgid "You can only delete draft moves."
 msgstr "Sadece taslak hareketlerini silebilirsiniz."
 
 #. module: stock
-#: code:addons/stock/stock.py:1682
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "You cannot move product %s to a location of type view %s."
 msgstr "Bu %s ürününü %s görünüm türlü bir konuma taşıyamazsınız."
@@ -1666,7 +1645,7 @@ msgstr "Taslak"
 #. module: stock
 #: field:product.template,sale_delay:0
 msgid "Customer Lead Time"
-msgstr "Müşteri Teslimat Süresi"
+msgstr "Müşteri Teslim Süresi"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1674,7 +1653,7 @@ msgid "Additional Info"
 msgstr "Ek Bilgisi"
 
 #. module: stock
-#: code:addons/stock/stock.py:2697
+#: code:addons/stock/stock.py:2648
 #, python-format
 msgid "Missing partial picking data for move #%s."
 msgstr "Hareket #%s için kısmi toplama verisi eksik."
@@ -1690,7 +1669,7 @@ msgid "Incoming Shipments already processed"
 msgstr "Halihazırda işlenmiş Gelen sevkiyatlar"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:102
+#: code:addons/stock/wizard/stock_return_picking.py:99
 #, python-format
 msgid "You may only return pickings that are Confirmed, Available or Done!"
 msgstr ""
@@ -1700,7 +1679,7 @@ msgstr ""
 #. module: stock
 #: view:stock.location:0
 msgid "Stock Locations"
-msgstr "Stok Konumları"
+msgstr "Stok Konumu"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1731,7 +1710,7 @@ msgstr "Böl"
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_picking_list_out
 msgid "Delivery Slip"
-msgstr "Teslimat Makbuzu"
+msgstr "Teslim Makbuzu"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.open_board_warehouse
@@ -1773,9 +1752,6 @@ msgstr ""
 #. module: stock
 #: field:stock.inventory,date:0
 #: field:stock.move,create_date:0
-#: field:stock.picking,date:0
-#: field:stock.picking.in,date:0
-#: field:stock.picking.out,date:0
 #: field:stock.production.lot,date:0
 #: field:stock.tracking,date:0
 msgid "Creation Date"
@@ -1866,7 +1842,7 @@ msgid "Order Date"
 msgstr "Sipariş Tarihi"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:96
+#: code:addons/stock/wizard/stock_change_product_qty.py:92
 #, python-format
 msgid "INV: %s"
 msgstr "INV: %s"
@@ -1896,7 +1872,7 @@ msgstr "Zincirleme Tedarik Süresi"
 #. module: stock
 #: field:stock.config.settings,group_uom:0
 msgid "Manage different units of measure for products"
-msgstr "Ürünler için farklı ölçü birimleri yönetimi"
+msgstr "Ürünler için farklı ölçü birimleri yönetme"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_invoice_onshipping
@@ -1904,10 +1880,10 @@ msgid "Stock Invoice Onshipping"
 msgstr "Sevkiyatta Stok Faturalandırma"
 
 #. module: stock
-#: code:addons/stock/stock.py:2517
+#: code:addons/stock/stock.py:2475
 #, python-format
 msgid "Please provide a positive quantity to scrap."
-msgstr "hurda için lütfen artı bir miktar belirtin."
+msgstr "Fire için lütfen artı bir miktar belirtin."
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_shop1
@@ -1942,7 +1918,7 @@ msgstr "Eylül"
 #. module: stock
 #: view:product.product:0
 msgid "days"
-msgstr "günler"
+msgstr "gün"
 
 #. module: stock
 #: model:ir.model,name:stock.model_report_stock_inventory
@@ -1969,8 +1945,6 @@ msgstr "Birikmiş Sipariş mi (backorder)"
 
 #. module: stock
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 msgid "Incoming Shipment :"
 msgstr "Gelen Sevkiyat:"
 
@@ -2060,7 +2034,7 @@ msgid "Shelf 2"
 msgstr "Raf 2"
 
 #. module: stock
-#: code:addons/stock/stock.py:543
+#: code:addons/stock/stock.py:529
 #, python-format
 msgid "You cannot remove a lot line."
 msgstr "Lot satırları kaldıramazsınız."
@@ -2084,7 +2058,7 @@ msgid "Localization"
 msgstr "Lokalizasyon"
 
 #. module: stock
-#: code:addons/stock/product.py:460
+#: code:addons/stock/product.py:459
 #, python-format
 msgid "Delivered Qty"
 msgstr "TeslimEdilen Miktar"
@@ -2184,7 +2158,7 @@ msgstr "Stok Konumu"
 #: code:addons/stock/wizard/stock_partial_picking.py:97
 #, python-format
 msgid "_Deliver"
-msgstr "_Teslimat"
+msgstr "_Teslim"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_inventory_merge.py:64
@@ -2398,7 +2372,7 @@ msgstr "Fiyat"
 #. module: stock
 #: field:stock.config.settings,module_stock_invoice_directly:0
 msgid "Create and open the invoice when the user finish a delivery order"
-msgstr "Kullanıcı bir teslimat emrini tamamladığında fatura oluştur ve aç"
+msgstr "Kullanıcı bir teslim emrini tamamladığında fatura oluşturma ve açma"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_return_picking_memory
@@ -2408,10 +2382,10 @@ msgstr "stock.return.picking.memory"
 #. module: stock
 #: field:stock.config.settings,group_stock_inventory_valuation:0
 msgid "Generate accounting entries per stock movement"
-msgstr "Stok hareketi başına muhasebe kayıtlarını oluşturun"
+msgstr "Her stok hareketi için muhasebe kayıtları oluşturma"
 
 #. module: stock
-#: code:addons/stock/product.py:450
+#: code:addons/stock/product.py:449
 #, python-format
 msgid "Received Qty"
 msgstr "Alınan Miktar"
@@ -2453,8 +2427,6 @@ msgstr "Adı"
 
 #. module: stock
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 msgid "Supplier Address :"
 msgstr "Tedarikçi Adresi"
 
@@ -2486,11 +2458,11 @@ msgstr "Lojistik sevikayat ünitesi: palet, kutu, paket ..."
 #. module: stock
 #: view:stock.location:0
 msgid "Customer Locations"
-msgstr "Müşteri Konumları"
+msgstr "Müşteri Konumu"
 
 #. module: stock
-#: code:addons/stock/stock.py:2492
-#: code:addons/stock/stock.py:2907
+#: code:addons/stock/stock.py:2449
+#: code:addons/stock/stock.py:2858
 #, python-format
 msgid "User Error!"
 msgstr "Kullanıcı Hatası!"
@@ -2651,7 +2623,7 @@ msgstr "Ölçü Birimi"
 #. module: stock
 #: field:stock.config.settings,group_stock_multiple_locations:0
 msgid "Manage multiple locations and warehouses"
-msgstr "Çoklu konum ve depo yönet"
+msgstr "Çoklu konum ve depo yönetme"
 
 #. module: stock
 #: field:stock.config.settings,group_stock_production_lot:0
@@ -2703,7 +2675,7 @@ msgstr "Diğerleri"
 #: model:stock.location,name:stock.stock_location_scrapped
 #: field:stock.move,scrapped:0
 msgid "Scrapped"
-msgstr "Hurda"
+msgstr "Fire"
 
 #. module: stock
 #: field:product.product,track_incoming:0
@@ -2721,7 +2693,7 @@ msgid "Warehouse board"
 msgstr "Depo panosu"
 
 #. module: stock
-#: code:addons/stock/product.py:470
+#: code:addons/stock/product.py:469
 #, python-format
 msgid "Future Qty"
 msgstr "Gelecek Miktar"
@@ -2729,7 +2701,7 @@ msgstr "Gelecek Miktar"
 #. module: stock
 #: model:res.groups,name:stock.group_production_lot
 msgid "Manage Serial Numbers"
-msgstr "Seri Numaraları Yönet"
+msgstr "Seri Numaraları Yönetme"
 
 #. module: stock
 #: field:stock.move,note:0
@@ -2788,7 +2760,7 @@ msgid "Products"
 msgstr "Ürünler"
 
 #. module: stock
-#: code:addons/stock/stock.py:2287
+#: code:addons/stock/stock.py:2243
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Output Account of this product and Valuation "
@@ -2812,7 +2784,7 @@ msgstr "Fiyatı Değiştir"
 #: field:stock.picking.in,move_type:0
 #: field:stock.picking.out,move_type:0
 msgid "Delivery Method"
-msgstr "Teslimat Yöntemi"
+msgstr "Teslim Yöntemi"
 
 #. module: stock
 #: help:report.stock.move,location_dest_id:0
@@ -2830,7 +2802,7 @@ msgid "Outgoing Products"
 msgstr "Giden Ürünler"
 
 #. module: stock
-#: code:addons/stock/stock.py:2293
+#: code:addons/stock/stock.py:2249
 #, python-format
 msgid ""
 "Please define stock input account for this product or its category: \"%s\" "
@@ -2852,7 +2824,7 @@ msgid "Move"
 msgstr "Hareket"
 
 #. module: stock
-#: code:addons/stock/product.py:466
+#: code:addons/stock/product.py:465
 #, python-format
 msgid "P&L Qty"
 msgstr "Kâr&Zarar Miktarı"
@@ -2947,8 +2919,6 @@ msgstr "Kaynak"
 #: field:stock.picking,location_id:0
 #: field:stock.picking.in,location_id:0
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 #: field:stock.picking.out,location_id:0
 #: field:stock.report.prodlots,location_id:0
 #: field:stock.report.tracklots,location_id:0
@@ -2969,10 +2939,10 @@ msgstr "Envanter İptali"
 #. module: stock
 #: view:stock.move:0
 msgid "Cancel Move"
-msgstr "Hareketi İptal et"
+msgstr "Hareketi İptal Et"
 
 #. module: stock
-#: code:addons/stock/stock.py:2290
+#: code:addons/stock/stock.py:2246
 #, python-format
 msgid ""
 "Cannot create Journal Entry, Input Account of this product and Valuation "
@@ -2995,10 +2965,10 @@ msgstr "Sabit Konum"
 #. module: stock
 #: field:report.stock.inventory,scrap_location:0
 msgid "scrap"
-msgstr "hurda"
+msgstr "fire"
 
 #. module: stock
-#: code:addons/stock/stock.py:1920
+#: code:addons/stock/stock.py:1891
 #, python-format
 msgid ""
 "By changing the quantity here, you accept the new quantity as complete: "
@@ -3025,7 +2995,7 @@ msgstr "Seri numarası ile Stok raporu"
 #. module: stock
 #: view:stock.picking:0
 msgid "Cancel Transfer"
-msgstr "Aktarmayı iptal et"
+msgstr "Aktarmayı İptal Et"
 
 #. module: stock
 #: selection:report.stock.inventory,month:0
@@ -3100,13 +3070,13 @@ msgid "Stock Journal"
 msgstr "Stok Yevmiye"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:176
+#: code:addons/stock/wizard/stock_return_picking.py:171
 #, python-format
 msgid "%s-%s-return"
 msgstr "%s-%s-dönen"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:86
+#: code:addons/stock/wizard/stock_change_product_qty.py:82
 #, python-format
 msgid "Active ID is not set in Context"
 msgstr "Aktif Kimlik Bağlam bölümünde ayarlanmamış"
@@ -3126,10 +3096,10 @@ msgstr "Raf"
 #: model:ir.actions.act_window,name:stock.move_scrap
 #: view:stock.move.scrap:0
 msgid "Scrap Move"
-msgstr "Hurda Hareketi"
+msgstr "Fire Hareketi"
 
 #. module: stock
-#: help:stock.move,prodlot_id:0
+#: help:stock.move,lot_id:0
 msgid "Serial number is used to put a serial number on the production"
 msgstr ""
 "Seri numarası üretimi üzerinde bir seri numarası koymak için kullanılmaktadır"
@@ -3175,7 +3145,7 @@ msgid "Date of Completion"
 msgstr "Tamamlama Tarihi"
 
 #. module: stock
-#: code:addons/stock/stock.py:1680
+#: code:addons/stock/stock.py:1663
 #, python-format
 msgid "You cannot move product %s from a location of type view %s."
 msgstr "Bu %s ürününü %s görünüm türündeki konumdan taşıyamazsınız."
@@ -3183,7 +3153,7 @@ msgstr "Bu %s ürününü %s görünüm türündeki konumdan taşıyamazsınız.
 #. module: stock
 #: model:stock.location,name:stock.stock_location_company
 msgid "Your Company"
-msgstr "Firmanız"
+msgstr "Firma"
 
 #. module: stock
 #: help:stock.tracking,active:0
@@ -3258,10 +3228,8 @@ msgstr "Revizyon Tarihi"
 
 #. module: stock
 #: view:report.stock.inventory:0
-#: field:report.stock.inventory,prodlot_id:0
+#: field:report.stock.inventory,lot_id:0
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 msgid "Lot"
 msgstr "Lot"
 
@@ -3292,10 +3260,8 @@ msgstr "Kullanılabilir Yap"
 
 #. module: stock
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 msgid "Contact Address :"
-msgstr "İlgili Adresi:"
+msgstr "Kontak Adresi:"
 
 #. module: stock
 #: help:stock.config.settings,group_stock_tracking_lot:0
@@ -3329,7 +3295,7 @@ msgstr "Özellikler"
 #: field:stock.inventory.line.split.lines,wizard_id:0
 #: field:stock.move.split.lines,wizard_id:0
 msgid "Parent Wizard"
-msgstr "Ana Sihirbaz"
+msgstr "Üst Sihirbaz"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_incoterms_tree
@@ -3337,7 +3303,7 @@ msgstr "Ana Sihirbaz"
 #: model:ir.ui.menu,name:stock.menu_action_incoterm_open
 #: view:stock.incoterms:0
 msgid "Incoterms"
-msgstr "Teslimat Şekilleri"
+msgstr "Teslim Şekilleri"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_picking_line
@@ -3473,7 +3439,7 @@ msgstr "Revizyon Adı"
 #. module: stock
 #: model:res.groups,name:stock.group_tracking_lot
 msgid "Manage Logistic Serial Numbers"
-msgstr "Lojistik Seri Numaralarını Yönet"
+msgstr "Lojistik Seri Numaralarını Yönetme"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -3506,15 +3472,15 @@ msgstr ""
 "            "
 
 #. module: stock
-#: code:addons/stock/stock.py:2545
+#: code:addons/stock/stock.py:2496
 #, python-format
 msgid "%s %s %s has been <b>moved to</b> scrap."
-msgstr "%s %s %s olarak <b>taşındı</b> hurda."
+msgstr "%s %s %s olarak <b>taşındı</b> fire."
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree_out
 msgid "Customers Packings"
-msgstr "Tüketici Paketleri"
+msgstr "Müşteri Paketleri"
 
 #. module: stock
 #: selection:report.stock.inventory,state:0
@@ -3525,9 +3491,6 @@ msgstr "Tüketici Paketleri"
 #: selection:stock.move,state:0
 #: view:stock.picking:0
 #: view:stock.picking.in:0
-#: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 msgid "Done"
 msgstr "Biten"
 
@@ -3556,7 +3519,7 @@ msgid "Date done"
 msgstr "Bitim tarih"
 
 #. module: stock
-#: code:addons/stock/stock.py:1135
+#: code:addons/stock/stock.py:1121
 #, python-format
 msgid ""
 "Please put a partner on the picking list if you want to generate invoice."
@@ -3583,7 +3546,7 @@ msgstr "Acil Değil"
 #. module: stock
 #: view:stock.move:0
 msgid "Scheduled"
-msgstr "Zamanlandı"
+msgstr "Planlanan"
 
 #. module: stock
 #: view:stock.picking:0
@@ -3634,7 +3597,7 @@ msgid "Stock"
 msgstr "Stok"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:226
+#: code:addons/stock/wizard/stock_return_picking.py:219
 #, python-format
 msgid "Returned Picking"
 msgstr "Dönen SeçimListeleri"
@@ -3709,7 +3672,7 @@ msgid "Assigned Internal Moves"
 msgstr "Atanmış Dahili Hareketler"
 
 #. module: stock
-#: code:addons/stock/stock.py:804
+#: code:addons/stock/stock.py:790
 #, python-format
 msgid "You cannot process picking without stock moves."
 msgstr "Stok hareketleri olmadan seçim listesi işleyemiyor."
@@ -3755,7 +3718,7 @@ msgstr "Koridor (X)"
 #: field:stock.config.settings,group_stock_packaging:0
 msgid "Allow to define several packaging methods on products"
 msgstr ""
-"Ürünleri üzerinde çeşitli paketleme yöntemleri tanımlamak için izin ver"
+"Ürünler üzerinde çeşitli paketleme yöntemleri tanımlama için izin verme"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_7
@@ -3783,7 +3746,7 @@ msgstr "Başka bir İşlem Bekliyor"
 #. module: stock
 #: view:stock.location:0
 msgid "Supplier Locations"
-msgstr "Tedarikçi Konumları"
+msgstr "Tedarikçi Konumu"
 
 #. module: stock
 #: field:stock.partial.move.line,wizard_id:0
@@ -3957,7 +3920,7 @@ msgid "Inventory Move"
 msgstr "Envanter Hareketi"
 
 #. module: stock
-#: code:addons/stock/product.py:476
+#: code:addons/stock/product.py:475
 #, python-format
 msgid "Future Productions"
 msgstr "Gelecek Üretimler"
@@ -4082,24 +4045,21 @@ msgstr "Lot Envanteri"
 #: model:ir.model,name:stock.model_stock_production_lot
 #: model:ir.ui.menu,name:stock.menu_action_production_lot_form
 #: model:res.request.link,name:stock.req_link_tracking
-#: field:stock.change.product.qty,prodlot_id:0
+#: field:stock.change.product.qty,lot_id:0
 #: field:stock.inventory.line,prod_lot_id:0
 #: field:stock.inventory.line.split.lines,name:0
-#: field:stock.inventory.line.split.lines,prodlot_id:0
-#: field:stock.move,prodlot_id:0
+#: field:stock.inventory.line.split.lines,lot_id:0
+#: field:stock.move,lot_id:0
 #: view:stock.move.split:0
 #: field:stock.move.split.lines,name:0
-#: field:stock.move.split.lines,prodlot_id:0
-#: field:stock.partial.move.line,prodlot_id:0
-#: field:stock.partial.picking.line,prodlot_id:0
+#: field:stock.move.split.lines,lot_id:0
+#: field:stock.partial.move.line,lot_id:0
+#: field:stock.partial.picking.line,lot_id:0
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 #: view:stock.production.lot:0
 #: field:stock.production.lot,name:0
 #: field:stock.production.lot.revision,lot_id:0
-#: field:stock.report.prodlots,prodlot_id:0
-#: field:stock.return.picking.memory,prodlot_id:0
+#: field:stock.report.prodlots,lot_id:0
 msgid "Serial Number"
 msgstr "Seri Numarası"
 
@@ -4162,7 +4122,7 @@ msgid "Non European Customers"
 msgstr "Avrupalı Olmayan Müşteriler"
 
 #. module: stock
-#: code:addons/stock/product.py:100
+#: code:addons/stock/product.py:96
 #: code:addons/stock/product.py:110
 #: code:addons/stock/product.py:113
 #: code:addons/stock/product.py:120
@@ -4170,19 +4130,18 @@ msgstr "Avrupalı Olmayan Müşteriler"
 #: code:addons/stock/product.py:167
 #: code:addons/stock/report/report_stock.py:78
 #: code:addons/stock/report/report_stock.py:134
-#: code:addons/stock/stock.py:543
-#: code:addons/stock/stock.py:804
-#: code:addons/stock/stock.py:1204
-#: code:addons/stock/stock.py:1213
-#: code:addons/stock/stock.py:2287
-#: code:addons/stock/stock.py:2290
-#: code:addons/stock/stock.py:2293
-#: code:addons/stock/stock.py:2296
-#: code:addons/stock/stock.py:2299
-#: code:addons/stock/stock.py:2302
-#: code:addons/stock/stock.py:2525
-#: code:addons/stock/stock.py:2634
-#: code:addons/stock/wizard/stock_fill_inventory.py:63
+#: code:addons/stock/stock.py:529
+#: code:addons/stock/stock.py:790
+#: code:addons/stock/stock.py:1190
+#: code:addons/stock/stock.py:1199
+#: code:addons/stock/stock.py:2243
+#: code:addons/stock/stock.py:2246
+#: code:addons/stock/stock.py:2249
+#: code:addons/stock/stock.py:2252
+#: code:addons/stock/stock.py:2255
+#: code:addons/stock/stock.py:2258
+#: code:addons/stock/stock.py:2585
+#: code:addons/stock/wizard/stock_fill_inventory.py:59
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:112
 #: code:addons/stock/wizard/stock_splitinto.py:53
 #, python-format
@@ -4280,7 +4239,7 @@ msgstr ""
 "durumunda Zincirlenen Konum."
 
 #. module: stock
-#: code:addons/stock/stock.py:1882
+#: code:addons/stock/stock.py:1853
 #, python-format
 msgid ""
 "By changing this quantity here, you accept the new quantity as complete: "
@@ -4321,7 +4280,7 @@ msgstr "Onaylandı"
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "Confirm"
-msgstr "Onaylama"
+msgstr "Doğrula"
 
 #. module: stock
 #: help:stock.location,icon:0
@@ -4354,7 +4313,7 @@ msgid "Followers"
 msgstr "İzleyiciler"
 
 #. module: stock
-#: code:addons/stock/stock.py:2634
+#: code:addons/stock/stock.py:2585
 #, python-format
 msgid "Cannot consume a move with negative or zero quantity."
 msgstr "Eksi ya da sıfır miktarlı bir hareket kullanılamıyor."
@@ -4425,7 +4384,7 @@ msgstr "Ayarlar"
 #. module: stock
 #: model:res.groups,name:stock.group_locations
 msgid "Manage Multiple Locations and Warehouses"
-msgstr "Çoklu Lokayonları ve Depoları Yönet"
+msgstr "Çoklu Lokayonları ve Depoları Yönetme"
 
 #. module: stock
 #: help:stock.change.standard.price,new_price:0
@@ -4442,7 +4401,7 @@ msgstr ""
 "giriş hesabı borçlandırılacaktır."
 
 #. module: stock
-#: code:addons/stock/stock.py:2860
+#: code:addons/stock/stock.py:2811
 #, python-format
 msgid "INV:"
 msgstr "ENV:"
@@ -4465,7 +4424,7 @@ msgid "Chaining Journal"
 msgstr "Zincirleme Yevmiye"
 
 #. module: stock
-#: code:addons/stock/stock.py:782
+#: code:addons/stock/stock.py:768
 #, python-format
 msgid "Not enough stock, unable to reserve the products."
 msgstr "Yeterli stok yok, ürünler rezerve edilemiyor."
@@ -4508,7 +4467,7 @@ msgstr ""
 "olmayacaktır."
 
 #. module: stock
-#: code:addons/stock/product.py:458
+#: code:addons/stock/product.py:457
 #, python-format
 msgid "Future Deliveries"
 msgstr "Gelecek Teslimatlar"
@@ -4531,7 +4490,7 @@ msgid "Auto Validate"
 msgstr "Otomatik Onaylama"
 
 #. module: stock
-#: code:addons/stock/stock.py:1850
+#: code:addons/stock/stock.py:1821
 #, python-format
 msgid "Insufficient Stock for Serial Number !"
 msgstr "Seri Numarası için yetersiz Stok!"
@@ -4629,14 +4588,14 @@ msgid "Invoiced"
 msgstr "Faturalandı"
 
 #. module: stock
-#: code:addons/stock/stock.py:1881
+#: code:addons/stock/stock.py:1852
 #: view:product.template:0
 #, python-format
 msgid "Information"
 msgstr "Bilgisi"
 
 #. module: stock
-#: code:addons/stock/stock.py:1213
+#: code:addons/stock/stock.py:1199
 #, python-format
 msgid "You cannot remove the picking which is in %s state!"
 msgstr "Bu %s durumundaki toplamayı kaldıramazsınız!"
@@ -4668,12 +4627,10 @@ msgstr "Mak. Beklenen Tarih"
 #: field:stock.picking.in,auto_picking:0
 #: field:stock.picking.out,auto_picking:0
 msgid "Auto-Picking"
-msgstr "Otomatik Seçimlistesi"
+msgstr "Otomatik Seçim listesi"
 
 #. module: stock
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 msgid "Customer Address :"
 msgstr "Müşteri Adresi :"
 
@@ -4731,7 +4688,7 @@ msgstr "Bu envanterleri birleştirmek istiyor musunuz?"
 #. module: stock
 #: view:stock.picking.out:0
 msgid "Date of Delivery"
-msgstr "Teslimat Tarihi"
+msgstr "Teslim Tarihi"
 
 #. module: stock
 #: field:stock.location,posy:0
@@ -4739,7 +4696,7 @@ msgid "Shelves (Y)"
 msgstr "Raflar (Y)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2302
+#: code:addons/stock/stock.py:2258
 #, python-format
 msgid ""
 "Please define inventory valuation account on the product category: \"%s\" "
@@ -4754,7 +4711,7 @@ msgid "Serial Number Revision"
 msgstr "Seri No Revizyonu"
 
 #. module: stock
-#: code:addons/stock/product.py:100
+#: code:addons/stock/product.py:96
 #, python-format
 msgid "Specify valuation Account for Product Category: %s."
 msgstr "Ürün Kategorisi için değerleme hesabı belirtin: %s."
@@ -4769,7 +4726,7 @@ msgstr ""
 "                Bu, claim_from_delivery modülünü kurar."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:212
+#: code:addons/stock/wizard/stock_return_picking.py:205
 #, python-format
 msgid "Please specify at least one non-zero quantity."
 msgstr "Lütfencsıfır olmayan  enaz bir miktar girin."
@@ -4787,7 +4744,7 @@ msgstr "Kullanıcı"
 #. module: stock
 #: field:stock.config.settings,module_stock_location:0
 msgid "Create push/pull logistic rules"
-msgstr "İtme/çekme lojistik kuralları oluşturun"
+msgstr "İtme/çekme lojistik kuralları oluşturma"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:98
@@ -4802,7 +4759,7 @@ msgid "November"
 msgstr "Kasım"
 
 #. module: stock
-#: code:addons/stock/product.py:472
+#: code:addons/stock/product.py:471
 #, python-format
 msgid "Unplanned Qty"
 msgstr "Planlanmayan Miktar"
@@ -4813,7 +4770,7 @@ msgid "Chained Company"
 msgstr "Zincirlenen Firma"
 
 #. module: stock
-#: view:stock.picking:0
+#: view:stock.picking.out:0
 msgid "Check Availability"
 msgstr "Uygunluk Kontrolu"
 
@@ -4840,7 +4797,7 @@ msgstr ""
 "doğru izlenebilirliğini elde edebilirsiniz."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_fill_inventory.py:128
+#: code:addons/stock/wizard/stock_fill_inventory.py:124
 #, python-format
 msgid ""
 "No product in this location. Please select a location in the product form."
@@ -4854,17 +4811,17 @@ msgstr "Gelecekteki Stok Hareketleri"
 #. module: stock
 #: field:stock.move,move_history_ids2:0
 msgid "Move History (parent moves)"
-msgstr "Hareket Geçmşi (üst hareketler)"
+msgstr "Hareket Geçmişi (üst hareketler)"
 
 #. module: stock
-#: code:addons/stock/product.py:454
+#: code:addons/stock/product.py:453
 #, python-format
 msgid "Future Stock"
 msgstr "Sonraki Stok"
 
 #. module: stock
-#: code:addons/stock/stock.py:1680
-#: code:addons/stock/stock.py:1682
+#: code:addons/stock/stock.py:1663
+#: code:addons/stock/stock.py:1665
 #, python-format
 msgid "Error"
 msgstr "Hata"
@@ -4994,8 +4951,6 @@ msgstr "Gecikmeler"
 
 #. module: stock
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 msgid "Schedule Date"
 msgstr "Program Tarihi"
 
@@ -5033,8 +4988,6 @@ msgstr "Gerçek"
 #. module: stock
 #: field:stock.move,name:0
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 #: view:stock.production.lot.revision:0
 #: field:stock.production.lot.revision,description:0
 msgid "Description"
@@ -5058,10 +5011,9 @@ msgid "Deliver"
 msgstr "Teslim"
 
 #. module: stock
-#: view:product.product:0
 #: field:product.product,delivery_count:0
 msgid "Delivery"
-msgstr "Teslimat"
+msgstr "Teslim"
 
 #. module: stock
 #: view:stock.fill.inventory:0
@@ -5080,7 +5032,7 @@ msgid "Location Content"
 msgstr "Konum İçeriği"
 
 #. module: stock
-#: code:addons/stock/product.py:478
+#: code:addons/stock/product.py:477
 #, python-format
 msgid "Produced Qty"
 msgstr "Üretilen Miktar"
@@ -5181,7 +5133,7 @@ msgstr "Onay & Tranfer"
 #: field:stock.location,scrap_location:0
 #: view:stock.move.scrap:0
 msgid "Scrap Location"
-msgstr "Hurda Konumu"
+msgstr "Fire Konumu"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_partial_picking
@@ -5305,8 +5257,6 @@ msgstr "İşlenmeye Hazır"
 
 #. module: stock
 #: report:stock.picking.list:0
-#: report:stock.picking.list.in:0
-#: report:stock.picking.list.out:0
 msgid "Warehouse Address :"
 msgstr "Depo Adresi :"
 
diff --git a/addons/stock_location/i18n/tr.po b/addons/stock_location/i18n/tr.po
index 89c4540526b..79a21f0ebaf 100644
--- a/addons/stock_location/i18n/tr.po
+++ b/addons/stock_location/i18n/tr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 7.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2013-04-13 23:40+0000\n"
-"Last-Translator: Ayhan KIZILTAN <Unknown>\n"
+"PO-Revision-Date: 2014-05-17 04:50+0000\n"
+"Last-Translator: Ediz Duman <neps1192@gmail.com>\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: 2013-11-21 06:37+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-05-17 07:10+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: stock_location
 #: help:product.pulled.flow,company_id:0
@@ -80,7 +80,7 @@ msgstr "X konumunda alırken,Y konumuna taşı"
 #: selection:product.pulled.flow,picking_type:0
 #: selection:stock.location.path,picking_type:0
 msgid "Internal"
-msgstr "İç"
+msgstr "Dahili"
 
 #. module: stock_location
 #: code:addons/stock_location/procurement_pull.py:98
@@ -95,7 +95,7 @@ msgstr ""
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_stock_location
 msgid "Location"
-msgstr "Yer"
+msgstr "Konum"
 
 #. module: stock_location
 #: field:product.pulled.flow,invoice_state:0
@@ -196,12 +196,12 @@ msgstr "Stoktan Al"
 #: code:addons/stock_location/procurement_pull.py:118
 #, python-format
 msgid "Pulled from another location."
-msgstr "farklı bir konumdan alındı"
+msgstr "Farklı bir konumdan alındı"
 
 #. module: stock_location
 #: field:product.pulled.flow,partner_address_id:0
 msgid "Partner Address"
-msgstr "Partner Adresi"
+msgstr "İş Ortağı Adresi"
 
 #. module: stock_location
 #: selection:product.pulled.flow,invoice_state:0
@@ -287,7 +287,7 @@ msgstr "Uygun Değil"
 #. module: stock_location
 #: field:stock.location.path,delay:0
 msgid "Delay (days)"
-msgstr "Geçikme (Gün)"
+msgstr "Geçikme (gün)"
 
 #. module: stock_location
 #: code:addons/stock_location/procurement_pull.py:67
@@ -360,7 +360,7 @@ msgstr "İşlem Türü"
 #. module: stock_location
 #: field:product.pulled.flow,procure_method:0
 msgid "Procure Method"
-msgstr "TeminEtme Metodu"
+msgstr "Tedarik Metodu"
 
 #. module: stock_location
 #: help:product.pulled.flow,picking_type:0
diff --git a/addons/warning/i18n/tr.po b/addons/warning/i18n/tr.po
index 8bb3ab4cc17..4bca03b8691 100644
--- a/addons/warning/i18n/tr.po
+++ b/addons/warning/i18n/tr.po
@@ -7,20 +7,20 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2013-03-02 03:28+0000\n"
-"Last-Translator: Ayhan KIZILTAN <Unknown>\n"
+"PO-Revision-Date: 2014-05-17 04:50+0000\n"
+"Last-Translator: Ediz Duman <neps1192@gmail.com>\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: 2013-11-21 06:38+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-05-17 07:10+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
 #: field:product.product,purchase_line_warn:0
 msgid "Purchase Order Line"
-msgstr "Satınalma Sipariş Kalemi"
+msgstr "Satınalma Sipariş Satırı"
 
 #. module: warning
 #: model:ir.model,name:warning.model_stock_picking_in
@@ -30,7 +30,7 @@ msgstr "Gelen Sevkiyatlar"
 #. module: warning
 #: field:product.product,purchase_line_warn_msg:0
 msgid "Message for Purchase Order Line"
-msgstr "Alış Sipariş Kalemi için Mesaj"
+msgstr "Satınalma Sipariş Satırı için Mesaj"
 
 #. module: warning
 #: model:ir.model,name:warning.model_stock_picking
@@ -40,7 +40,7 @@ msgstr "Toplama Listesi"
 #. module: warning
 #: view:product.product:0
 msgid "Warning when Purchasing this Product"
-msgstr "Bu Ürün Satıalınırken yapılacak Uyarı"
+msgstr "Bu Ürün Satınalınırken Yapılacak Uyarı"
 
 #. module: warning
 #: model:ir.model,name:warning.model_product_product
@@ -61,12 +61,12 @@ msgstr "Uyarılar"
 #: selection:res.partner,purchase_warn:0
 #: selection:res.partner,sale_warn:0
 msgid "Blocking Message"
-msgstr "Mesaj Engelleme"
+msgstr "Mesajı Engelleme"
 
 #. module: warning
 #: view:res.partner:0
 msgid "Warning on the Invoice"
-msgstr "Faturadaki Uyarı"
+msgstr "Faturada Uyarı"
 
 #. module: warning
 #: selection:product.product,purchase_line_warn:0
@@ -87,7 +87,7 @@ msgstr "Fatura"
 #. module: warning
 #: view:product.product:0
 msgid "Warning when Selling this Product"
-msgstr "Bu Ürün Satılırken yapılacak Uyarı"
+msgstr "Bu Ürün Satılırken Yapılacak Uyarı"
 
 #. module: warning
 #: field:res.partner,picking_warn:0
@@ -139,7 +139,7 @@ msgstr "%s için uyarı !"
 #. module: warning
 #: view:res.partner:0
 msgid "Warning on the Sales Order"
-msgstr "Satış Siparişinde uyarı"
+msgstr "Satış Siparişinde Uyarı"
 
 #. module: warning
 #: field:res.partner,invoice_warn_msg:0
@@ -149,17 +149,17 @@ msgstr "Fatura Mesajı"
 #. module: warning
 #: field:res.partner,sale_warn_msg:0
 msgid "Message for Sales Order"
-msgstr "Satış siparişi için mesaj"
+msgstr "Satış Siparişi için Mesaj"
 
 #. module: warning
 #: view:res.partner:0
 msgid "Warning on the Picking"
-msgstr "Toplama Uyarısı"
+msgstr "Toplamada Uyarı"
 
 #. module: warning
 #: view:res.partner:0
 msgid "Warning on the Purchase Order"
-msgstr "Satınalma Siparişi Uyarısı"
+msgstr "Satınalma Siparişinde Uyarı"
 
 #. module: warning
 #: code:addons/warning/warning.py:68
@@ -177,7 +177,7 @@ msgstr "%s için uyarı"
 #. module: warning
 #: field:product.product,sale_line_warn_msg:0
 msgid "Message for Sales Order Line"
-msgstr "Satış Siparişi kalemi için mesaj"
+msgstr "Satış Sipariş Satırı için Mesaj"
 
 #. module: warning
 #: selection:product.product,purchase_line_warn:0
@@ -214,4 +214,4 @@ msgstr "Teslimat Emirleri"
 #: model:ir.model,name:warning.model_sale_order_line
 #: field:product.product,sale_line_warn:0
 msgid "Sales Order Line"
-msgstr "Satış Siparişi Kalemi"
+msgstr "Satış Sipariş Satırı"

From 7a861fe8a8ebb99c9bfdb771fe4211f4bfdf336f Mon Sep 17 00:00:00 2001
From: richierichrawr <richierichrawr@users.noreply.github.com>
Date: Sat, 17 May 2014 23:41:16 -0400
Subject: [PATCH 182/225] Typo fix

Typo fix
---
 addons/account/__openerp__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py
index 59d86351cd6..5ab8d385943 100644
--- a/addons/account/__openerp__.py
+++ b/addons/account/__openerp__.py
@@ -40,11 +40,11 @@ Financial and accounting module that covers:
 
 Creates a dashboard for accountants that includes:
 --------------------------------------------------
-    * List of Customer Invoice to Approve
+    * List of Customer Invoices to Approve
     * Company Analysis
     * Graph of Treasury
 
-The processes like maintaining of general ledger is done through the defined financial Journals (entry move line orgrouping is maintained through journal) 
+Processes like maintaining general ledgers are done through the defined Financial Journals (entry move line or grouping is maintained through a journal) 
 for a particular financial year and for preparation of vouchers there is a module named account_voucher.
     """,
     'website': 'http://www.openerp.com',

From 08b18426f8d2ee566f9991d2bb2c6a559b0a8217 Mon Sep 17 00:00:00 2001
From: richierichrawr <richierichrawr@users.noreply.github.com>
Date: Sat, 17 May 2014 23:46:08 -0400
Subject: [PATCH 183/225] Docstrings and return value

Method comments should be docstrings.

check5() return else condition not in loop.
---
 .../wizard/account_automatic_reconcile.py     | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/addons/account/wizard/account_automatic_reconcile.py b/addons/account/wizard/account_automatic_reconcile.py
index f6f0c90b1e2..2ad701a9bf5 100644
--- a/addons/account/wizard/account_automatic_reconcile.py
+++ b/addons/account/wizard/account_automatic_reconcile.py
@@ -59,9 +59,11 @@ class account_automatic_reconcile(osv.osv_memory):
     #TODO: cleanup and comment this code... For now, it is awfulllll
     # (way too complex, and really slow)...
     def do_reconcile(self, cr, uid, credits, debits, max_amount, power, writeoff_acc_id, period_id, journal_id, context=None):
-    # for one value of a credit, check all debits, and combination of them
-    # depending on the power. It starts with a power of one and goes up
-    # to the max power allowed
+        """
+        for one value of a credit, check all debits, and combination of them
+        depending on the power. It starts with a power of one and goes up
+        to the max power allowed.
+        """
         move_line_obj = self.pool.get('account.move.line')
         if context is None:
             context = {}
@@ -87,11 +89,14 @@ class account_automatic_reconcile(osv.osv_memory):
                     return res
             return False
 
-        # for a list of credit and debit and a given power, check if there
-        # are matching tuples of credit and debits, check all debits, and combination of them
-        # depending on the power. It starts with a power of one and goes up
-        # to the max power allowed
+        
         def check4(list1, list2, power):
+            """
+            for a list of credit and debit and a given power, check if there
+            are matching tuples of credit and debits, check all debits, and combination of them
+            depending on the power. It starts with a power of one and goes up
+            to the max power allowed.
+            """
             def check3(value, list1, list2, list1power, power):
                 for i in range(len(list1)):
                     move = list1[i]
@@ -120,6 +125,7 @@ class account_automatic_reconcile(osv.osv_memory):
                 res = check4(list1, list2, p)
                 if res:
                     return res
+            return False
 
         ok = True
         reconciled = 0

From b5eabecf40febe20fffdd7160e640411ec4c49c4 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Sun, 18 May 2014 05:53:08 +0000
Subject: [PATCH 184/225] Launchpad automatic translations update.

---
 openerp/addons/base/i18n/de.po | 60 +++++++++++++++++-----------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/openerp/addons/base/i18n/de.po b/openerp/addons/base/i18n/de.po
index 9d49252d0d7..67f448a5a46 100644
--- a/openerp/addons/base/i18n/de.po
+++ b/openerp/addons/base/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:35+0000\n"
-"PO-Revision-Date: 2014-05-01 14:38+0000\n"
-"Last-Translator: Rudolf Schnapka <rs@techno-flex.de>\n"
+"PO-Revision-Date: 2014-05-17 09:03+0000\n"
+"Last-Translator: Ralf Hilgenstock <rh@dialoge.info>\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: 2014-05-02 06:45+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-05-18 05:53+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -527,7 +527,7 @@ msgstr ""
 #: code:addons/orm.py:2649
 #, python-format
 msgid "Invalid group_by"
-msgstr "Fehler bei group_by Argument"
+msgstr "Ungültiges group_by Argument"
 
 #. module: base
 #: field:ir.module.category,child_ids:0
@@ -549,7 +549,7 @@ msgstr "Langzeitprojekt Portal"
 #: field:ir.model.data,date_update:0
 #: field:ir.model.relation,date_update:0
 msgid "Update Date"
-msgstr "Update des Datums"
+msgstr "Datum aktualisieren"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_base_action_rule
@@ -819,7 +819,7 @@ msgstr "Verkauf & Einkauf"
 #. module: base
 #: view:res.partner:0
 msgid "Put an internal note..."
-msgstr "Eine Mitteilung verfassen"
+msgstr "Eine interne Mitteilung verfassen"
 
 #. module: base
 #: view:ir.translation:0
@@ -6874,7 +6874,7 @@ msgstr "Isle of Man"
 #. module: base
 #: help:ir.actions.client,res_model:0
 msgid "Optional model, mostly used for needactions."
-msgstr "Dieses ist ein optionales Krokodil"
+msgstr "Optionales Modell, meist für Bedarfsaktionen verwandt"
 
 #. module: base
 #: code:addons/base/module/module.py:306
@@ -6895,7 +6895,7 @@ msgstr "Bedingungstyp"
 #. module: base
 #: field:res.company,child_ids:0
 msgid "Child Companies"
-msgstr "untergeordnete Gesellschaften"
+msgstr "Tochterunternehmen"
 
 #. module: base
 #: model:res.country,name:base.ni
@@ -9570,7 +9570,7 @@ msgstr "Nächste Nummer dieser Sequenz"
 #: view:res.partner:0
 #: view:res.users:0
 msgid "Tags..."
-msgstr "Tags..."
+msgstr "Schlagworte …"
 
 #. module: base
 #: view:res.partner:0
@@ -10555,7 +10555,7 @@ msgstr "Zielobjekt"
 #. module: base
 #: selection:ir.model.fields,select_level:0
 msgid "Always Searchable"
-msgstr "immer eine Suche anzeigen"
+msgstr "Immer  durchsuchbar"
 
 #. module: base
 #: help:res.country.state,code:0
@@ -12003,7 +12003,7 @@ msgstr "Beim Entfernen"
 #: code:addons/base/ir/ir_model.py:347
 #, python-format
 msgid "Model %s does not exist!"
-msgstr "Modul %s existiert nicht!"
+msgstr "Modell %s existiert nicht!"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_mrp_jit
@@ -12172,7 +12172,7 @@ msgstr "Island"
 #: model:ir.actions.act_window,name:base.ir_action_window
 #: model:ir.ui.menu,name:base.menu_ir_action_window
 msgid "Window Actions"
-msgstr "Schließe/Öffne Fenster..."
+msgstr "Fenster öffnen/schließen …"
 
 #. module: base
 #: model:ir.module.module,description:base.module_portal_project_issue
@@ -12185,8 +12185,8 @@ msgid ""
 "    "
 msgstr ""
 "\n"
-"Diese Anwendung fügt Ihrem Portal ein Menü und Funktionen für Probleme "
-"hinzu, wenn project_issue und das Portal installiert sind.\n"
+"Diese Anwendung fügt Ihrem Portal ein Menü und Funktionen hinzu, wenn "
+"project_issue und das Portal installiert sind.\n"
 "============================================================================="
 "=====================\n"
 "    "
@@ -13951,7 +13951,7 @@ msgstr "Mehrstufig"
 #. module: base
 #: model:ir.module.module,summary:base.module_crm
 msgid "Leads, Opportunities, Phone Calls"
-msgstr "Leads, Opportunities, Telefonate"
+msgstr "Leads, Chancen, Telefonate"
 
 #. module: base
 #: model:ir.module.category,description:base.module_category_knowledge_management
@@ -14087,7 +14087,7 @@ msgstr ""
 #. module: base
 #: view:ir.module.module:0
 msgid "Search modules"
-msgstr "Suche Module"
+msgstr "Suche nach Modulen"
 
 #. module: base
 #: model:res.country,name:base.by
@@ -14251,12 +14251,12 @@ msgstr "Markieren, wenn der Kontakt ein Kunde ist."
 #. module: base
 #: view:ir.actions.server:0
 msgid "Trigger Configuration"
-msgstr "Auslösung konfigurieren"
+msgstr "Auslöser konfigurieren"
 
 #. module: base
 #: view:base.language.install:0
 msgid "Load"
-msgstr "Lade"
+msgstr "Laden"
 
 #. module: base
 #: model:ir.module.module,description:base.module_warning
@@ -14349,7 +14349,7 @@ msgstr "An"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr
 msgid "Employee Directory"
-msgstr "Angestelltenverzeichnis"
+msgstr "Mitarbeiterverzeichnis"
 
 #. module: base
 #: field:ir.cron,args:0
@@ -14764,7 +14764,7 @@ msgstr "Minute: %(min)s"
 #. module: base
 #: model:ir.ui.menu,name:base.menu_ir_cron
 msgid "Scheduler"
-msgstr "Scheduler"
+msgstr "Terminplaner"
 
 #. module: base
 #: model:ir.module.module,description:base.module_event_moodle
@@ -16421,7 +16421,7 @@ msgstr "Startaktion"
 #: field:ir.model,modules:0
 #: field:ir.model.fields,modules:0
 msgid "In Modules"
-msgstr "In Anwendungen"
+msgstr "In Modulen"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_contacts
@@ -16946,7 +16946,7 @@ msgstr ""
 #. module: base
 #: view:ir.rule:0
 msgid "Record rules"
-msgstr "Aufzeichnung Regel"
+msgstr "Regel aufzeichnen"
 
 #. module: base
 #: help:workflow.transition,act_to:0
@@ -18107,7 +18107,7 @@ msgstr ""
 #: field:ir.model,access_ids:0
 #: view:ir.model.access:0
 msgid "Access"
-msgstr "Datenzugriffsfehler"
+msgstr "Zugriff"
 
 #. module: base
 #: code:addons/base/res/res_company.py:165
@@ -18539,7 +18539,7 @@ msgstr "Land"
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_15
 msgid "Wholesaler"
-msgstr "Wiederverkäufer"
+msgstr "Großhändler"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_base_vat
@@ -18958,7 +18958,7 @@ msgstr ""
 #. module: base
 #: field:ir.actions.server,mobile:0
 msgid "Mobile No"
-msgstr "Handy-Nr."
+msgstr "Mobil-Nummer"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_by_category
@@ -18982,12 +18982,12 @@ msgstr "SXW Inhalt"
 #. module: base
 #: field:ir.attachment,file_size:0
 msgid "File Size"
-msgstr "Datei Grösse"
+msgstr "Dateigröße"
 
 #. module: base
 #: help:ir.sequence,prefix:0
 msgid "Prefix value of the record for the sequence"
-msgstr "Präfix einer Folgen"
+msgstr "Präfixwert des Datensatzes für Sequenz"
 
 #. module: base
 #: model:res.country,name:base.sc
@@ -19208,8 +19208,8 @@ msgid ""
 msgstr ""
 "Verwalten Sie Ihre Beziehungen zu Interessenten und Kunden. Nutzen Sie dabei "
 "\r\n"
-"Leads = Vorverhandlungen, \r\n"
-"Opportunities = Gelegenheiten, \r\n"
+"Leads = Interessenten, Vorverhandlungen, \r\n"
+"Opportunities = Chancen, Gelegenheiten, \r\n"
 "Requests = Anfragen oder \r\n"
 "Issues = Problembearbeitungen."
 

From c2584c8cb06f80de231cc6bec479de5f730a0326 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Sun, 18 May 2014 05:53:48 +0000
Subject: [PATCH 185/225] Launchpad automatic translations update.

---
 addons/procurement/i18n/tr.po             | 2 +-
 addons/product/i18n/tr.po                 | 2 +-
 addons/product_expiry/i18n/tr.po          | 2 +-
 addons/product_margin/i18n/tr.po          | 2 +-
 addons/purchase/i18n/tr.po                | 2 +-
 addons/purchase_analytic_plans/i18n/tr.po | 2 +-
 addons/purchase_requisition/i18n/tr.po    | 2 +-
 addons/sale/i18n/tr.po                    | 2 +-
 addons/sale_analytic_plans/i18n/tr.po     | 2 +-
 addons/sale_journal/i18n/tr.po            | 2 +-
 addons/sale_margin/i18n/tr.po             | 2 +-
 addons/sale_stock/i18n/tr.po              | 2 +-
 addons/stock/i18n/nl.po                   | 6 +++---
 addons/stock/i18n/tr.po                   | 2 +-
 addons/stock_location/i18n/tr.po          | 2 +-
 addons/warning/i18n/tr.po                 | 2 +-
 16 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/addons/procurement/i18n/tr.po b/addons/procurement/i18n/tr.po
index 192cc26c41c..1fb6f2a367a 100644
--- a/addons/procurement/i18n/tr.po
+++ b/addons/procurement/i18n/tr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-17 07:10+0000\n"
+"X-Launchpad-Export-Date: 2014-05-18 05:53+0000\n"
 "X-Generator: Launchpad (build 17007)\n"
 
 #. module: procurement
diff --git a/addons/product/i18n/tr.po b/addons/product/i18n/tr.po
index d4de293d97b..4550569506c 100644
--- a/addons/product/i18n/tr.po
+++ b/addons/product/i18n/tr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-17 07:10+0000\n"
+"X-Launchpad-Export-Date: 2014-05-18 05:53+0000\n"
 "X-Generator: Launchpad (build 17007)\n"
 
 #. module: product
diff --git a/addons/product_expiry/i18n/tr.po b/addons/product_expiry/i18n/tr.po
index af4826769c2..f25145822c5 100644
--- a/addons/product_expiry/i18n/tr.po
+++ b/addons/product_expiry/i18n/tr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-17 07:10+0000\n"
+"X-Launchpad-Export-Date: 2014-05-18 05:53+0000\n"
 "X-Generator: Launchpad (build 17007)\n"
 
 #. module: product_expiry
diff --git a/addons/product_margin/i18n/tr.po b/addons/product_margin/i18n/tr.po
index 5b0cac8755c..609fd70c66d 100644
--- a/addons/product_margin/i18n/tr.po
+++ b/addons/product_margin/i18n/tr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-17 07:10+0000\n"
+"X-Launchpad-Export-Date: 2014-05-18 05:53+0000\n"
 "X-Generator: Launchpad (build 17007)\n"
 
 #. module: product_margin
diff --git a/addons/purchase/i18n/tr.po b/addons/purchase/i18n/tr.po
index 1df49ea4e16..3304d4ea63f 100644
--- a/addons/purchase/i18n/tr.po
+++ b/addons/purchase/i18n/tr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-17 07:10+0000\n"
+"X-Launchpad-Export-Date: 2014-05-18 05:53+0000\n"
 "X-Generator: Launchpad (build 17007)\n"
 
 #. module: purchase
diff --git a/addons/purchase_analytic_plans/i18n/tr.po b/addons/purchase_analytic_plans/i18n/tr.po
index c1a57ef737e..9df8a5ff6bc 100644
--- a/addons/purchase_analytic_plans/i18n/tr.po
+++ b/addons/purchase_analytic_plans/i18n/tr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-17 07:10+0000\n"
+"X-Launchpad-Export-Date: 2014-05-18 05:53+0000\n"
 "X-Generator: Launchpad (build 17007)\n"
 
 #. module: purchase_analytic_plans
diff --git a/addons/purchase_requisition/i18n/tr.po b/addons/purchase_requisition/i18n/tr.po
index 0d196e04544..4310ba96a8e 100644
--- a/addons/purchase_requisition/i18n/tr.po
+++ b/addons/purchase_requisition/i18n/tr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-17 07:10+0000\n"
+"X-Launchpad-Export-Date: 2014-05-18 05:53+0000\n"
 "X-Generator: Launchpad (build 17007)\n"
 
 #. module: purchase_requisition
diff --git a/addons/sale/i18n/tr.po b/addons/sale/i18n/tr.po
index c7805a6826b..ca8f9db41f8 100644
--- a/addons/sale/i18n/tr.po
+++ b/addons/sale/i18n/tr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-17 07:10+0000\n"
+"X-Launchpad-Export-Date: 2014-05-18 05:53+0000\n"
 "X-Generator: Launchpad (build 17007)\n"
 
 #. module: sale
diff --git a/addons/sale_analytic_plans/i18n/tr.po b/addons/sale_analytic_plans/i18n/tr.po
index 33f3071e426..c7fbd7e01af 100644
--- a/addons/sale_analytic_plans/i18n/tr.po
+++ b/addons/sale_analytic_plans/i18n/tr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-17 07:10+0000\n"
+"X-Launchpad-Export-Date: 2014-05-18 05:53+0000\n"
 "X-Generator: Launchpad (build 17007)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_journal/i18n/tr.po b/addons/sale_journal/i18n/tr.po
index 3b4392dde4d..addc9a5f232 100644
--- a/addons/sale_journal/i18n/tr.po
+++ b/addons/sale_journal/i18n/tr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-17 07:10+0000\n"
+"X-Launchpad-Export-Date: 2014-05-18 05:53+0000\n"
 "X-Generator: Launchpad (build 17007)\n"
 
 #. module: sale_journal
diff --git a/addons/sale_margin/i18n/tr.po b/addons/sale_margin/i18n/tr.po
index ecc18dfb111..96a2fadd38e 100644
--- a/addons/sale_margin/i18n/tr.po
+++ b/addons/sale_margin/i18n/tr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-17 07:10+0000\n"
+"X-Launchpad-Export-Date: 2014-05-18 05:53+0000\n"
 "X-Generator: Launchpad (build 17007)\n"
 
 #. module: sale_margin
diff --git a/addons/sale_stock/i18n/tr.po b/addons/sale_stock/i18n/tr.po
index 54dff3ed1bf..08fb7041a3d 100644
--- a/addons/sale_stock/i18n/tr.po
+++ b/addons/sale_stock/i18n/tr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-17 07:10+0000\n"
+"X-Launchpad-Export-Date: 2014-05-18 05:53+0000\n"
 "X-Generator: Launchpad (build 17007)\n"
 
 #. module: sale_stock
diff --git a/addons/stock/i18n/nl.po b/addons/stock/i18n/nl.po
index ad5f42d7cfa..ed31a02907f 100644
--- a/addons/stock/i18n/nl.po
+++ b/addons/stock/i18n/nl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2014-02-06 15:56+0000\n"
-"PO-Revision-Date: 2014-05-14 18:21+0000\n"
+"PO-Revision-Date: 2014-05-17 08:22+0000\n"
 "Last-Translator: Erwin van der Ploeg (BAS Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@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: 2014-05-15 06:10+0000\n"
+"X-Launchpad-Export-Date: 2014-05-18 05:53+0000\n"
 "X-Generator: Launchpad (build 17007)\n"
 
 #. module: stock
@@ -2415,7 +2415,7 @@ msgstr "stock.return.picking.memory"
 #. module: stock
 #: field:stock.config.settings,group_stock_inventory_valuation:0
 msgid "Generate accounting entries per stock movement"
-msgstr "Maak boekingen per voorraadmutatie"
+msgstr "Maak financiële boekingen per voorraadmutatie (voorraadwaardering)"
 
 #. module: stock
 #: code:addons/stock/product.py:449
diff --git a/addons/stock/i18n/tr.po b/addons/stock/i18n/tr.po
index edf2e1fa4af..a6a2e5c6b6e 100644
--- a/addons/stock/i18n/tr.po
+++ b/addons/stock/i18n/tr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-17 07:10+0000\n"
+"X-Launchpad-Export-Date: 2014-05-18 05:53+0000\n"
 "X-Generator: Launchpad (build 17007)\n"
 
 #. module: stock
diff --git a/addons/stock_location/i18n/tr.po b/addons/stock_location/i18n/tr.po
index 79a21f0ebaf..5668804335a 100644
--- a/addons/stock_location/i18n/tr.po
+++ b/addons/stock_location/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-17 07:10+0000\n"
+"X-Launchpad-Export-Date: 2014-05-18 05:53+0000\n"
 "X-Generator: Launchpad (build 17007)\n"
 
 #. module: stock_location
diff --git a/addons/warning/i18n/tr.po b/addons/warning/i18n/tr.po
index 4bca03b8691..f5eedb394e9 100644
--- a/addons/warning/i18n/tr.po
+++ b/addons/warning/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-17 07:10+0000\n"
+"X-Launchpad-Export-Date: 2014-05-18 05:53+0000\n"
 "X-Generator: Launchpad (build 17007)\n"
 
 #. module: warning

From 7f0a167cf755d9cf54f0a65000d35f0c2adf7f22 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Sun, 18 May 2014 13:25:23 +0200
Subject: [PATCH 186/225] [REVERT]
 revid:jke@openerp.com-20140507120144-m177kqxa3fbfl37r: create_picking checks
 if the order is in state draft before doing anything. Writing the state
 'paid' just before calling this method is then not a good idea

---
 addons/point_of_sale/point_of_sale.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index 0a2b96fd273..3480ab47221 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -1167,8 +1167,8 @@ class pos_order(osv.osv):
         return self.write(cr, uid, ids, {'state': 'payment'}, context=context)
 
     def action_paid(self, cr, uid, ids, context=None):
-        self.write(cr, uid, ids, {'state': 'paid'}, context=context)
         self.create_picking(cr, uid, ids, context=context)
+        self.write(cr, uid, ids, {'state': 'paid'}, context=context)
         return True
 
     def action_cancel(self, cr, uid, ids, context=None):

From c0882872becf8108dbf507bc3cc4c755661b649b Mon Sep 17 00:00:00 2001
From: Kiril Vangelovski <kiril@hacbee.com>
Date: Sun, 18 May 2014 22:57:07 +0200
Subject: [PATCH 187/225] [ADD] Macedonian language

---
 openerp/tools/misc.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/openerp/tools/misc.py b/openerp/tools/misc.py
index dbf7198dab6..cc614071e33 100644
--- a/openerp/tools/misc.py
+++ b/openerp/tools/misc.py
@@ -486,6 +486,7 @@ ALL_LANGUAGES = {
         'lo_LA': u'Lao / ພາສາລາວ',
         'lt_LT': u'Lithuanian / Lietuvių kalba',
         'lv_LV': u'Latvian / latviešu valoda',
+        'mk_MK': u'Macedonian / македонски јазик',
         'ml_IN': u'Malayalam / മലയാളം',
         'mn_MN': u'Mongolian / монгол',
         'nb_NO': u'Norwegian Bokmål / Norsk bokmål',

From d5ca324cd510a3bb1e77270722c160d07a5d977d Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Mon, 19 May 2014 06:20:39 +0000
Subject: [PATCH 188/225] Launchpad automatic translations update.

---
 openerp/addons/base/i18n/nb.po | 66 +++++++++++++++++++++++-----------
 openerp/addons/base/i18n/vi.po | 34 +++++++++++++++---
 2 files changed, 75 insertions(+), 25 deletions(-)

diff --git a/openerp/addons/base/i18n/nb.po b/openerp/addons/base/i18n/nb.po
index 6cfd6b705e3..042f072756b 100644
--- a/openerp/addons/base/i18n/nb.po
+++ b/openerp/addons/base/i18n/nb.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:35+0000\n"
-"PO-Revision-Date: 2014-05-16 12:16+0000\n"
+"PO-Revision-Date: 2014-05-18 20:42+0000\n"
 "Last-Translator: Kenneth Aalberg <kenneaal@gmail.com>\n"
 "Language-Team: Norwegian Bokmal <nb@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: 2014-05-17 07:10+0000\n"
+"X-Launchpad-Export-Date: 2014-05-19 06:20+0000\n"
 "X-Generator: Launchpad (build 17007)\n"
 
 #. module: base
@@ -9597,12 +9597,16 @@ msgid ""
 "sure to save and close all forms before switching to a different company. "
 "(You can click on Cancel in the User Preferences now)"
 msgstr ""
+"Husk at dokumenter som vises her kan hende ikke er relevante etter at du "
+"bytter til et annet firma. Hvis du har endringer som ikke er lagret, bør du "
+"lagre og lukke alle skjemaer før du skifter til et annet firma. (Du kan "
+"klikke kanseller i brukerpreferanser nå)"
 
 #. module: base
 #: code:addons/orm.py:2818
 #, python-format
 msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
-msgstr ""
+msgstr "Verdien \"%s\" for feltet \"%s.%s\" er ikke i utvalget"
 
 #. module: base
 #: view:ir.actions.configuration.wizard:0
@@ -9612,7 +9616,7 @@ msgstr "Fortsett"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Thai / ภาษาไทย"
-msgstr ""
+msgstr "Thai / ภาษาไทย"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_bo
@@ -9638,7 +9642,7 @@ msgstr "Slovensk / slovenščina"
 #. module: base
 #: field:res.currency,position:0
 msgid "Symbol Position"
-msgstr ""
+msgstr "Symbolposisjon"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_de
@@ -9672,11 +9676,14 @@ msgid ""
 "\n"
 "(Document type: %s)"
 msgstr ""
+"For denne dokumenttypen kan du bare aksessere poster du selv har laget.\n"
+"\n"
+"(Dokumenttype: %s)"
 
 #. module: base
 #: view:base.language.export:0
 msgid "documentation"
-msgstr ""
+msgstr "dokumentasjon"
 
 #. module: base
 #: help:ir.model,osv_memory:0
@@ -9684,17 +9691,19 @@ msgid ""
 "This field specifies whether the model is transient or not (i.e. if records "
 "are automatically deleted from the database or not)"
 msgstr ""
+"Dette feltet spesifiserer om modellen er transient eller ikke (dvs, om "
+"poster automatisk blir slettet fra databasen eller ikke)"
 
 #. module: base
 #: code:addons/base/ir/ir_mail_server.py:445
 #, python-format
 msgid "Missing SMTP Server"
-msgstr ""
+msgstr "Mangler SMTP server"
 
 #. module: base
 #: sql_constraint:ir.translation:0
 msgid "Language code of translation item must be among known languages"
-msgstr ""
+msgstr "Språkkoden for begrepet du oversetter må være et kjent språk"
 
 #. module: base
 #: field:base.language.export,data:0
@@ -9705,7 +9714,7 @@ msgstr "Fil"
 #. module: base
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade_install
 msgid "Module Upgrade Install"
-msgstr ""
+msgstr "Modul Oppgrader Installer"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_configuration_wizard
@@ -9715,18 +9724,18 @@ msgstr "ir.actions.configuration.wizard"
 #. module: base
 #: view:res.lang:0
 msgid "%b - Abbreviated month name."
-msgstr "%b - Navn på måned (forkortet)."
+msgstr "%b - Kort månedsnavn."
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:729
 #, python-format
 msgid "Sorry, you are not allowed to delete this document."
-msgstr ""
+msgstr "Beklager, du har ikke tillatelse til å slette dette dokumentet."
 
 #. module: base
 #: constraint:ir.rule:0
 msgid "Rules can not be applied on the Record Rules model."
-msgstr ""
+msgstr "Regler kan ikke brukes på regelmodellen for poster"
 
 #. module: base
 #: field:res.partner,supplier:0
@@ -9743,7 +9752,7 @@ msgstr "Flerhandlinger"
 #. module: base
 #: model:ir.module.module,summary:base.module_mail
 msgid "Discussions, Mailing Lists, News"
-msgstr ""
+msgstr "Diskusjoner, epostdistribusjonslister og nyheter"
 
 #. module: base
 #: model:ir.module.module,description:base.module_fleet
@@ -9765,6 +9774,21 @@ msgid ""
 "* Show all costs associated to a vehicle or to a type of service\n"
 "* Analysis graph for costs\n"
 msgstr ""
+"\n"
+"Kjøretøy, leasing, forsikring, kostnader\n"
+"====================================\n"
+"Med denne modulen lar OpenERP deg administrere alle dine kjøretøy,\n"
+"kontakter som benytter disse, så vel som servicer, kjørebok, kostnader og\n"
+"mange andre funksjoner som er nyttig for flåtekontroll.\n"
+"\n"
+"Hovedfunksjoner\n"
+"------------\n"
+"* Legg til kjøretøy til din flåte\n"
+"* Håndtere kontakter for kjøretøy\n"
+"* Påminnelse når kontrakter når utløpsdato\n"
+"* Legg til servicer, kjørebok og odometer for alle kjøretøy\n"
+"* Vise alle kostnader assosiert med et kjøretøy eller type service\n"
+"* Analytisk graf for kostnader\n"
 
 #. module: base
 #: field:multi_company.default,company_dest_id:0
@@ -9774,12 +9798,12 @@ msgstr "Standard firma"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (EC) / Español (EC)"
-msgstr "Spanish (EC) / Español (EC)"
+msgstr "Spansk (EC) / Español (EC)"
 
 #. module: base
 #: help:ir.ui.view,xml_id:0
 msgid "ID of the view defined in xml file"
-msgstr ""
+msgstr "ID til visningen definert i XML filen"
 
 #. module: base
 #: model:ir.model,name:base.model_base_module_import
@@ -9794,28 +9818,28 @@ msgstr "Amerikansk Samoa"
 #. module: base
 #: view:ir.attachment:0
 msgid "My Document(s)"
-msgstr ""
+msgstr "Mine dokumenter"
 
 #. module: base
 #: help:ir.actions.act_window,res_model:0
 msgid "Model name of the object to open in the view window"
-msgstr ""
+msgstr "Modellnavn til objektet for åpning i visningsvinduet"
 
 #. module: base
 #: field:ir.model.fields,selectable:0
 msgid "Selectable"
-msgstr "Valgbar"
+msgstr "Velgbar"
 
 #. module: base
 #: code:addons/base/ir/ir_mail_server.py:222
 #, python-format
 msgid "Everything seems properly set up!"
-msgstr ""
+msgstr "Alt ser ut til å være satt opp korrekt!"
 
 #. module: base
 #: view:res.request.link:0
 msgid "Request Link"
-msgstr "res.request.link"
+msgstr "Be om lenke"
 
 #. module: base
 #: view:ir.attachment:0
@@ -9839,7 +9863,7 @@ msgstr "Iterasjon"
 #: code:addons/orm.py:4347
 #, python-format
 msgid "UserError"
-msgstr "BrukerFeil"
+msgstr "Brukerfeil"
 
 #. module: base
 #: model:ir.module.module,summary:base.module_project_issue
diff --git a/openerp/addons/base/i18n/vi.po b/openerp/addons/base/i18n/vi.po
index 97cf0dad81d..08e961c7c99 100644
--- a/openerp/addons/base/i18n/vi.po
+++ b/openerp/addons/base/i18n/vi.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:35+0000\n"
-"PO-Revision-Date: 2013-07-04 05:49+0000\n"
-"Last-Translator: Hung Tran <vanda6688@yahoo.com>\n"
+"PO-Revision-Date: 2014-05-18 08:52+0000\n"
+"Last-Translator: Mai Đăng Thành <Unknown>\n"
 "Language-Team: Vietnamese <vi@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: 2014-04-30 06:56+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-05-19 06:20+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -131,6 +131,17 @@ msgid ""
 "    * Product Attributes\n"
 "    "
 msgstr ""
+"\n"
+"Chức năng thêm nhà các sản xuất và các thuộc tính của sản phẩm\n"
+"====================================================================\n"
+"\n"
+"Bạn có thể thêm các thông tin sau cho sản phẩm:\n"
+"-----------------------------------------------\n"
+"    * Nhà sản xuất\n"
+"    * Tên sản phẩm (Nhà sản xuất)\n"
+"    * Mã sản phẩm (Nhà sản xuất)\n"
+"    * Các thuộc tính sản phẩm\n"
+"    "
 
 #. module: base
 #: field:ir.actions.client,params:0
@@ -203,6 +214,14 @@ msgid ""
 "revenue\n"
 "reports."
 msgstr ""
+"\n"
+"Tạo hóa đơn từ Chi phí, Bảng chấm công\n"
+"========================================================\n"
+"\n"
+"Chức năng tạo hóa đơn dựa trên chi phí (nhân lực, chi phí, ...).\n"
+"\n"
+"Bạn có thể định nghĩa bảng giá trong tài khoản phân tích, tạo báo cáo \n"
+"doanh thu lý thuyết."
 
 #. module: base
 #: code:addons/base/ir/ir_sequence.py:134
@@ -379,6 +398,7 @@ msgid ""
 "The internal user that is in charge of communicating with this contact if "
 "any."
 msgstr ""
+"Người sử dụng nội bộ có trách nhiệm giao tiếp với các đối tác này nếu có."
 
 #. module: base
 #: view:res.partner:0
@@ -417,6 +437,12 @@ msgid ""
 "  - tree_but_open\n"
 "For defaults, an optional condition"
 msgstr ""
+"Những tác vụ sau được phép: \n"
+"  - client_action_multi\n"
+"  - client_print_multi\n"
+"  - client_action_relate\n"
+"  - tree_but_open\n"
+"Mặc định, một tùy chọn sẽ bắt buộc"
 
 #. module: base
 #: sql_constraint:res.lang:0

From 5a15b58a3bfde4e0c629216e4745d6ca7b162ba0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 19 May 2014 11:14:30 +0200
Subject: [PATCH 189/225] [FIX] website_blog: order archives by date desc

---
 addons/website_blog/controllers/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_blog/controllers/main.py b/addons/website_blog/controllers/main.py
index 133a95d0c8a..04cb84eafef 100644
--- a/addons/website_blog/controllers/main.py
+++ b/addons/website_blog/controllers/main.py
@@ -51,7 +51,7 @@ class WebsiteBlog(http.Controller):
         blog_post_obj = request.registry['blog.post']
         groups = blog_post_obj.read_group(
             request.cr, request.uid, [], ['name', 'create_date'],
-            groupby="create_date", orderby="create_date asc", context=request.context)
+            groupby="create_date", orderby="create_date desc", context=request.context)
         for group in groups:
             begin_date = datetime.datetime.strptime(group['__domain'][0][2], tools.DEFAULT_SERVER_DATETIME_FORMAT).date()
             end_date = datetime.datetime.strptime(group['__domain'][1][2], tools.DEFAULT_SERVER_DATETIME_FORMAT).date()

From 571e23f3d56c0ff34ef9182de0b1736d4e2f23a9 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Mon, 19 May 2014 12:30:20 +0200
Subject: [PATCH 190/225] [FIX] marketing_campaign: server actions always
 return None or False, and the return value of method _process_wi_action
 should return True whatever what the server action returns

If the server actions returned None instead of False, the next activity was not triggered, while it should
---
 addons/marketing_campaign/marketing_campaign.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py
index d4b05c50127..6a3c4de7f49 100644
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -494,11 +494,9 @@ class marketing_campaign_activity(osv.osv):
                               active_ids=[workitem.res_id],
                               active_model=workitem.object_id.model,
                               workitem=workitem)
-        res = server_obj.run(cr, uid, [activity.server_action_id.id],
+        server_obj.run(cr, uid, [activity.server_action_id.id],
                              context=action_context)
-        # server action return False if the action is performed
-        # except client_action, other and python code
-        return res == False and True or res
+        return True
 
     def process(self, cr, uid, act_id, wi_id, context=None):
         activity = self.browse(cr, uid, act_id, context=context)

From 2df2da65147182cd6190e39d956af4abdbefe12f Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 19 May 2014 12:33:47 +0200
Subject: [PATCH 191/225] [FIX] properly set website_multilang attribute

---
 addons/website/models/ir_http.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website/models/ir_http.py b/addons/website/models/ir_http.py
index 76f6764c427..3d9ad74c7e9 100644
--- a/addons/website/models/ir_http.py
+++ b/addons/website/models/ir_http.py
@@ -51,7 +51,7 @@ class ir_http(orm.AbstractModel):
             # in all cases, website processes them
             request.website_enabled = True
 
-        request.website_multilang = request.website_enabled and func.routing.get('multilang', True)
+        request.website_multilang = request.website_enabled and func and func.routing.get('multilang', True)
 
         if request.website_enabled:
             if func:

From e7ea924697d244dd1d94855693caaa50882e7d3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 19 May 2014 13:50:51 +0200
Subject: [PATCH 192/225] [FIX] website_forum: do not display closed of
 offensive questions in searches. Users can still go on the question using
 their direct link.

---
 addons/website_forum/controllers/main.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/website_forum/controllers/main.py b/addons/website_forum/controllers/main.py
index 69a420be320..cb9a79edb27 100644
--- a/addons/website_forum/controllers/main.py
+++ b/addons/website_forum/controllers/main.py
@@ -96,7 +96,7 @@ class WebsiteForum(http.Controller):
         Post = request.registry['forum.post']
         user = request.registry['res.users'].browse(cr, uid, uid, context=context)
 
-        domain = [('forum_id', '=', forum.id), ('parent_id', '=', False)]
+        domain = [('forum_id', '=', forum.id), ('parent_id', '=', False), ('state', '=', 'active')]
         if search:
             domain += ['|', ('name', 'ilike', search), ('content', 'ilike', search)]
         if tag:
@@ -123,7 +123,7 @@ class WebsiteForum(http.Controller):
             url = "/forum/%s/%s/questions" % (slug(forum), slug(tag))
         else:
             url = "/forum/%s" % slug(forum)
-        
+
         url_args = {}
         if search:
             url_args['search'] = search

From 42d8a90afd38f1bb0ed5b527e73321256ee702d7 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 19 May 2014 13:59:38 +0200
Subject: [PATCH 193/225] [IMP] minor changes to sitemap

---
 addons/website/controllers/main.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py
index df958d969dd..460f64147e8 100644
--- a/addons/website/controllers/main.py
+++ b/addons/website/controllers/main.py
@@ -21,7 +21,7 @@ logger = logging.getLogger(__name__)
 # Completely arbitrary limits
 MAX_IMAGE_WIDTH, MAX_IMAGE_HEIGHT = IMAGE_LIMITS = (1024, 768)
 LOC_PER_SITEMAP = 45000
-SITEMAP_CACHE_TIME = datetime.timedelta(hours=6)
+SITEMAP_CACHE_TIME = datetime.timedelta(hours=12)
 
 class Website(openerp.addons.web.controllers.main.Home):
     #------------------------------------------------------
@@ -76,7 +76,7 @@ class Website(openerp.addons.web.controllers.main.Home):
         mimetype ='application/xml;charset=utf-8'
         content = None
 
-        def create_map(url, content):
+        def create_sitemap(url, content):
             ira.create(cr, uid, dict(
                 datas=content.encode('base64'),
                 mimetype=mimetype,
@@ -112,7 +112,7 @@ class Website(openerp.addons.web.controllers.main.Home):
                     if not first_page:
                         first_page = page
                     pages += 1
-                    create_map('/sitemap-%d.xml' % pages, page)
+                    create_sitemap('/sitemap-%d.xml' % pages, page)
                 else:
                     break
             if not pages:
@@ -125,7 +125,7 @@ class Website(openerp.addons.web.controllers.main.Home):
                     pages=range(1, pages + 1),
                     url_root=request.httprequest.url_root,
                 ), context=context)
-            create_map('/sitemap.xml', content)
+            create_sitemap('/sitemap.xml', content)
 
         return request.make_response(content, [('Content-Type', mimetype)])
 

From cef51e2a507f20dd69e66841650f93603aaaeb01 Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert <csn@openerp.com>
Date: Mon, 19 May 2014 14:01:47 +0200
Subject: [PATCH 194/225] [FIX]modal: in some particular case, we have 2
 actions opening modal one after another, fix problem in those case where
 second modal was close instead of first one

---
 addons/web/static/src/js/chrome.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index f611d5bd502..19962029b9d 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -218,9 +218,13 @@ instance.web.Dialog = instance.web.Widget.extend({
             //we need this to put the instruction to remove modal from DOM at the end
             //of the queue, otherwise it might already have been removed before the modal-backdrop
             //is removed when pressing escape key
+            var $element = this.$dialog_box;
             setTimeout(function () {
-                //remove last modal from list of opened modal since we just destroy it
-                opened_modal.pop().remove();
+                //remove modal from list of opened modal since we just destroy it
+                var modal_list_index = $.inArray($element, opened_modal);
+                if (modal_list_index > -1){
+                    opened_modal.splice(modal_list_index,1)[0].remove();
+                }
                 if (opened_modal.length > 0){
                     //we still have other opened modal so we should focus it
                     opened_modal[opened_modal.length-1].focus();

From 3b859c219fde88c7625ac400fcf948f409460b23 Mon Sep 17 00:00:00 2001
From: Vicente Jimenez Aguilar <googuy@gmail.com>
Date: Mon, 19 May 2014 14:04:01 +0200
Subject: [PATCH 195/225] Default event track is half hour not 30 hours

This is a leftover from revision 9304
where the duration property of events changed unit
from minutes to hours but the defualt value remained 30.
---
 addons/website_event_track/controllers/event.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_event_track/controllers/event.py b/addons/website_event_track/controllers/event.py
index 4a3d814960e..64df05e4791 100644
--- a/addons/website_event_track/controllers/event.py
+++ b/addons/website_event_track/controllers/event.py
@@ -50,7 +50,7 @@ class website_event(http.Controller):
         forcetr = True
         for track in event_track_ids:
             start_date = (datetime.datetime.strptime(track.date, '%Y-%m-%d %H:%M:%S')).replace(tzinfo=pytz.utc).astimezone(local_tz)
-            end_date = start_date + datetime.timedelta(hours = (track.duration or 30))
+            end_date = start_date + datetime.timedelta(hours = (track.duration or 0.5))
             location = track.location_id or False
             locations.setdefault(location, [])
 

From 428e292300b9f1929182d5a5414fb54aecc9a8d7 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (Open ERP)" <dhr@tinyerp.com>
Date: Mon, 19 May 2014 17:39:24 +0530
Subject: [PATCH 196/225] [IMP]Improved as per the comment

---
 addons/audittrail/audittrail.py | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/addons/audittrail/audittrail.py b/addons/audittrail/audittrail.py
index 3dcc72679a8..64e6b5b58dd 100644
--- a/addons/audittrail/audittrail.py
+++ b/addons/audittrail/audittrail.py
@@ -425,11 +425,6 @@ class audittrail_objects_proxy(object_proxy):
                             res_ids.remove(resource_id)
                     for res_id in res_ids:
                         lines.update(self.prepare_audittrail_log_line(cr, SUPERUSER_ID, pool, x2m_model, res_id, method, old_values, new_values, field_list))
-            data={
-                    'name': field_name,
-                    'old_value': key in old_values and old_values[key]['value'].get(field_name),
-                    'old_value_text': key in old_values and old_values[key]['text'].get(field_name)
-                  }
             # if the value value is different than the old value: record the change
             if key not in old_values or key not in new_values or old_values[key]['value'][field_name] != new_values[key]['value'][field_name]:
                 data = {
@@ -439,7 +434,15 @@ class audittrail_objects_proxy(object_proxy):
                       'new_value_text': key in new_values and new_values[key]['text'].get(field_name),
                       'old_value_text': key in old_values and old_values[key]['text'].get(field_name)
                 }
-            lines[key].append(data)
+                lines[key].append(data)
+             # On read log add current values for fields.
+            if method == 'read':
+                data={
+                    'name': field_name,
+                    'old_value': key in old_values and old_values[key]['value'].get(field_name),
+                    'old_value_text': key in old_values and old_values[key]['text'].get(field_name)
+                }
+                lines[key].append(data)
         return lines
 
     def process_data(self, cr, uid, pool, res_ids, model, method, old_values=None, new_values=None, field_list=None):

From 08285450908168d39f0de0d38d7055ee830732ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 19 May 2014 14:40:24 +0200
Subject: [PATCH 197/225] [IMP] website_forum: display only the 100 last
 activities + order by date desc

---
 addons/website_forum/controllers/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_forum/controllers/main.py b/addons/website_forum/controllers/main.py
index cb9a79edb27..23a7b9ad538 100644
--- a/addons/website_forum/controllers/main.py
+++ b/addons/website_forum/controllers/main.py
@@ -535,7 +535,7 @@ class WebsiteForum(http.Controller):
 
         #activity by user.
         model, comment = Data.get_object_reference(cr, uid, 'mail', 'mt_comment')
-        activity_ids = Activity.search(cr, uid, [('res_id', 'in', user_post_ids), ('model', '=', 'forum.post'), ('subtype_id', '!=', comment)], context=context)
+        activity_ids = Activity.search(cr, uid, [('res_id', 'in', user_post_ids), ('model', '=', 'forum.post'), ('subtype_id', '!=', comment)], order='date DESC', limit=100, context=context)
         activities = Activity.browse(cr, uid, activity_ids, context=context)
 
         posts = {}

From 844cf8d5657c60288f98238de0d30b98b5634685 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 19 May 2014 14:40:55 +0200
Subject: [PATCH 198/225] [FIX] website_forum: fixed crash when displaying a
 closed question for public users; indeed partner data was displayed without
 using the contact widget.

---
 addons/website_forum/views/website_forum.xml | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml
index 66b13026335..0f132c48420 100644
--- a/addons/website_forum/views/website_forum.xml
+++ b/addons/website_forum/views/website_forum.xml
@@ -434,16 +434,18 @@
                     <span t-if="not question.active"><b> [Deleted]</b></span>
                     <span t-if="question.state == 'close'"><b> [Closed]</b></span>
                 </h1>
-                <div class="alert alert-info" t-if="question.state == 'close'">
-                    <p class="mt32 mb16 text-center">
-                        <b>The question has been closed for reason: <i t-esc="question.closed_reason_id.name"/>
-                        <br/>
-                        <t t-if="question.closed_uid">
-                            <i>by <a t-attf-href="/forum/#{ slug(forum) }/user/#{ slug(question.closed_uid) }" t-field="question.closed_uid"/> </i>
-                        </t>
-                        on <span t-field="question.closed_date"/></b>
+                <div class="alert alert-info text-center" t-if="question.state == 'close'">
+                    <p class="mt16">
+                        <b>The question has been closed for reason: <i t-esc="question.closed_reason_id.name"/></b>
                     </p>
-                    <div t-if="question.state == 'close' and user.karma&gt;=500" class="mb24 text-center">
+                    <t t-if="question.closed_uid">
+                        <b>by <a t-attf-href="/forum/#{ slug(forum) }/user/#{ question.closed_uid.id }"
+                            t-field="question.closed_uid"
+                            t-field-options='{"widget": "contact", "fields": ["name"]}'
+                            style="display: inline-block;"/></b>
+                    </t>
+                    <b>on <span t-field="question.closed_date"/></b>
+                    <div t-if="question.state == 'close' and user.karma&gt;=500" class="mt16 mb24 text-center">
                         <t t-call="website_forum.link_button">
                             <t t-set="url" t-value="'/forum/' + slug(forum) + '/question/' + slug(question) + '/reopen'"/>
                             <t t-set="label" t-value="'Reopen'"/>

From a8a085eabbc477989676f7262da59e2f30952e4e Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Mon, 19 May 2014 15:33:39 +0200
Subject: [PATCH 199/225] [FIX] point_of_sale: opw-607551, mark the pos order
 as paid before trying to create the picking, so in case the picking could not
 be created for one reason or another, the pos order workflow process
 continue.

This commit partially reverts rev. 6036 revid:fp@tinyerp.com-20111219220053-tn5gc1lmc13fjpyf, the second part of this commit already has been revert in a previous revision.
---
 addons/point_of_sale/point_of_sale.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index 76c48d24f80..2768cf8aa44 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -537,7 +537,7 @@ class pos_order(osv.osv):
             try:
                 wf_service.trg_validate(uid, 'pos.order', order_id, 'paid', cr)
             except Exception:
-                _logger.error('ERROR: Could not mark POS Order as Paid.', exc_info=True)
+                _logger.error('ERROR: Could not fully process the POS Order', exc_info=True)
         return order_ids
 
     def write(self, cr, uid, ids, vals, context=None):
@@ -692,8 +692,6 @@ class pos_order(osv.osv):
         move_obj = self.pool.get('stock.move')
 
         for order in self.browse(cr, uid, ids, context=context):
-            if not order.state=='draft':
-                continue
             addr = order.partner_id and partner_obj.address_get(cr, uid, [order.partner_id.id], ['delivery']) or {}
             picking_id = picking_obj.create(cr, uid, {
                 'origin': order.name,
@@ -1136,8 +1134,8 @@ class pos_order(osv.osv):
         return self.write(cr, uid, ids, {'state': 'payment'}, context=context)
 
     def action_paid(self, cr, uid, ids, context=None):
-        self.create_picking(cr, uid, ids, context=context)
         self.write(cr, uid, ids, {'state': 'paid'}, context=context)
+        self.create_picking(cr, uid, ids, context=context)
         return True
 
     def action_cancel(self, cr, uid, ids, context=None):

From 4837952ad411b135b711dbb0934874f7b0ea2d3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 19 May 2014 16:40:50 +0200
Subject: [PATCH 200/225] [FIX] website_crm_partner_assign: fixed crash when
 having partners to display on resellers page that do not have country_id set,
 leading to some values not being present in the countries variable holding
 data about partner localisation.

---
 addons/website_crm_partner_assign/controllers/main.py           | 2 +-
 .../views/website_crm_partner_assign.xml                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/website_crm_partner_assign/controllers/main.py b/addons/website_crm_partner_assign/controllers/main.py
index 3dd96798d09..3c9efb00b7a 100644
--- a/addons/website_crm_partner_assign/controllers/main.py
+++ b/addons/website_crm_partner_assign/controllers/main.py
@@ -65,7 +65,7 @@ class WebsiteCrmPartnerAssign(http.Controller):
             context=request.context, count=True)
         # flag active country
         for country_dict in countries:
-            country_dict['active'] = country and country_dict['country_id'][0] == country.id
+            country_dict['active'] = country and country_dict['country_id'] and country_dict['country_id'][0] == country.id
         countries.insert(0, {
             'country_id_count': countries_partners,
             'country_id': (0, _("All Countries")),
diff --git a/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
index b215a14e6cb..ed77acdcb95 100644
--- a/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
+++ b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
@@ -53,7 +53,7 @@
                 <ul id="reseller_countries" class="nav nav-pills nav-stacked mt16">
                     <li class="nav-header"><h3>Filter by Country</h3></li>
                     <t t-foreach="countries" t-as="country">
-                        <li t-att-class="country['active'] and 'active' or ''">
+                        <li t-if="country['country_id']" t-att-class="country['active'] and 'active' or ''">
                             <a t-attf-href="/partners/#{ current_grade and 'grade/%s/' % slug(current_grade) or ''}#{country['country_id'][0] and 'country/%s/' % country['country_id'][0] or '' }#{ search_path }">
                                 <span class="badge pull-right" t-esc="country['country_id_count'] or ''"/>
                                 <t t-esc="country['country_id'][1]"/> 

From f5368a1badd0ebddc6d0a174cdfd0d0184cf723f Mon Sep 17 00:00:00 2001
From: "Richard Mathot (OpenERP)" <rim@openerp.com>
Date: Mon, 19 May 2014 17:37:00 +0200
Subject: [PATCH 201/225] [FIX] ir_qweb: Duration widget now displays something

---
 openerp/addons/base/ir/ir_qweb.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/openerp/addons/base/ir/ir_qweb.py b/openerp/addons/base/ir/ir_qweb.py
index 5163730ce00..a0c6c5a6471 100644
--- a/openerp/addons/base/ir/ir_qweb.py
+++ b/openerp/addons/base/ir/ir_qweb.py
@@ -801,7 +801,8 @@ class DurationConverter(osv.AbstractModel):
                 v*secs_per_unit, threshold=1, locale=locale)
             if section:
                 sections.append(section)
-        return u' '.join(sections)
+        return ' '.join(sections)
+
 
 class RelativeDatetimeConverter(osv.AbstractModel):
     _name = 'ir.qweb.field.relative'

From be99dbf16a337c0b8093ac6e5e075e4f1a315add Mon Sep 17 00:00:00 2001
From: "Richard Mathot (OpenERP)" <rim@openerp.com>
Date: Mon, 19 May 2014 17:41:50 +0200
Subject: [PATCH 202/225] [FIX] website_event_track: human-readable display of
 track durations

---
 addons/website_event_track/views/website_event.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_event_track/views/website_event.xml b/addons/website_event_track/views/website_event.xml
index 3bfe4f0d742..45531ef73b0 100644
--- a/addons/website_event_track/views/website_event.xml
+++ b/addons/website_event_track/views/website_event.xml
@@ -224,7 +224,7 @@
                             <b>Date</b><br/>
                             <span t-field="track.date" t-field-options='{"hide_seconds":"True"}'/><br/>
                             <b>Duration</b><br/>
-                            <span t-esc="'%.2f' % (track.duration)"/> hours<br/>
+                            <span t-field="track.duration" t-field-options="{&quot;widget&quot;: &quot;duration&quot;, &quot;unit&quot;: &quot;hour&quot;}"/><br/>
                             <b>Location</b><br/>
                             <span t-field="track.location_id"/><br/>
                         </div>

From 4dbaa116ee2b8f7986f17c7e12fb2afb8f86435d Mon Sep 17 00:00:00 2001
From: Antoine Perdaens <a.perdaens@knowledgeplaza.net>
Date: Mon, 19 May 2014 17:44:51 +0200
Subject: [PATCH 203/225] [FIX] account_analytic_analysis: recurring invoices

Properly support yearly recurring invoices
---
 addons/account_analytic_analysis/account_analytic_analysis.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index 6c71f940e8a..c43e978e590 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -746,8 +746,10 @@ class account_analytic_account(osv.osv):
                     new_date = next_date+relativedelta(days=+interval)
                 elif contract.recurring_rule_type == 'weekly':
                     new_date = next_date+relativedelta(weeks=+interval)
-                else:
+                elif contract.recurring_rule_type == 'monthly':
                     new_date = next_date+relativedelta(months=+interval)
+                else:
+                    new_date = next_date+relativedelta(years=+interval)
                 self.write(cr, uid, [contract.id], {'recurring_next_date': new_date.strftime('%Y-%m-%d')}, context=context)
                 if automatic:
                     cr.commit()

From 066fb143260858ca49091c41d3b0062a12f8e55a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 19 May 2014 18:12:41 +0200
Subject: [PATCH 204/225] [FIX] orm: unlink: when unlinking a record, trigger
 the computing of function fields for other records in the same model.
 Previously all function fields in the current model were not computed for
 some reason not provided by the history.

We therefore compute effective store_ids on which the various trigerred
function fields will be computed again. Those ids are the ids given
in the store_get storage variable minus the deleted ones.
---
 openerp/osv/orm.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index ac9e67b7876..2341b92e169 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -4067,9 +4067,13 @@ class BaseModel(object):
                 ir_values_obj.unlink(cr, uid, ir_value_ids, context=context)
 
         for order, object, store_ids, fields in result_store:
-            if object != self._name:
+            if object == self._name:
+                effective_store_ids = list(set(store_ids) - set(ids))
+            else:
+                effective_store_ids = store_ids
+            if effective_store_ids:
                 obj = self.pool.get(object)
-                cr.execute('select id from '+obj._table+' where id IN %s', (tuple(store_ids),))
+                cr.execute('select id from '+obj._table+' where id IN %s', (tuple(effective_store_ids),))
                 rids = map(lambda x: x[0], cr.fetchall())
                 if rids:
                     obj._store_set_values(cr, uid, rids, fields, context)

From f99785e29d43bc41acd40b6e72c4e9aeb6601782 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 19 May 2014 18:15:32 +0200
Subject: [PATCH 205/225] [IMP] ir_qweb: contact widget: handle website info in
 the contact widget.

---
 openerp/addons/base/ir/ir_qweb.py  | 1 +
 openerp/addons/base/ir/ir_qweb.xml | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/openerp/addons/base/ir/ir_qweb.py b/openerp/addons/base/ir/ir_qweb.py
index a0c6c5a6471..940c7844628 100644
--- a/openerp/addons/base/ir/ir_qweb.py
+++ b/openerp/addons/base/ir/ir_qweb.py
@@ -847,6 +847,7 @@ class Contact(orm.AbstractModel):
             'fax': field_browse.fax,
             'city': field_browse.city,
             'country_id': field_browse.country_id and field_browse.country_id.name_get()[0][1],
+            'website': field_browse.website,
             'email': field_browse.email,
             'fields': opf,
             'object': field_browse,
diff --git a/openerp/addons/base/ir/ir_qweb.xml b/openerp/addons/base/ir/ir_qweb.xml
index a21a3fcf2af..d021d496fdc 100644
--- a/openerp/addons/base/ir/ir_qweb.xml
+++ b/openerp/addons/base/ir/ir_qweb.xml
@@ -18,6 +18,10 @@
             <div t-if="phone and 'phone' in fields" class='css_editable_mode_hidden'><i t-if="not options.get('no_marker')" class='fa fa-phone'/> <span itemprop="telephone" t-esc="phone"/></div>
             <div t-if="mobile and 'mobile' in fields" class='css_editable_mode_hidden'><i t-if="not options.get('no_marker')" class='fa fa-mobile-phone'/> <span itemprop="telephone" t-esc="mobile"/></div>
             <div t-if="fax and 'fax' in fields" class='css_editable_mode_hidden'><i t-if="not options.get('no_marker')" class='fa fa-file-text-o'/> <span itemprop="faxNumber" t-esc="fax"/></div>
+            <div t-if="website and 'website' in fields" class='css_editable_mode_hidden'>
+                <i t-if="not options.get('no_marker')" class='fa fa-globe'/>
+                <a t-att-href="website"><span itemprop="website" t-esc="website"/></a>
+            </div>
             <div t-if="email and 'email' in fields" class='css_editable_mode_hidden'><i t-if="not options.get('no_marker')" class='fa fa-envelope'/> <span itemprop="email" t-esc="email"/></div>
         </div>
     </address>

From eae72dd1c8a7a81cc71f7bddccd5813a2ee6c867 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 19 May 2014 18:16:10 +0200
Subject: [PATCH 206/225] [FIX] website_crm_partner_assign: fixed error of used
 template to display partner references, use the one defined in
 website_crm_partner_assign module.

---
 .../views/website_crm_partner_assign.xml                        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
index ed77acdcb95..b7a87b48f59 100644
--- a/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
+++ b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
@@ -128,7 +128,7 @@
         <t t-set="ref_content">
             <t t-call="website_partner.partner_detail">
                 <t t-set="right_column">
-                    <div id="right_column" class="mb16"><t t-call="website_customer.references_block"/></div>
+                    <div id="right_column" class="mb16"><t t-call="website_crm_partner_assign.references_block"/></div>
                 </t>
             </t>
         </t>

From 1351bf6820f15f96bb38055286a31c962f849348 Mon Sep 17 00:00:00 2001
From: Luis Alvarado <luisalvaradox@gmail.com>
Date: Mon, 19 May 2014 15:00:10 -0600
Subject: [PATCH 207/225] Update README.md

The only grammar problem left.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 45ac7ee4ced..7b3896022f0 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 About Odoo
 ==========
 
-Odoo is suite of open source Business apps. More info at http://www.odoo.com
+Odoo is a suite of open source Business apps. More info at http://www.odoo.com
 
 Installation
 ============

From ffb18d0af39bcf2a5944795de9b8feafc802c244 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <agr@amigrave.com>
Date: Tue, 20 May 2014 10:15:49 +0200
Subject: [PATCH 208/225] Broken @route arguments for events pages

---
 addons/website_event/controllers/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_event/controllers/main.py b/addons/website_event/controllers/main.py
index 9de29335eb7..31436cd0096 100644
--- a/addons/website_event/controllers/main.py
+++ b/addons/website_event/controllers/main.py
@@ -170,7 +170,7 @@ class website_event(http.Controller):
 
         return request.website.render("website_event.index", values)
 
-    @http.route(['/event/<model("event.event"):event>/page/<page:path>'], type='http', auth="public", website=True, multilang=True)
+    @http.route(['/event/<model("event.event"):event>/page/<path:page>'], type='http', auth="public", website=True, multilang=True)
     def event_page(self, event, page, **post):
         values = {
             'event': event,

From d88ecfa970fbd66507180ec3e8a970ca8c0613be Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 20 May 2014 10:16:17 +0200
Subject: [PATCH 209/225] [FIX] sale: in paypal, the encoding of the url should
 be done with werkzeug instead of urllib for better handeling of unicode (opw
 607866)

---
 addons/account/edi/invoice.py | 4 ++--
 addons/sale/edi/sale_order.py | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/account/edi/invoice.py b/addons/account/edi/invoice.py
index 2c2a754de3b..c82d041ef85 100644
--- a/addons/account/edi/invoice.py
+++ b/addons/account/edi/invoice.py
@@ -21,7 +21,7 @@
 from openerp.osv import osv, fields
 from openerp.addons.edi import EDIMixin
 
-from urllib import urlencode
+from werkzeug import url_encode
 
 INVOICE_LINE_EDI_STRUCT = {
     'name': True,
@@ -274,7 +274,7 @@ class account_invoice(osv.osv, EDIMixin):
                     "no_note": "1",
                     "bn": "OpenERP_Invoice_PayNow_" + inv.currency_id.name,
                 }
-                res[inv.id] = "https://www.paypal.com/cgi-bin/webscr?" + urlencode(params)
+                res[inv.id] = "https://www.paypal.com/cgi-bin/webscr?" + url_encode(params)
         return res
 
     _columns = {
diff --git a/addons/sale/edi/sale_order.py b/addons/sale/edi/sale_order.py
index bf015b3cdfc..cd1b18ef9b5 100644
--- a/addons/sale/edi/sale_order.py
+++ b/addons/sale/edi/sale_order.py
@@ -22,7 +22,7 @@ from openerp.osv import osv, fields
 from openerp.addons.edi import EDIMixin
 from openerp.tools.translate import _
 
-from urllib import urlencode
+from werkzeug import url_encode
 
 SALE_ORDER_LINE_EDI_STRUCT = {
     'sequence': True,
@@ -197,7 +197,7 @@ class sale_order(osv.osv, EDIMixin):
                     "no_note": "1",
                     "bn": "OpenERP_Order_PayNow_" + order.pricelist_id.currency_id.name,
                 }
-                res[order.id] = "https://www.paypal.com/cgi-bin/webscr?" + urlencode(params)
+                res[order.id] = "https://www.paypal.com/cgi-bin/webscr?" + url_encode(params)
         return res
 
     _columns = {

From c97d0ccf8fea8f66a8b3f5a730dc72dc716daff6 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 20 May 2014 10:24:01 +0200
Subject: [PATCH 210/225] [FIX] website_forum: allow users to save their edited
 bio

---
 addons/website_forum/models/res_users.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/addons/website_forum/models/res_users.py b/addons/website_forum/models/res_users.py
index a9f2dfe0e93..5d05f1f3bf3 100644
--- a/addons/website_forum/models/res_users.py
+++ b/addons/website_forum/models/res_users.py
@@ -2,10 +2,16 @@
 
 from openerp.osv import osv, fields
 
-
 class Users(osv.Model):
     _inherit = 'res.users'
 
+    def __init__(self, pool, cr):
+        init_res = super(Users, self).__init__(pool, cr) 
+        self.SELF_WRITEABLE_FIELDS = list(set(
+                self.SELF_WRITEABLE_FIELDS + \
+                ['country_id', 'city', 'website', 'website_description']))
+        return init_res
+
     def _get_user_badge_level(self, cr, uid, ids, name, args, context=None):
         """Return total badge per level of users"""
         result = dict.fromkeys(ids, False)

From c1a0d234226fb80ba186a7836006613e083432d5 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 20 May 2014 10:24:33 +0200
Subject: [PATCH 211/225] [FIX] website_forum: country_id is an integer field

---
 addons/website_forum/controllers/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_forum/controllers/main.py b/addons/website_forum/controllers/main.py
index 23a7b9ad538..f196909b065 100644
--- a/addons/website_forum/controllers/main.py
+++ b/addons/website_forum/controllers/main.py
@@ -585,7 +585,7 @@ class WebsiteForum(http.Controller):
             'website': kwargs.get('website'),
             'email': kwargs.get('email'),
             'city': kwargs.get('city'),
-            'country_id': kwargs.get('country'),
+            'country_id': int(kwargs.get('country')),
             'website_description': kwargs.get('description'),
         }, context=request.context)
         return werkzeug.utils.redirect("/forum/%s/user/%d" % (slug(forum), user.id))

From 59bfda8efd22a26620910caeb4b03eb08b403eeb Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 20 May 2014 10:25:39 +0200
Subject: [PATCH 212/225] Slug redirects loses query_string

---
 addons/website/models/ir_http.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/website/models/ir_http.py b/addons/website/models/ir_http.py
index 358f105b0d0..d2b5c437ea6 100644
--- a/addons/website/models/ir_http.py
+++ b/addons/website/models/ir_http.py
@@ -106,6 +106,8 @@ class ir_http(orm.AbstractModel):
             if generated_path != current_path:
                 if request.lang != request.website.default_lang_code:
                     path = '/' + request.lang + path
+                if request.httprequest.query_string:
+                    path += '?' + request.httprequest.query_string
                 return werkzeug.utils.redirect(path)
 
     def _serve_attachment(self):

From 9cd8ec98bc2a6287f1c0d0021a559c71e3cc1dff Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 20 May 2014 12:02:46 +0200
Subject: [PATCH 213/225] Automatic @auth='user' redirection for unlogged users

opt out with query parameter ?noredirect=1
---
 openerp/addons/base/ir/ir_http.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/ir/ir_http.py b/openerp/addons/base/ir/ir_http.py
index 258d405deb5..ac3091e33b9 100644
--- a/openerp/addons/base/ir/ir_http.py
+++ b/openerp/addons/base/ir/ir_http.py
@@ -5,8 +5,7 @@ import logging
 import re
 import sys
 
-import werkzeug.exceptions
-import werkzeug.routing
+import werkzeug
 
 import openerp
 from openerp import http
@@ -59,6 +58,12 @@ class ir_http(osv.AbstractModel):
     def _auth_method_user(self):
         request.uid = request.session.uid
         if not request.uid:
+            if not request.params.get('noredirect'):
+                query = werkzeug.url_encode({
+                    'redirect': request.httprequest.url,
+                })
+                response = werkzeug.utils.redirect('/web/login?%s' % query)
+                werkzeug.exceptions.abort(response)
             raise http.SessionExpiredException("Session expired")
 
     def _auth_method_none(self):

From 96128a678e9501209fafde56968e5b6b997e69ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 20 May 2014 13:24:18 +0200
Subject: [PATCH 214/225] [IMP] website_crm_partner_assign: use geoip to
 display partners in the visitor's country.

Also added a breadcrumb in partners navigation; when going on the partner view
a link to come back to the list view has been added and takes into account
selected grade and country.
---
 .../controllers/main.py                       | 44 +++++++++++++++++--
 .../views/website_crm_partner_assign.xml      | 16 ++++---
 2 files changed, 51 insertions(+), 9 deletions(-)

diff --git a/addons/website_crm_partner_assign/controllers/main.py b/addons/website_crm_partner_assign/controllers/main.py
index 3c9efb00b7a..faae5593a9b 100644
--- a/addons/website_crm_partner_assign/controllers/main.py
+++ b/addons/website_crm_partner_assign/controllers/main.py
@@ -1,8 +1,15 @@
 # -*- coding: utf-8 -*-
+import logging
 import re
-
 import werkzeug
 
+_logger = logging.getLogger(__name__)
+try:
+    import GeoIP
+except ImportError:
+    GeoIP = None
+    _logger.warn("Please install GeoIP python module to use events localisation.")
+
 from openerp import SUPERUSER_ID
 from openerp.addons.web import http
 from openerp.addons.web.http import request
@@ -13,6 +20,12 @@ from openerp.tools.translate import _
 class WebsiteCrmPartnerAssign(http.Controller):
     _references_per_page = 40
 
+    def _get_current_country_code(self):
+        if not GeoIP:
+            return False
+        GI = GeoIP.open('/usr/share/GeoIP/GeoIP.dat', 0)
+        return GI.country_code_by_addr(request.httprequest.remote_addr)
+
     @http.route([
         '/partners',
         '/partners/page/<int:page>',
@@ -27,7 +40,9 @@ class WebsiteCrmPartnerAssign(http.Controller):
         '/partners/grade/<model("res.partner.grade"):grade>/country/<model("res.country"):country>/page/<int:page>',
     ], type='http', auth="public", website=True, multilang=True)
     def partners(self, country=None, grade=None, page=0, **post):
+        country_all = post.pop('country_all', False)
         partner_obj = request.registry['res.partner']
+        country_obj = request.registry['res.country']
         search = post.get('search', '')
 
         base_partner_domain = [('is_company', '=', True), ('grade_id.website_published', '=', True), ('website_published', '=', True)]
@@ -36,6 +51,12 @@ class WebsiteCrmPartnerAssign(http.Controller):
 
         # group by grade
         grade_domain = list(base_partner_domain)
+        if not country and not country_all:
+            country_code = self._get_current_country_code()
+            if country_code:
+                country_ids = country_obj.search(request.cr, request.uid, [('code', '=', country_code)], context=request.context)
+                if country_ids:
+                    country = country_obj.browse(request.cr, request.uid, country_ids[0], context=request.context)
         if country:
             grade_domain += [('country_id', '=', country.id)]
         grades = partner_obj.read_group(
@@ -118,7 +139,7 @@ class WebsiteCrmPartnerAssign(http.Controller):
             'google_map_partner_ids': google_map_partner_ids,
             'pager': pager,
             'searches': post,
-            'search_path': "?%s" % werkzeug.url_encode(post),
+            'search_path': "%s" % werkzeug.url_encode(post),
         }
         return request.website.render("website_crm_partner_assign.index", values)
 
@@ -126,11 +147,26 @@ class WebsiteCrmPartnerAssign(http.Controller):
     @http.route(['/partners/<partner_id>'], type='http', auth="public", website=True, multilang=True)
     def partners_detail(self, partner_id, partner_name='', **post):
         mo = re.search('-([-0-9]+)$', str(partner_id))
+        current_grade, current_country = None, None
+        grade_id = post.get('grade_id')
+        country_id = post.get('country_id')
+        if grade_id:
+            grade_ids = request.registry['res.partner.grade'].exists(request.cr, request.uid, int(grade_id), context=request.context)
+            if grade_ids:
+                current_grade = request.registry['res.partner.grade'].browse(request.cr, request.uid, grade_ids[0], context=request.context)
+        if country_id:
+            country_ids = request.registry['res.country'].exists(request.cr, request.uid, int(country_id), context=request.context)
+            if country_ids:
+                current_country = request.registry['res.country'].browse(request.cr, request.uid, country_ids[0], context=request.context)
         if mo:
             partner_id = int(mo.group(1))
             partner = request.registry['res.partner'].browse(request.cr, SUPERUSER_ID, partner_id, context=request.context)
             if partner.exists() and partner.website_published:
-                values = {}
-                values['main_object'] = values['partner'] = partner
+                values = {
+                    'main_object': partner,
+                    'partner': partner,
+                    'current_grade': current_grade,
+                    'current_country': current_country
+                }
                 return request.website.render("website_crm_partner_assign.partner", values)
         return self.partners(**post)
diff --git a/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
index b7a87b48f59..6d5b93793ad 100644
--- a/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
+++ b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
@@ -15,7 +15,7 @@
         <t t-set="additional_title">Resellers</t>
         <div id="wrap">
             <div class="oe_structure"/>
-            <div class="container">
+            <div class="container mt16">
                 <div class="row">
                     <t t-raw="ref_content" />
                 </div>
@@ -42,7 +42,7 @@
                     <li class="nav-header"><h3>Filter by Grade</h3></li>
                     <t t-foreach="grades" t-as="grade">
                         <li t-att-class="grade['active'] and 'active' or ''">
-                            <a t-attf-href="/partners/#{ grade['grade_id'][0] and 'grade/%s/' % grade['grade_id'][0] or '' }#{ current_country and 'country/%s/' % slug(current_country) or '' }#{ search_path }">
+                            <a t-attf-href="/partners#{ grade['grade_id'][0] and '/grade/%s' % grade['grade_id'][0] or '' }#{ current_country and '/country/%s' % slug(current_country) or '' }#{ '?' + (search_path or '') }">
                                 <span class="badge pull-right" t-esc="grade['grade_id_count'] or ''"/>
                                 <t t-esc="grade['grade_id'][1]"/> 
                             </a>
@@ -54,7 +54,7 @@
                     <li class="nav-header"><h3>Filter by Country</h3></li>
                     <t t-foreach="countries" t-as="country">
                         <li t-if="country['country_id']" t-att-class="country['active'] and 'active' or ''">
-                            <a t-attf-href="/partners/#{ current_grade and 'grade/%s/' % slug(current_grade) or ''}#{country['country_id'][0] and 'country/%s/' % country['country_id'][0] or '' }#{ search_path }">
+                            <a t-attf-href="/partners#{ current_grade and '/grade/%s' % slug(current_grade) or ''}#{country['country_id'][0] and '/country/%s' % country['country_id'][0] or '' }#{ '?' + (search_path or '') + (country['country_id'][0] == 0 and 'country_all=True' or '')}">
                                 <span class="badge pull-right" t-esc="country['country_id_count'] or ''"/>
                                 <t t-esc="country['country_id'][1]"/> 
                             </a>
@@ -85,12 +85,12 @@
                             <t t-set="last_grade" t-value="partner.grade_id.id"/>
                         </t>
                         <div class="media">
-                            <a class="pull-left" t-attf-href="/partners/#{slug(partner)}"
+                            <a class="pull-left" t-attf-href="/partners/#{slug(partner)}?#{current_grade and 'grade_id=%s&amp;' % current_grade.id}#{current_country and 'country_id=%s' % current_country.id}"
                                t-field="partner.image_small"
                                t-field-options='{"widget": "image", "class": "media-object"}'
                             ></a>
                             <div class="media-body o_partner_body" style="min-height: 64px;">
-                                <a class="media-heading" t-attf-href="/partners/#{slug(partner)}">
+                                <a class="media-heading" t-attf-href="/partners/#{slug(partner)}?#{current_grade and 'grade_id=%s&amp;' % current_grade.id}#{current_country and 'country_id=%s' % current_country.id}">
                                     <span t-field="partner.display_name"/>
                                 </a>
                                 <div t-field="partner.website_short_description"/>
@@ -126,6 +126,12 @@
 <template id="partner" name="Partner Detail">
     <t t-call="website_crm_partner_assign.layout">
         <t t-set="ref_content">
+            <div class="col-md-5">
+                <ol class="breadcrumb">
+                    <li><a t-attf-href="/partners#{current_grade and '/grade/%s' % slug(current_grade)}#{current_country and '/country/%s' % slug(current_country)}">Our Partners</a></li>
+                    <li class="active"><span t-field="partner.display_name"/></li>
+                </ol>
+            </div>
             <t t-call="website_partner.partner_detail">
                 <t t-set="right_column">
                     <div id="right_column" class="mb16"><t t-call="website_crm_partner_assign.references_block"/></div>

From 4c822b1a3b7545b52d1423111b82e2a1d6f3e5ba Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 20 May 2014 13:10:44 +0200
Subject: [PATCH 215/225] [FIX] website_forum: when sending emails about forum
 post, use the public url instead of the private

---
 addons/mail/mail_mail.py             | 16 +++-------------
 addons/mail/mail_thread.py           | 15 +++++++++++++++
 addons/website_forum/models/forum.py |  8 +++++++-
 3 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py
index 9811fcd6aef..65970265ce3 100644
--- a/addons/mail/mail_mail.py
+++ b/addons/mail/mail_mail.py
@@ -149,19 +149,9 @@ class mail_mail(osv.Model):
         link to action_mail_redirect action that will redirect to doc or Inbox """
         if partner and partner.user_ids:
             base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url')
-            # the parameters to encode for the query and fragment part of url
-            query = {'db': cr.dbname}
-            fragment = {
-                'login': partner.user_ids[0].login,
-                'action': 'mail.action_mail_redirect',
-            }
-            if mail.notification:
-                fragment['message_id'] = mail.mail_message_id.id
-            elif mail.model and mail.res_id:
-                fragment.update(model=mail.model, res_id=mail.res_id)
-
-            url = urljoin(base_url, "/web?%s#%s" % (urlencode(query), urlencode(fragment)))
-            return _("""<span class='oe_mail_footer_access'><small>Access your messages and documents <a style='color:inherit' href="%s">in OpenERP</a></small></span>""") % url
+            mail_model = mail.model or 'mail.thread'
+            url = urljoin(base_url, self.pool[mail_model]._get_access_link(cr, uid, mail, partner, context=context))
+            return _("""<span class='oe_mail_footer_access'><small>Access your messages and documents <a style='color:inherit' href="%s">in Odoo</a></small></span>""") % url
         else:
             return None
 
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index d2dcef4d85e..8cb735b047f 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -35,6 +35,7 @@ import socket
 import time
 import xmlrpclib
 from email.message import Message
+from urllib import urlencode
 
 from openerp import tools
 from openerp import SUPERUSER_ID
@@ -641,6 +642,20 @@ class mail_thread(osv.AbstractModel):
             })
         return action
 
+    def _get_access_link(self, cr, uid, mail, partner, context=None):
+        # the parameters to encode for the query and fragment part of url
+        query = {'db': cr.dbname}
+        fragment = {
+            'login': partner.user_ids[0].login,
+            'action': 'mail.action_mail_redirect',
+        }
+        if mail.notification:
+            fragment['message_id'] = mail.mail_message_id.id
+        elif mail.model and mail.res_id:
+            fragment.update(model=mail.model, res_id=mail.res_id)
+
+        return "/web?%s#%s" % (urlencode(query), urlencode(fragment))
+
     #------------------------------------------------------
     # Email specific
     #------------------------------------------------------
diff --git a/addons/website_forum/models/forum.py b/addons/website_forum/models/forum.py
index b1de4c001a5..8d56d416223 100644
--- a/addons/website_forum/models/forum.py
+++ b/addons/website_forum/models/forum.py
@@ -1,7 +1,8 @@
 # -*- coding: utf-8 -*-
 
-import openerp
+from urlparse import urljoin
 
+import openerp
 from openerp import SUPERUSER_ID
 from openerp.addons.website.models.website import slug
 from openerp.osv import osv, fields
@@ -272,6 +273,11 @@ class Post(osv.Model):
         cr.execute("""UPDATE forum_post SET views = views+1 WHERE id IN %s""", (tuple(ids),))
         return True
 
+    def _get_access_link(self, cr, uid, mail, partner, context=None):
+        post = self.pool['forum.post'].browse(cr, uid, mail.res_id, context=context)
+        res_id = post.parent_id and "%s#answer-%s" % (post.parent_id.id, post.id) or post.id
+        return "/forum/%s/question/%s" % (post.forum_id.id, res_id)
+
 
 class PostReason(osv.Model):
     _name = "forum.post.reason"

From 6718e9d03a221c06f71e78a556a0c5c3803a3e7b Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 20 May 2014 13:10:56 +0200
Subject: [PATCH 216/225] [FIX] crm: do not overwrite the value of
 no_force_assignation if already set in the context

---
 addons/crm/wizard/crm_lead_to_opportunity.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index 40654f464f4..7964e4a4a3a 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -276,7 +276,7 @@ class crm_lead2opportunity_mass_convert(osv.osv_memory):
             active_ids = active_ids.difference(merged_lead_ids)
             active_ids = active_ids.union(remaining_lead_ids)
             ctx['active_ids'] = list(active_ids)
-        ctx['no_force_assignation'] = not data.force_assignation
+        ctx['no_force_assignation'] = context.get('no_force_assignation', not data.force_assignation)
         return self.action_apply(cr, uid, ids, context=ctx)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 8da2cb6d4a6b99ef56cbb64a7c8753ab9a0e3365 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 20 May 2014 14:31:55 +0200
Subject: [PATCH 217/225] [FIX] definition of badges

---
 addons/website_forum/data/badges_participation.xml | 6 +++---
 addons/website_forum/data/badges_question.xml      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/website_forum/data/badges_participation.xml b/addons/website_forum/data/badges_participation.xml
index 05c2540d77d..fc07eaaf864 100644
--- a/addons/website_forum/data/badges_participation.xml
+++ b/addons/website_forum/data/badges_participation.xml
@@ -78,16 +78,16 @@
             <field name="target_goal">10</field>
         </record>
 
-        <!-- Pundit: 10 comments with at least score of 10 -->
+        <!-- Pundit: 10 answers with at least score of 10 -->
         <record id="badge_25" model="gamification.badge">
             <field name="name">Pundit</field>
-            <field name="description">Left comments with score of 10 or more</field>
+            <field name="description">Left 10 answers with score of 10 or more</field>
             <field name="level">silver</field>
             <field name="rule_auth">nobody</field>
         </record>
         <record model="gamification.goal.definition" id="definition_pundit">
             <field name="name">Pundit</field>
-            <field name="description">Post 10 comments with score of 10 or more</field>
+            <field name="description">Post 10 answers with score of 10 or more</field>
             <field name="display_mode">boolean</field>
             <field name="condition">higher</field>
             <field name="model_id" eval="ref('website_forum.model_forum_post')"/>
diff --git a/addons/website_forum/data/badges_question.xml b/addons/website_forum/data/badges_question.xml
index ff2d63c034d..39c1fca9f20 100644
--- a/addons/website_forum/data/badges_question.xml
+++ b/addons/website_forum/data/badges_question.xml
@@ -372,7 +372,7 @@
             <field name="computation_mode">count</field>
             <field name="display_mode">boolean</field>
             <field name="model_id" eval="ref('website_forum.model_forum_post')" />
-            <field name="domain">[('parent_id', '=', False), ('is_correct', '=', True)]</field>
+            <field name="domain">[('parent_id', '=', False), ('has_validated_answer', '=', True)]</field>
             <field name="condition">higher</field>
             <field name="batch_mode">True</field>
             <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post_create_uid')" />

From c786ceb760563e5cdc205c1dd2b95e6513426244 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 20 May 2014 14:32:21 +0200
Subject: [PATCH 218/225] [FIX] the badges should be ordered by most popular
 first

---
 addons/website_forum/controllers/main.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/website_forum/controllers/main.py b/addons/website_forum/controllers/main.py
index f196909b065..b94e818d0c5 100644
--- a/addons/website_forum/controllers/main.py
+++ b/addons/website_forum/controllers/main.py
@@ -599,6 +599,7 @@ class WebsiteForum(http.Controller):
         Badge = request.registry['gamification.badge']
         badge_ids = Badge.search(cr, SUPERUSER_ID, [('challenge_ids.category', '=', 'forum')], context=context)
         badges = Badge.browse(cr, uid, badge_ids, context=context)
+        badges = sorted(badges, key=lambda b: b.stat_count_distinct, reverse=True)
         values = self._prepare_forum_values(forum=forum, searches={'badges': True})
         values.update({
             'badges': badges,

From 70d3652c27ce0a6936f30eaf8af124676e5fa90a Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 20 May 2014 14:41:56 +0200
Subject: [PATCH 219/225] [FIX] remove closing reason 'an answer was accepted',
 the questions should be left as open to be possible to improve the answer
 afterward

---
 addons/website_forum/data/forum_data.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/addons/website_forum/data/forum_data.xml b/addons/website_forum/data/forum_data.xml
index a387a8de7ae..2db99477f61 100644
--- a/addons/website_forum/data/forum_data.xml
+++ b/addons/website_forum/data/forum_data.xml
@@ -70,9 +70,6 @@
         <record id="reason_4" model="forum.post.reason">
             <field name="name">not a real question</field>
         </record>
-        <record id="reason_5" model="forum.post.reason">
-            <field name="name">already answered and an answer was accepted</field>
-        </record>
         <record id="reason_6" model="forum.post.reason">
             <field name="name">not relevant or out dated</field>
         </record>

From 4d9aa300a725d0bbdfadd87d547e150769f13f40 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 20 May 2014 14:50:51 +0200
Subject: [PATCH 220/225] [IMP] as the closing reason is not required, do not
 display it if none is present

---
 addons/website_forum/views/website_forum.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml
index 0f132c48420..f596193c56a 100644
--- a/addons/website_forum/views/website_forum.xml
+++ b/addons/website_forum/views/website_forum.xml
@@ -436,7 +436,7 @@
                 </h1>
                 <div class="alert alert-info text-center" t-if="question.state == 'close'">
                     <p class="mt16">
-                        <b>The question has been closed for reason: <i t-esc="question.closed_reason_id.name"/></b>
+                        <b>The question has been closed<t t-if="question.closed_reason_id"> for reason: <i t-esc="question.closed_reason_id.name"/></t></b>
                     </p>
                     <t t-if="question.closed_uid">
                         <b>by <a t-attf-href="/forum/#{ slug(forum) }/user/#{ question.closed_uid.id }"

From a558a8463000644142aa2210bd1b3db9def66375 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 20 May 2014 15:05:27 +0200
Subject: [PATCH 221/225] [IMP] display the createion date of the question the
 same way we display the answer fate

---
 addons/website_forum/views/website_forum.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml
index f596193c56a..c47d15004dd 100644
--- a/addons/website_forum/views/website_forum.xml
+++ b/addons/website_forum/views/website_forum.xml
@@ -514,6 +514,7 @@
                                 t-field-options='{"widget": "contact", "country_image": true, "fields": ["name", "country_id"]}'
                                 style="display: inline-block;"/>
                             <div t-field="question.create_uid" t-field-options='{"widget": "contact", "badges": true, "fields": ["karma"]}'/>
+                            <span class="text-muted">Asked on <span t-field="question.create_date" t-field-options='{"format":"short"}'/></span>
                         </div>
                     </div>
                 </div>

From 40abb97136c865b30132dcaa6afff140e9b1ab9d Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Tue, 20 May 2014 16:08:03 +0200
Subject: [PATCH 222/225] [FIX] account_analytic_analysis: use product.price if
 pricelist is passed, else list_price

---
 .../account_analytic_analysis.py                          | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index 2f4147cd45c..744c2ef61bf 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -73,7 +73,13 @@ class account_analytic_invoice_line(osv.osv):
 
         result = {}
         res = self.pool.get('product.product').browse(cr, uid, product, context=local_context)
-        result.update({'name': name or res.description or False,'uom_id': uom_id or res.uom_id.id or False, 'price_unit': price_unit if price_unit is not False else (res.price or res.list_price)})
+        if price_unit is not False:
+            price = price_unit
+        elif pricelist_id:
+            price = res.price
+        else:
+            price = res.list_price
+        result.update({'name': name or res.description or False,'uom_id': uom_id or res.uom_id.id or False, 'price_unit': price})
 
         res_final = {'value':result}
         if result['uom_id'] != res.uom_id.id:

From 863edbaaf29eddbce8fad80ed7d66659acd8e9a9 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 20 May 2014 17:06:25 +0200
Subject: [PATCH 223/225] Seperate assets_common from other bundles

---
 addons/point_of_sale/controllers/main.py   | 1 +
 addons/stock/controllers/main.py           | 1 +
 addons/web/views/webclient_templates.xml   | 3 ++-
 addons/website/views/website_templates.xml | 2 +-
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/addons/point_of_sale/controllers/main.py b/addons/point_of_sale/controllers/main.py
index 3cd10993d07..694f59f386c 100644
--- a/addons/point_of_sale/controllers/main.py
+++ b/addons/point_of_sale/controllers/main.py
@@ -36,6 +36,7 @@ html_template = """<!DOCTYPE html>
         <link rel="stylesheet" href="/point_of_sale/static/src/fonts/font-awesome-4.0.3/css/font-awesome.min.css" /> 
         <link rel="stylesheet" href="/point_of_sale/static/src/css/pos.css" />
         <link rel="stylesheet" href="/point_of_sale/static/src/css/keyboard.css" />
+        <script type="text/javascript" src="/web/js/web.assets_common"></script>
         <script type="text/javascript" src="/web/js/web.assets_backend"></script>
         <script type="text/javascript">
             $(function() {
diff --git a/addons/stock/controllers/main.py b/addons/stock/controllers/main.py
index 48742c6c19a..dda444c8627 100644
--- a/addons/stock/controllers/main.py
+++ b/addons/stock/controllers/main.py
@@ -26,6 +26,7 @@ html_template = """<!DOCTYPE html>
         <link rel="stylesheet" href="/web/static/lib/bootstrap/css/bootstrap.css" />
         <link rel="stylesheet" href="/web/static/lib/jquery.ui/css/smoothness/jquery-ui-1.9.1.custom.css" />
         <link rel="stylesheet" href="/web/static/lib/fontawesome/css/font-awesome.css" />
+        <script type="text/javascript" src="/web/js/web.assets_common"></script>
         <script type="text/javascript" src="/web/js/web.assets_backend"></script>
         <script type="text/javascript">
             $(function() {
diff --git a/addons/web/views/webclient_templates.xml b/addons/web/views/webclient_templates.xml
index 5a6c6aaea4c..2b022d86f30 100644
--- a/addons/web/views/webclient_templates.xml
+++ b/addons/web/views/webclient_templates.xml
@@ -43,7 +43,6 @@
         </template>
 
         <template id="web.assets_backend">
-            <t t-call="web.assets_common"/>
             <!-- Datejs -->
             <script type="text/javascript" src="/web/static/lib/datejs/core.js"></script>
             <script type="text/javascript" src="/web/static/lib/datejs/parser.js"></script>
@@ -137,6 +136,7 @@
         <template id="web.webclient_bootstrap" name="Webclient Bootstrap">
             <t t-call="web.layout">
                 <t t-set="head">
+                    <t t-call-assets="web.assets_common"/>
                     <t t-call-assets="web.assets_backend"/>
                     <script type="text/javascript">
                         $(function() {
@@ -242,6 +242,7 @@
                     <link rel="stylesheet" href="/web/static/lib/qunit/qunit.css"/>
                     <script src="/web/static/lib/qunit/qunit.js"></script>
 
+                    <t t-call="web.assets_common"/>
                     <t t-call="web.assets_backend"/>
 
                     <script type="text/javascript" id="qunit_config">
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index 890d6080039..c62a31a95e1 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -12,7 +12,6 @@
 </template>
 
 <template id="website.assets_frontend" name="Website assets">
-    <t t-call="web.assets_common"/>
     <t t-call="website.theme"/>
 
     <script type="text/javascript" src="/web/static/src/js/watch.js"></script>
@@ -89,6 +88,7 @@
                 <link rel="alternate" t-att-href="url_for(request.httprequest.path + '?' + keep_query(), lang=force_lang)" t-att-hreflang="lg[0].replace('_', '-').lower()" />
             </t>
 
+            <t t-call-assets="web.assets_common"/>
             <t t-call-assets="website.assets_frontend"/>
 
             <t t-raw="head or ''" name='layout_head'/>

From 05f376e310dc27d133099ef3a8290d36caec1981 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 20 May 2014 22:33:49 +0200
Subject: [PATCH 224/225] If no addons-path provided, include the main addons

---
 openerp/tools/config.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/openerp/tools/config.py b/openerp/tools/config.py
index 588c2dedf9f..9a054772695 100644
--- a/openerp/tools/config.py
+++ b/openerp/tools/config.py
@@ -433,7 +433,9 @@ class configmanager(object):
 
         self.options['root_path'] = os.path.abspath(os.path.expanduser(os.path.expandvars(os.path.dirname(openerp.__file__))))
         if not self.options['addons_path'] or self.options['addons_path']=='None':
-            self.options['addons_path'] = os.path.join(self.options['root_path'], 'addons')
+            base_addons = os.path.join(self.options['root_path'], 'addons')
+            main_addons = os.path.abspath(os.path.join(self.options['root_path'], '../addons'))
+            self.options['addons_path'] = '%s,%s' % (base_addons, main_addons)
         else:
             self.options['addons_path'] = ",".join(
                     os.path.abspath(os.path.expanduser(os.path.expandvars(x)))

From ad58b17e6eb5ba7d3c92992695703ad0f5ba1353 Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@odoo.com>
Date: Wed, 21 May 2014 17:34:19 +0200
Subject: [PATCH 225/225] [IMP] Add security rules from bzr branch

---
 addons/stock/security/stock_security.xml                 | 9 +++++++++
 addons/stock/stock.py                                    | 2 +-
 addons/stock_account/security/stock_account_security.xml | 9 +++++++++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/addons/stock/security/stock_security.xml b/addons/stock/security/stock_security.xml
index 976e83545bd..f44d354f121 100644
--- a/addons/stock/security/stock_security.xml
+++ b/addons/stock/security/stock_security.xml
@@ -49,6 +49,15 @@
         <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
+    
+    <record model="ir.rule" id="stock_picking_rule">
+        <field name="name">Stock Picking Type multi-company</field>
+        <field name="model_id" search="[('model','=','stock.picking.type')]" model="ir.model"/>
+        <field name="global" eval="True"/>
+        <field name="domain_force">['|', ('warehouse_id', '=', False), '|',('warehouse_id.company_id','=',False),('warehouse_id.company_id','child_of',[user.company_id.id])]</field>
+    </record>
+    
+    
 
     <record model="ir.rule" id="stock_warehouse_comp_rule">
         <field name="name">Warehouse multi-company</field>
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 774985ed3ac..5bfd33b917b 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2743,7 +2743,7 @@ class stock_warehouse(osv.osv):
 
     _columns = {
         'name': fields.char('Warehouse Name', size=128, required=True, select=True),
-        'company_id': fields.many2one('res.company', 'Company', required=True, select=True),
+        'company_id': fields.many2one('res.company', 'Company', required=True, readonly=True, select=True),
         'partner_id': fields.many2one('res.partner', 'Address'),
         'view_location_id': fields.many2one('stock.location', 'View Location', required=True, domain=[('usage', '=', 'view')]),
         'lot_stock_id': fields.many2one('stock.location', 'Location Stock', required=True, domain=[('usage', '=', 'internal')]),
diff --git a/addons/stock_account/security/stock_account_security.xml b/addons/stock_account/security/stock_account_security.xml
index 97ecaecd278..7c30c4ab08d 100644
--- a/addons/stock_account/security/stock_account_security.xml
+++ b/addons/stock_account/security/stock_account_security.xml
@@ -8,6 +8,15 @@
         <field name="name">Manage Inventory Valuation and Costing Methods</field>
         <field name="category_id" ref="base.module_category_hidden"/>
     </record>
+    
+    
+    <record model="ir.rule" id="stock_history_rule">
+        <field name="name">Stock History multi-company</field>
+        <field name="model_id" search="[('model','=','stock.history')]" model="ir.model"/>
+        <field name="global" eval="True"/>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+    </record>
+    
 </data>
 </openerp>