diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 00000000000..a281cf63870
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,10 @@
+Impacted versions:
+
+Steps to reproduce:
+
+Current behavior:
+
+Expected behavior:
+
+Video/Screenshot link (optional):
+
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 00000000000..f6ed43bd61b
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,9 @@
+Description of the issue/feature this PR addresses:
+
+Current behavior before PR:
+
+Desired behavior after PR is merged:
+
+
+--
+I confirm I have signed the CLA and read the PR guidelines at www.odoo.com/submit-pr
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 91e960c97be..002a48bda3f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -8,7 +8,7 @@ TL;DR
 * If you [make a pull request](https://github.com/odoo/odoo/wiki/Contributing#making-pull-requests),
   do not create an issue! Use the PR description for that
 * Issues are handled with a much lower priority than pull requests
-* Use this [template](https://github.com/odoo/odoo/wiki/Contributing#reporting-issues)
+* Use this [template](https://github.com/odoo/odoo/tree/9.0/.github/ISSUE_TEMPLATE.md)
   when reporting issues. Please search for duplicates first!
 * Pull requests must be made against the [correct version](https://github.com/odoo/odoo/wiki/Contributing#against-which-version-should-i-submit-a-patch)
 * There are restrictions on the kind of [changes allowed in stable series](https://github.com/odoo/odoo/wiki/Contributing#what-does-stable-mean)
diff --git a/addons/account/models/account_move.py b/addons/account/models/account_move.py
index 9ecc153a498..b0fbb0e52d1 100644
--- a/addons/account/models/account_move.py
+++ b/addons/account/models/account_move.py
@@ -211,7 +211,7 @@ class AccountMove(models.Model):
             reversed_moves._post_validate()
             reversed_moves.post()
             return [x.id for x in reversed_moves]
-        return True
+        return []
 
     @api.multi
     def open_reconcile_view(self):
diff --git a/addons/account/wizard/account_report_aged_partner_balance.py b/addons/account/wizard/account_report_aged_partner_balance.py
index c5579a32a56..9aefea22184 100644
--- a/addons/account/wizard/account_report_aged_partner_balance.py
+++ b/addons/account/wizard/account_report_aged_partner_balance.py
@@ -30,7 +30,7 @@ class AccountAgedTrialBalance(models.TransientModel):
         start = datetime.strptime(data['form']['date_from'], "%Y-%m-%d")
 
         for i in range(5)[::-1]:
-            stop = start - relativedelta(days=period_length)
+            stop = start - relativedelta(days=period_length - 1)
             res[str(i)] = {
                 'name': (i!=0 and (str((5-(i+1)) * period_length) + '-' + str((5-i) * period_length)) or ('+'+str(4 * period_length))),
                 'stop': start.strftime('%Y-%m-%d'),
diff --git a/addons/crm/i18n/crm.pot b/addons/crm/i18n/crm.pot
index 278a34952d1..16d54791d9f 100644
--- a/addons/crm/i18n/crm.pot
+++ b/addons/crm/i18n/crm.pot
@@ -273,6 +273,16 @@ msgid "<span class=\"panel-title\"><span data-icon=\"&#57463;\"/><strong> Exerci
 "                                    <span>(Sales Manager)</span>"
 msgstr ""
 
+#. module: crm
+#: model:web.tip,description:crm.crm_tip_4
+msgid "<span><b>This is a business opportunity.</b> Drag and drop it to another column while you move forward in the sales cycle. Click to zoom in the opportunity.</span>"
+msgstr ""
+
+#. module: crm
+#: model:web.tip,description:crm.crm_tip_6
+msgid "<span><strong>Click to register a new business opportunity</strong>. Once the opportunity is created, you will be able to drag and drop it in your sales pipeline.</span>"
+msgstr ""
+
 #. module: crm
 #: model:ir.ui.view,arch_db:crm.crm_planner
 msgid "<span><strong>Contact us to customize your application:</strong><br/>\n"
@@ -886,6 +896,11 @@ msgstr ""
 msgid "Click to set a new stage in your lead/opportunity pipeline."
 msgstr ""
 
+#. module: crm
+#: model:web.tip,description:crm.crm_tip_2
+msgid "Click to view the opportunities related to this customer."
+msgstr ""
+
 #. module: crm
 #: model:ir.ui.view,arch_db:crm.base_partner_merge_automatic_wizard_form
 msgid "Close"
@@ -1923,6 +1938,14 @@ msgstr ""
 msgid "Lead Created"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,name:crm.crm_lead_tag_action
+#: model:ir.ui.menu,name:crm.menu_crm_lead_categ
+#: model:ir.ui.view,arch_db:crm.crm_lead_tag_form
+#: model:ir.ui.view,arch_db:crm.crm_lead_tag_tree
+msgid "Lead Tags"
+msgstr ""
+
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity_partner
 msgid "Lead To Opportunity Partner"
@@ -2137,6 +2160,8 @@ msgstr ""
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_crm_lead_medium_id
 #: model:ir.model.fields,field_description:crm.field_crm_opportunity_report_medium_id
+#: model:ir.ui.view,arch_db:crm.view_crm_case_leads_filter
+#: model:ir.ui.view,arch_db:crm.view_crm_case_opportunities_filter
 msgid "Medium"
 msgstr ""
 
@@ -2312,6 +2337,11 @@ msgstr ""
 msgid "Motivation letter from the management"
 msgstr ""
 
+#. module: crm
+#: model:ir.ui.view,arch_db:crm.view_crm_case_leads_filter
+msgid "My Leads"
+msgstr ""
+
 #. module: crm
 #: model:ir.ui.view,arch_db:crm.crm_opportunity_report_view_search
 #: model:ir.ui.view,arch_db:crm.view_crm_case_leads_filter
@@ -3229,6 +3259,11 @@ msgstr ""
 msgid "Subscription Management"
 msgstr ""
 
+#. module: crm
+#: model:web.tip,description:crm.crm_tip_5
+msgid "Switch to the graph view to get a clear reporting on your opportunities pipeline."
+msgstr ""
+
 #. module: crm
 #: model:ir.ui.view,arch_db:crm.crm_planner
 msgid "Systematic organization is what makes the difference\n"
diff --git a/addons/event/i18n/event.pot b/addons/event/i18n/event.pot
index b7a7adc1a56..5f17c44d9ed 100644
--- a/addons/event/i18n/event.pot
+++ b/addons/event/i18n/event.pot
@@ -517,6 +517,11 @@ msgstr ""
 msgid "Course Summary"
 msgstr ""
 
+#. module: event
+#: model:web.tip,description:event.event_tip_1
+msgid "Create and manage registrations for this event, send emails to attendees and print identification badges."
+msgstr ""
+
 #. module: event
 #: model:ir.model.fields,field_description:event.field_event_config_settings_create_uid
 #: model:ir.model.fields,field_description:event.field_event_confirm_create_uid
@@ -1759,6 +1764,16 @@ msgstr ""
 msgid "Warning: This Event has not reached its Minimum Registration Limit. Are you sure you want to confirm it?"
 msgstr ""
 
+#. module: event
+#: model:ir.model.fields,field_description:event.field_event_event_website_message_ids
+msgid "Website Messages"
+msgstr ""
+
+#. module: event
+#: model:ir.model.fields,help:event.field_event_event_website_message_ids
+msgid "Website communication history"
+msgstr ""
+
 #. module: event
 #: selection:event.mail,interval_unit:0
 msgid "Week(s)"
diff --git a/addons/hr/i18n/hr.pot b/addons/hr/i18n/hr.pot
index c7d14da523f..dfdcb92a3d8 100644
--- a/addons/hr/i18n/hr.pot
+++ b/addons/hr/i18n/hr.pot
@@ -177,6 +177,11 @@ msgstr ""
 msgid "City"
 msgstr ""
 
+#. module: hr
+#: model:web.tip,description:hr.hr_tip_2
+msgid "Click here to change the recruitment goal!"
+msgstr ""
+
 #. module: hr
 #: model:ir.actions.act_window,help:hr.act_employee_from_department
 #: model:ir.actions.act_window,help:hr.open_view_employee_list_my
@@ -721,6 +726,11 @@ msgstr ""
 msgid "Last Modified on"
 msgstr ""
 
+#. module: hr
+#: model:ir.model.fields,field_description:hr.field_res_users_last_website_so_id
+msgid "Last Online Sale Order"
+msgstr ""
+
 #. module: hr
 #: model:ir.model.fields,field_description:hr.field_hr_department_write_uid
 #: model:ir.model.fields,field_description:hr.field_hr_employee_category_write_uid
@@ -1145,6 +1155,11 @@ msgstr ""
 msgid "Subordinates"
 msgstr ""
 
+#. module: hr
+#: model:ir.model.fields,field_description:hr.field_res_users_subscription_count
+msgid "Subscriptions"
+msgstr ""
+
 #. module: hr
 #: sql_constraint:hr.employee.category:0
 msgid "Tag name already exists !"
diff --git a/addons/hr_expense/i18n/hr_expense.pot b/addons/hr_expense/i18n/hr_expense.pot
index 83a04cff319..891dcc3e98e 100644
--- a/addons/hr_expense/i18n/hr_expense.pot
+++ b/addons/hr_expense/i18n/hr_expense.pot
@@ -53,6 +53,7 @@ msgstr ""
 
 #. module: hr_expense
 #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_analytic_account_id
+#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_filter
 msgid "Analytic Account"
 msgstr ""
 
@@ -111,6 +112,11 @@ msgstr ""
 msgid "Click here to refuse"
 msgstr ""
 
+#. module: hr_expense
+#: model:web.tip,description:hr_expense.expense_tip_2
+msgid "Click on Action to submit multiple expenses to your manager."
+msgstr ""
+
 #. module: hr_expense
 #: model:ir.actions.act_window,help:hr_expense.hr_expense_product
 msgid "Click to create a new expense category."
@@ -152,6 +158,7 @@ msgstr ""
 
 #. module: hr_expense
 #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_date
+#: model:ir.ui.view,arch_db:hr_expense.report_expense
 msgid "Date"
 msgstr ""
 
@@ -174,6 +181,7 @@ msgstr ""
 #. module: hr_expense
 #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_display_name
 #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_refuse_wizard_display_name
+#: model:ir.model.fields,field_description:hr_expense.field_report_hr_expense_report_expense_display_name
 msgid "Display Name"
 msgstr ""
 
@@ -368,6 +376,7 @@ msgstr ""
 #. module: hr_expense
 #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_id
 #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_refuse_wizard_id
+#: model:ir.model.fields,field_description:hr_expense.field_report_hr_expense_report_expense_id
 msgid "ID"
 msgstr ""
 
@@ -404,6 +413,7 @@ msgstr ""
 #. module: hr_expense
 #: model:ir.model.fields,field_description:hr_expense.field_hr_expense___last_update
 #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_refuse_wizard___last_update
+#: model:ir.model.fields,field_description:hr_expense.field_report_hr_expense_report_expense___last_update
 msgid "Last Modified on"
 msgstr ""
 
@@ -594,6 +604,11 @@ msgstr ""
 msgid "Reporting"
 msgstr ""
 
+#. module: hr_expense
+#: model:web.tip,description:hr_expense.expense_tip_1
+msgid "Select the lines you want to submit to be reimbursed."
+msgstr ""
+
 #. module: hr_expense
 #: code:addons/hr_expense/models/hr_expense.py:73
 #, python-format
@@ -716,6 +731,11 @@ msgstr ""
 msgid "UoM"
 msgstr ""
 
+#. module: hr_expense
+#: model:web.tip,description:hr_expense.expense_tip_3
+msgid "Use the messaging tool to log a note and attach a document to the expense. (e.g. scan of the bill)"
+msgstr ""
+
 #. module: hr_expense
 #: selection:hr.expense,state:0
 msgid "Waiting Payment"
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index a5eff146ee0..4ba9ff3def7 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -80,6 +80,8 @@
             <field name="res_model">account.analytic.account</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="domain">[]</field> <!-- reset to empty -->
+            <field name="context">{}</field> <!-- reset to empty -->
         </record>
 
         <menuitem name="Configuration" id="menu_hr_timesheet_config" sequence="100"
diff --git a/addons/l10n_ar/__openerp__.py b/addons/l10n_ar/__openerp__.py
index 1bfab877bfb..66d2d43ce1f 100644
--- a/addons/l10n_ar/__openerp__.py
+++ b/addons/l10n_ar/__openerp__.py
@@ -5,7 +5,7 @@
 
 {
     'name': 'Argentina - Accounting',
-    'version': '1.0',
+    'version': '2.0',
     'description': """
 Argentinian accounting chart and tax localization.
 ==================================================
diff --git a/addons/l10n_ar/account_tax.xml b/addons/l10n_ar/account_tax.xml
index 4975a3c3ffe..1f337137925 100644
--- a/addons/l10n_ar/account_tax.xml
+++ b/addons/l10n_ar/account_tax.xml
@@ -3,32 +3,118 @@
 
     <!-- Account Tags -->
 
-    <record id="tag_itax_21_out" model="account.account.tag">
-        <field name="name">ITAX_21-OUT</field>
+    <record id="tag_ar_01" model="account.account.tag">
+        <field name="name">Base Imponible</field>
         <field name="applicability">taxes</field>
     </record>
-    <record id="tag_otax_21_in" model="account.account.tag">
-        <field name="name">OTAX_21-IN</field>
+
+    <record id="tag_ar_02" model="account.account.tag">
+        <field name="name">Base Imponible - Ventas</field>
         <field name="applicability">taxes</field>
     </record>
-    <record id="tag_itax_27_out" model="account.account.tag">
-        <field name="name">ITAX_27-OUT</field>
+
+    <record id="tag_ar_03" model="account.account.tag">
+        <field name="name">Ventas Gravadas con IVA</field>
         <field name="applicability">taxes</field>
     </record>
-    <record id="tag_otax_27_in" model="account.account.tag">
-        <field name="name">OTAX_27-IN</field>
+
+    <record id="tag_ar_04" model="account.account.tag">
+        <field name="name">Ventas NO Gravadas (Exoneradas)</field>
         <field name="applicability">taxes</field>
     </record>
-    <record id="tag_itax_105_out" model="account.account.tag">
-        <field name="name">ITAX_105-OUT</field>
+
+    <record id="tag_ar_05" model="account.account.tag">
+        <field name="name">Ventas Gravadas Fuera de Ámbito</field>
         <field name="applicability">taxes</field>
     </record>
-    <record id="tag_otax_105_in" model="account.account.tag">
-        <field name="name">OTAX_105-IN</field>
+
+    <record id="tag_ar_06" model="account.account.tag">
+        <field name="name">Base Imponible - Compras</field>
         <field name="applicability">taxes</field>
     </record>
-    <record id="tag_otax_02_in" model="account.account.tag">
-        <field name="name">OTAX_02-IN</field>
+
+    <record id="tag_ar_07" model="account.account.tag">
+        <field name="name">Compras Gravadas con IVA</field>
+        <field name="applicability">taxes</field>
+    </record>
+
+    <record id="tag_ar_08" model="account.account.tag">
+        <field name="name">Compras NO Gravadas (Exoneradas)</field>
+        <field name="applicability">taxes</field>
+    </record>
+
+    <record id="tag_ar_09" model="account.account.tag">
+        <field name="name">Compras Gravadas Fuera de Ámbito</field>
+        <field name="applicability">taxes</field>
+    </record>
+
+    <record id="tag_ar_10" model="account.account.tag">
+        <field name="name">Impuesto General a las Ventas (IVA) Total a Pagar</field>
+        <field name="applicability">taxes</field>
+    </record>
+
+    <record id="tag_ar_11" model="account.account.tag">
+        <field name="name">Impuesto Pagado</field>
+        <field name="applicability">taxes</field>
+    </record>
+
+    <record id="tag_ar_12" model="account.account.tag">
+        <field name="name">Impuesto Pagado IVA</field>
+        <field name="applicability">taxes</field>
+    </record>
+
+    <record id="tag_ar_13" model="account.account.tag">
+        <field name="name">Impuesto Pagado de Exonerados al IVA</field>
+        <field name="applicability">taxes</field>
+    </record>
+
+    <record id="tag_ar_14" model="account.account.tag">
+        <field name="name">Impuesto Pagado Fuera de Ámbito</field>
+        <field name="applicability">taxes</field>
+    </record>
+
+    <record id="tag_ar_15" model="account.account.tag">
+        <field name="name">Impuesto Cobrado</field>
+        <field name="applicability">taxes</field>
+    </record>
+
+    <record id="tag_ar_16" model="account.account.tag">
+        <field name="name">Impuesto Cobrado IVA</field>
+        <field name="applicability">taxes</field>
+    </record>
+
+    <record id="tag_ar_17" model="account.account.tag">
+        <field name="name">Impuesto Cobrado de Exonerados al IVA</field>
+        <field name="applicability">taxes</field>
+    </record>
+
+    <record id="tag_ar_18" model="account.account.tag">
+        <field name="name">Impuesto Cobrado Fuera de Ámbito</field>
+        <field name="applicability">taxes</field>
+    </record>
+
+    <record id="tag_ar_19" model="account.account.tag">
+        <field name="name">Impuesto Nacionales a Pagar</field>
+        <field name="applicability">taxes</field>
+    </record>
+
+    <record id="tag_ar_20" model="account.account.tag">
+        <field name="name">Impuesto a las Ganancias a Pagar</field>
+        <field name="applicability">taxes</field>
+    </record>
+
+    <record id="tag_ar_21" model="account.account.tag">
+        <field name="name">Impuesto a los Bienes Personales a Pagar</field>
+        <field name="applicability">taxes</field>
+    </record>
+
+    <record id="tag_ar_22" model="account.account.tag">
+        <field name="name">Impuesto a la Ganancia Mínima Presunta a Pagar</field>
+        <field name="applicability">taxes</field>
+    </record>
+
+    <record id="tag_ar_23" model="account.account.tag">
+        <field name="name">Monotributo a Pagar</field>
         <field name="applicability">taxes</field>
     </record>
 
@@ -42,7 +128,7 @@
       <field name="type_tax_use">sale</field>
       <field name="refund_account_id" ref="231"/>
       <field name="account_id" ref="231"/>
-      <field name="tag_ids" eval="[(6,0,[ref('tag_itax_21_out')])]"/>
+      <field name="tag_ids" eval="[(6,0,[ref('tag_ar_03'), ref('tag_ar_16')])]"/>
     </record>
 
     <record id="OTAX_21" model="account.tax.template">
@@ -54,7 +140,7 @@
       <field name="type_tax_use">purchase</field>
       <field name="refund_account_id" ref="231"/>
       <field name="account_id" ref="231"/>
-      <field name="tag_ids" eval="[(6,0,[ref('tag_otax_21_in')])]"/>
+      <field name="tag_ids" eval="[(6,0,[ref('tag_ar_07'), ref('tag_ar_12')])]"/>
     </record>
 
     <record id="ITAX_27" model="account.tax.template">
@@ -66,7 +152,7 @@
       <field name="type_tax_use">sale</field>
       <field name="refund_account_id" ref="231"/>
       <field name="account_id" ref="231"/>
-      <field name="tag_ids" eval="[(6,0,[ref('tag_itax_27_out')])]"/>
+      <field name="tag_ids" eval="[(6,0,[ref('tag_ar_16'), ref('tag_ar_03')])]"/>
     </record>
 
     <record id="OTAX_27" model="account.tax.template">
@@ -78,7 +164,7 @@
       <field name="type_tax_use">purchase</field>
       <field name="refund_account_id" ref="231"/>
       <field name="account_id" ref="231"/>
-      <field name="tag_ids" eval="[(6,0,[ref('tag_otax_27_in')])]"/>
+      <field name="tag_ids" eval="[(6,0,[ref('tag_ar_12'), ref('tag_ar_07')])]"/>
     </record>
 
     <record id="ITAX_105" model="account.tax.template">
@@ -90,7 +176,7 @@
       <field name="type_tax_use">sale</field>
       <field name="refund_account_id" ref="231"/>
       <field name="account_id" ref="231"/>
-      <field name="tag_ids" eval="[(6,0,[ref('tag_itax_105_out')])]"/>
+      <field name="tag_ids" eval="[(6,0,[ref('tag_ar_16'), ref('tag_ar_03')])]"/>
     </record>
 
     <record id="OTAX_105" model="account.tax.template">
@@ -102,7 +188,7 @@
       <field name="type_tax_use">purchase</field>
       <field name="refund_account_id" ref="231"/>
       <field name="account_id" ref="231"/>
-      <field name="tag_ids" eval="[(6,0,[ref('tag_otax_105_in')])]"/>
+      <field name="tag_ids" eval="[(6,0,[ref('tag_ar_07'), ref('tag_ar_12')])]"/>
     </record>
 
     <record id="OTAX_02" model="account.tax.template">
@@ -114,7 +200,7 @@
       <field name="type_tax_use">purchase</field>
       <field name="refund_account_id" ref="231"/>
       <field name="account_id" ref="231"/>
-      <field name="tag_ids" eval="[(6,0,[ref('tag_otax_02_in')])]"/>
+      <field name="tag_ids" eval="[(6,0,[ref('tag_ar_12')])]"/>
     </record>
 
 </odoo>
diff --git a/addons/l10n_ar/migrations/2.0/post-migrate_tags_on_taxes.py b/addons/l10n_ar/migrations/2.0/post-migrate_tags_on_taxes.py
new file mode 100644
index 00000000000..fa56fd00dfa
--- /dev/null
+++ b/addons/l10n_ar/migrations/2.0/post-migrate_tags_on_taxes.py
@@ -0,0 +1,6 @@
+from openerp.modules.registry import RegistryManager
+
+def migrate(cr, version):
+    registry = RegistryManager.get(cr.dbname)
+    from openerp.addons.account.models.chart_template import migrate_tags_on_taxes
+    migrate_tags_on_taxes(cr, registry)
diff --git a/addons/l10n_at/__openerp__.py b/addons/l10n_at/__openerp__.py
index 17a4296e011..fd54d6e14e1 100644
--- a/addons/l10n_at/__openerp__.py
+++ b/addons/l10n_at/__openerp__.py
@@ -5,7 +5,7 @@
 
 {
     'name': 'Austria - Accounting',
-    'version': '1.0',
+    'version': '2.0',
     'author': 'conexus.at',
     'website': 'http://www.conexus.at',
     'category': 'Localization/Account Charts',
diff --git a/addons/l10n_at/account_tax.xml b/addons/l10n_at/account_tax.xml
index 521245bda5b..f80488fe1ea 100644
--- a/addons/l10n_at/account_tax.xml
+++ b/addons/l10n_at/account_tax.xml
@@ -1,77 +1,142 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <data noupdate="1">
+    <data>
 
 
     <!-- Account Tags -->
 
-        <record id="tax_10%_Einfuhrumsatzsteuer" model="account.account.tag">
-            <field name="name">10% Einfuhrumsatzsteuer</field>
+        <record id="tag_at_01" model="account.account.tag">
+            <field name="name">UST Vorauszahlung / Überschuss - bitte dem Betrag ein Minuszeichen voranstellen</field>
             <field name="applicability">taxes</field>
         </record>
 
-        <record id="tax_20%_Einfuhrumsatzsteuer" model="account.account.tag">
-            <field name="name">20% Einfuhrumsatzsteuer</field>
+        <record id="tag_at_02" model="account.account.tag">
+            <field name="name">Steuern</field>
             <field name="applicability">taxes</field>
         </record>
 
-        <record id="tax_20%_USt_EU" model="account.account.tag">
-            <field name="name">20% USt EU</field>
+        <record id="tag_at_03" model="account.account.tag">
+            <field name="name">Vorsteuer aus innergemeinschaftlichem Erwerb</field>
             <field name="applicability">taxes</field>
         </record>
 
-        <record id="tax_20%_MwSt" model="account.account.tag">
-            <field name="name">20% MwSt</field>
+        <record id="tag_at_04" model="account.account.tag">
+            <field name="name">Innergemeinschaftliche Erwerbe</field>
             <field name="applicability">taxes</field>
         </record>
 
-        <record id="tax_10%_USt_EU" model="account.account.tag">
-            <field name="name">10% USt EU</field>
+        <record id="tag_at_05" model="account.account.tag">
+            <field name="name">Steuerpflichtige Umsätze (Lieferungen, sonstige Leistungen und Eigenverbrauch)</field>
             <field name="applicability">taxes</field>
         </record>
 
-        <record id="tax_10%_MwSt" model="account.account.tag">
-            <field name="name">10% MwSt</field>
+        <record id="tag_at_06" model="account.account.tag">
+            <field name="name">zum Steuersatz von 20 %</field>
             <field name="applicability">taxes</field>
         </record>
 
-        <record id="tax_innergem_Erwerb_20%" model="account.account.tag">
-            <field name="name">innergem. Erwerb 20%</field>
+        <record id="tag_at_07" model="account.account.tag">
+            <field name="name">BMGzum Steuersatz von 20 %</field>
             <field name="applicability">taxes</field>
         </record>
 
-        <record id="tax_20%_VSt" model="account.account.tag">
-            <field name="name">20% VSt</field>
+        <record id="tag_at_08" model="account.account.tag">
+            <field name="name">zum Steuersatz von 10 %</field>
             <field name="applicability">taxes</field>
         </record>
 
-        <record id="tax_innergem_Erwerb_10%" model="account.account.tag">
-            <field name="name">innergem. Erwerb 10%</field>
+        <record id="tag_at_09" model="account.account.tag">
+            <field name="name">BMGzum Steuersatz von 10 %</field>
             <field name="applicability">taxes</field>
         </record>
 
-        <record id="tax_10%_VSt" model="account.account.tag">
-            <field name="name">10% VSt</field>
+        <record id="tag_at_10" model="account.account.tag">
+            <field name="name">Lieferungen, sonstige Leistungen und Eigenverbrauch</field>
             <field name="applicability">taxes</field>
         </record>
 
-        <record id="tax_steuerfreie_Ausfuhr" model="account.account.tag">
-            <field name="name">steuerfreie Ausfuhr</field>
+        <record id="tag_at_11" model="account.account.tag">
+            <field name="name">Steuerpflichtige Umsätze (Lieferungen, sonstige Leistungen und Eigenverbrauch)</field>
             <field name="applicability">taxes</field>
         </record>
 
-        <record id="tax_strf_i_g_L" model="account.account.tag">
-            <field name="name">strf. i.g.L</field>
+        <record id="tag_at_12" model="account.account.tag">
+            <field name="name">zum Steuersatz von 20 %</field>
             <field name="applicability">taxes</field>
         </record>
 
-        <record id="tax_10%_EUSt" model="account.account.tag">
-            <field name="name">10% EUSt</field>
+        <record id="tag_at_13" model="account.account.tag">
+            <field name="name">zum Steuersatz von 10%</field>
             <field name="applicability">taxes</field>
         </record>
 
-        <record id="tax_20%_EUSt" model="account.account.tag">
-            <field name="name">20% EUSt</field>
+        <record id="tag_at_14" model="account.account.tag">
+            <field name="name">Bemessungsgrundlage</field>
+            <field name="applicability">taxes</field>
+        </record>
+
+        <record id="tag_at_15" model="account.account.tag">
+            <field name="name">Steuern</field>
+            <field name="applicability">taxes</field>
+        </record>
+
+        <record id="tag_at_16" model="account.account.tag">
+            <field name="name">Lieferungen und sonstige Leistungen (einschließlich unentgeltlicher Wertabgaben)</field>
+            <field name="applicability">taxes</field>
+        </record>
+
+        <record id="tag_at_17" model="account.account.tag">
+            <field name="name">Steuerfreie Umsätze mit Vorsteuerabzug</field>
+            <field name="applicability">taxes</field>
+        </record>
+
+        <record id="tag_at_18" model="account.account.tag">
+            <field name="name">§ 6 Abs. 1 Z 1 iVm § 7 (Ausfuhrlieferungen)</field>
+            <field name="applicability">taxes</field>
+        </record>
+
+        <record id="tag_at_19" model="account.account.tag">
+            <field name="name">Art. 6 Abs. 1 (Innergemeinschaftliche Lieferungen)</field>
+            <field name="applicability">taxes</field>
+        </record>
+
+        <record id="tag_at_20" model="account.account.tag">
+            <field name="name">Innergemeinschaftliche Erwerbe</field>
+            <field name="applicability">taxes</field>
+        </record>
+
+        <record id="tag_at_21" model="account.account.tag">
+            <field name="name">Vorsteuer (dient lediglich der Verprobung)</field>
+            <field name="applicability">taxes</field>
+        </record>
+
+        <record id="tag_at_22" model="account.account.tag">
+            <field name="name">Einfuhren</field>
+            <field name="applicability">taxes</field>
+        </record>
+
+        <record id="tag_at_23" model="account.account.tag">
+            <field name="name">Einfuhren zum Steuersatz von 10 %</field>
+            <field name="applicability">taxes</field>
+        </record>
+
+        <record id="tag_at_24" model="account.account.tag">
+            <field name="name">Einfuhren zum Steuersatz von 20 %</field>
+            <field name="applicability">taxes</field>
+        </record>
+
+        <record id="tag_at_25" model="account.account.tag">
+            <field name="name">Rechnungen von anderen Unternehmern und innergemeinschaftliche Dreiecksgeschäfte</field>
+            <field name="applicability">taxes</field>
+        </record>
+
+        <record id="tag_at_26" model="account.account.tag">
+            <field name="name">zum Steuersatz von 10 %</field>
+            <field name="applicability">taxes</field>
+        </record>
+
+        <record id="tag_at_27" model="account.account.tag">
+            <field name="name">zum Steuersatz von 20 %</field>
             <field name="applicability">taxes</field>
         </record>
 
@@ -87,7 +152,7 @@
             <field name="refund_account_id" ref="chart3500"/>
             <field name="account_id" ref="chart3500"/>
             <field name="type_tax_use">sale</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tax_20%_MwSt')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('tag_at_27'), ref('tag_at_12')])]"/>
         </record>
     
         <record id="tax_at_mwst_10" model="account.tax.template">
@@ -99,7 +164,7 @@
             <field name="refund_account_id" ref="chart3500"/>
             <field name="account_id" ref="chart3500"/>
             <field name="type_tax_use">sale</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tax_10%_MwSt')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('tag_at_26'), ref('tag_at_13')])]"/>
         </record>
         
         <record id="tax_at_vst_20" model="account.tax.template">
@@ -111,7 +176,7 @@
             <field name="refund_account_id" ref="chart2500"/>
             <field name="account_id" ref="chart2500"/>
             <field name="type_tax_use">purchase</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tax_20%_VSt')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('tag_at_27'), ref('tag_at_07') ,ref('tag_at_06'), ref('tag_at_03')])]"/>
         </record>
         
         <record id="tax_at_vst_10" model="account.tax.template">
@@ -123,7 +188,7 @@
             <field name="refund_account_id" ref="chart2500"/>
             <field name="account_id" ref="chart2500"/>
             <field name="type_tax_use">purchase</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tax_10%_VSt')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('tag_at_09'), ref('tag_at_03'), ref('tag_at_08')])]"/>
         </record>
         
         <record model="account.tax.template" id="tax_import_20">
@@ -135,7 +200,7 @@
             <field name="account_id" ref="chart2510"/>
             <field name="refund_account_id" ref="chart2510"/>
             <field name="type_tax_use">purchase</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tax_20%_EUSt')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('tag_at_24')])]"/>
         </record>
         
         <record model="account.tax.template" id="tax_import_10">
@@ -147,7 +212,7 @@
             <field name="account_id" ref="chart2510"/>
             <field name="refund_account_id" ref="chart2510"/>
             <field name="type_tax_use">purchase</field>
-             <field name="tag_ids" eval="[(6,0,[ref('tax_10%_EUSt')])]"/>
+             <field name="tag_ids" eval="[(6,0,[ref('tag_at_23')])]"/>
         </record>
         
         <record model="account.tax.template" id="tax_eu_20_purchase_ust">
@@ -170,7 +235,7 @@
             <field name="account_id" ref="chart2501"/>
             <field name="refund_account_id" ref="chart2501"/>
             <field name="type_tax_use">none</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tax_20%_VSt')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('tag_at_27'), ref('tag_at_07'), ref('tag_at_06'), ref('tag_at_03')])]"/>
         </record>
 
         <record model="account.tax.template" id="tax_eu_20_purchase">
@@ -182,7 +247,7 @@
             <field name="type_tax_use">purchase</field>
             <field name="amount_type">group</field>
             <field name="children_tax_ids" eval="[(6, 0, [ref('tax_eu_20_purchase_ust'), ref('tax_eu_20_purchase_vst')])]"/>
-            <field name="tag_ids" eval="[(6,0,[ref('tax_innergem_Erwerb_20%')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('tag_at_07')])]"/>
         </record>
 
         <record model="account.tax.template" id="tax_eu_10_purchase_ust">
@@ -205,7 +270,7 @@
             <field name="account_id" ref="chart2503"/>
             <field name="refund_account_id" ref="chart2503"/>
             <field name="type_tax_use">none</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tax_10%_VSt')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('tag_at_09'), ref('tag_at_03'), ref('tag_at_08')])]"/>
         </record>
 
         <record model="account.tax.template" id="tax_eu_10_purchase">
@@ -216,7 +281,7 @@
             <field name="amount_type">group</field>
             <field name="type_tax_use">purchase</field>
             <field name="children_tax_ids" eval="[(6, 0, [ref('tax_eu_10_purchase_ust'), ref('tax_eu_10_purchase_vst')])]"/>
-            <field name="tag_ids" eval="[(6,0,[ref('tax_innergem_Erwerb_10%')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('tag_at_09')])]"/>
         </record>
         
         <record model="account.tax.template" id="tax_at_mwst_20_eu">
@@ -228,7 +293,7 @@
             <field name="account_id" ref="chart3510"/>
             <field name="refund_account_id" ref="chart3510"/>
             <field name="type_tax_use">sale</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tax_20%_USt_EU')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('tag_at_27'), ref('tag_at_12')])]"/>
         </record>
 
         <record model="account.tax.template" id="tax_at_mwst_10_eu">
@@ -240,7 +305,7 @@
             <field name="account_id" ref="chart3511"/>
             <field name="refund_account_id" ref="chart3511"/>
             <field name="type_tax_use">sale</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tax_10%_USt_EU')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('tag_at_26'), ref('tag_at_13')])]"/>
         </record>
         
         <record model="account.tax.template" id="tax_eu_sale_at">
@@ -252,7 +317,7 @@
             <field name="account_id" ref="chart3500"/>
             <field name="refund_account_id" ref="chart3500"/>
             <field name="type_tax_use">sale</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tax_strf_i_g_L')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('tag_at_19')])]"/>
         </record>
 
         <record model="account.tax.template" id="tax_export_at">
@@ -264,7 +329,7 @@
             <field name="account_id" ref="chart3500"/>
             <field name="refund_account_id" ref="chart3500"/>
             <field name="type_tax_use">sale</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tax_steuerfreie_Ausfuhr')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('tag_at_18')])]"/>
         </record>
         
         
diff --git a/addons/l10n_at/migrations/2.0/post-migrate_tags_on_taxes.py b/addons/l10n_at/migrations/2.0/post-migrate_tags_on_taxes.py
new file mode 100644
index 00000000000..fa56fd00dfa
--- /dev/null
+++ b/addons/l10n_at/migrations/2.0/post-migrate_tags_on_taxes.py
@@ -0,0 +1,6 @@
+from openerp.modules.registry import RegistryManager
+
+def migrate(cr, version):
+    registry = RegistryManager.get(cr.dbname)
+    from openerp.addons.account.models.chart_template import migrate_tags_on_taxes
+    migrate_tags_on_taxes(cr, registry)
diff --git a/addons/l10n_at/migrations/2.0/pre-set_tags_and_taxes_updatable.py b/addons/l10n_at/migrations/2.0/pre-set_tags_and_taxes_updatable.py
new file mode 100644
index 00000000000..f421a121a04
--- /dev/null
+++ b/addons/l10n_at/migrations/2.0/pre-set_tags_and_taxes_updatable.py
@@ -0,0 +1,6 @@
+from openerp.modules.registry import RegistryManager
+
+def migrate(cr, version):
+    registry = RegistryManager.get(cr.dbname)
+    from openerp.addons.account.models.chart_template import migrate_set_tags_and_taxes_updatable
+    migrate_set_tags_and_taxes_updatable(cr, registry, 'l10n_at')
diff --git a/addons/l10n_bo/__openerp__.py b/addons/l10n_bo/__openerp__.py
index c3752f6acc5..e82bcf39b85 100644
--- a/addons/l10n_bo/__openerp__.py
+++ b/addons/l10n_bo/__openerp__.py
@@ -5,7 +5,7 @@
 
 {
     "name": "Bolivia - Accounting",
-    "version": "1.0",
+    "version": "2.0",
     "description": """
 Bolivian accounting chart and tax localization.
 
diff --git a/addons/l10n_bo/account_tax.xml b/addons/l10n_bo/account_tax.xml
index fc7923798fa..99ce50f47ba 100644
--- a/addons/l10n_bo/account_tax.xml
+++ b/addons/l10n_bo/account_tax.xml
@@ -3,18 +3,108 @@
 
      <!-- Account Tags -->
 
-    <record id="tag_ITAX_03_OUT" model="account.account.tag">
-        <field name="name">ITAX_03_OUT</field>
+    <record id="tag_bo_01" model="account.account.tag">
+        <field name="name">Impuesto a las Utilidades de la Empresa IUE (25%)</field>
         <field name="applicability">taxes</field>
     </record>
 
-    <record id="tag_ITAX_21_OUT" model="account.account.tag">
-        <field name="name">ITAX_21_OUT</field>
+    <record id="tag_bo_02" model="account.account.tag">
+        <field name="name">Impuesto a las Transacciones IT (3%)</field>
         <field name="applicability">taxes</field>
     </record>
 
-    <record id="tag_OTAX_21_IN" model="account.account.tag">
-        <field name="name">OTAX_21_IN</field>
+    <record id="tag_bo_03" model="account.account.tag">
+        <field name="name">Impuesto a las Transacciones IT (3%)</field>
+        <field name="applicability">taxes</field>
+    </record>
+
+    <record id="tag_bo_04" model="account.account.tag">
+        <field name="name">Impuesto al Valor Agregado (IVA) Total a Pagar</field>
+        <field name="applicability">taxes</field>
+    </record>
+
+    <record id="tag_bo_05" model="account.account.tag">
+        <field name="name">Impuesto Cobrado</field>
+        <field name="applicability">taxes</field>
+    </record>
+
+    <record id="tag_bo_06" model="account.account.tag">
+        <field name="name">Impuesto Cobrado Fuera de Ámbito</field>
+        <field name="applicability">taxes</field>
+    </record>
+
+    <record id="tag_bo_07" model="account.account.tag">
+        <field name="name">Impuesto Cobrado de Exonerados al IVA</field>
+        <field name="applicability">taxes</field>
+    </record>
+
+    <record id="tag_bo_08" model="account.account.tag">
+        <field name="name">Impuesto Cobrado IVA</field>
+        <field name="applicability">taxes</field>
+    </record>
+
+    <record id="tag_bo_09" model="account.account.tag">
+        <field name="name">Impuesto Pagado</field>
+        <field name="applicability">taxes</field>
+    </record>
+
+    <record id="tag_bo_10" model="account.account.tag">
+        <field name="name">Impuesto Pagado Fuera de Ámbito</field>
+        <field name="applicability">taxes</field>
+    </record>
+
+    <record id="tag_bo_11" model="account.account.tag">
+        <field name="name">Impuesto Pagado de Exonerados al IVA</field>
+        <field name="applicability">taxes</field>
+    </record>
+
+    <record id="tag_bo_12" model="account.account.tag">
+        <field name="name">Impuesto Pagado IVA</field>
+        <field name="applicability">taxes</field>
+    </record>
+
+    <record id="tag_bo_13" model="account.account.tag">
+        <field name="name">Base Imponible</field>
+        <field name="applicability">taxes</field>
+    </record>
+
+    <record id="tag_bo_14" model="account.account.tag">
+        <field name="name">Base Imponible - Compras</field>
+        <field name="applicability">taxes</field>
+    </record>
+
+    <record id="tag_bo_15" model="account.account.tag">
+        <field name="name">Compras Gravadas Fuera de Ámbito</field>
+        <field name="applicability">taxes</field>
+    </record>
+
+    <record id="tag_bo_16" model="account.account.tag">
+        <field name="name">Compras NO Gravadas (Exoneradas)</field>
+        <field name="applicability">taxes</field>
+    </record>
+
+    <record id="tag_bo_17" model="account.account.tag">
+        <field name="name">Compras Gravadas con IVA</field>
+        <field name="applicability">taxes</field>
+    </record>
+
+    <record id="tag_bo_18" model="account.account.tag">
+        <field name="name">Base Imponible - Ventas</field>
+        <field name="applicability">taxes</field>
+    </record>
+
+    <record id="tag_bo_19" model="account.account.tag">
+        <field name="name">Ventas Gravadas Fuera de Ámbito</field>
+        <field name="applicability">taxes</field>
+    </record>
+
+    <record id="tag_bo_20" model="account.account.tag">
+        <field name="name">Ventas NO Gravadas (Exoneradas)</field>
+        <field name="applicability">taxes</field>
+    </record>
+
+    <record id="tag_bo_21" model="account.account.tag">
+        <field name="name">Impuesto al Valor Agregado con IVA</field>
         <field name="applicability">taxes</field>
     </record>
 
@@ -27,7 +117,7 @@
       <field name="include_base_amount">1</field>
       <field name="refund_account_id" ref="231"/>
       <field name="account_id" ref="231"/>
-      <field name="tag_ids" eval="[(6,0,[ref('tag_ITAX_21_OUT')])]"/>
+      <field name="tag_ids" eval="[(6,0,[ref('tag_bo_08'),ref('tag_bo_21') ])]"/>
     </record>
 
     <record id="OTAX_21" model="account.tax.template">
@@ -39,7 +129,7 @@
       <field name="include_base_amount">1</field>
       <field name="refund_account_id" ref="231"/>
       <field name="account_id" ref="231"/>
-      <field name="tag_ids" eval="[(6,0,[ref('tag_OTAX_21_IN')])]"/>
+      <field name="tag_ids" eval="[(6,0,[ref('tag_bo_12'), ref('tag_bo_17')])]"/>
     </record>
 
     <record id="ITAX_03" model="account.tax.template">
@@ -51,7 +141,7 @@
       <field name="type_tax_use">sale</field>
       <field name="refund_account_id" ref="232"/>
       <field name="account_id" ref="232"/>
-      <field name="tag_ids" eval="[(6,0,[ref('tag_ITAX_03_OUT')])]"/>
+      <field name="tag_ids" eval="[(6,0,[ref('tag_bo_03'), ref('tag_bo_21')])]"/>
     </record>
 
 </odoo>
diff --git a/addons/l10n_bo/migrations/2.0/post-migrate_tags_on_taxes.py b/addons/l10n_bo/migrations/2.0/post-migrate_tags_on_taxes.py
new file mode 100644
index 00000000000..fa56fd00dfa
--- /dev/null
+++ b/addons/l10n_bo/migrations/2.0/post-migrate_tags_on_taxes.py
@@ -0,0 +1,6 @@
+from openerp.modules.registry import RegistryManager
+
+def migrate(cr, version):
+    registry = RegistryManager.get(cr.dbname)
+    from openerp.addons.account.models.chart_template import migrate_tags_on_taxes
+    migrate_tags_on_taxes(cr, registry)
diff --git a/addons/l10n_cl/__openerp__.py b/addons/l10n_cl/__openerp__.py
index 686c92a62f5..278afda5bd3 100644
--- a/addons/l10n_cl/__openerp__.py
+++ b/addons/l10n_cl/__openerp__.py
@@ -5,7 +5,7 @@
 
 {
     'name': 'Chile - Accounting',
-    'version': '1.0',
+    'version': '2.0',
     'description': """
 Chilean accounting chart and tax localization.
 ==============================================
diff --git a/addons/l10n_cl/account_tax.xml b/addons/l10n_cl/account_tax.xml
index bb138d7c8b0..1455b61851d 100644
--- a/addons/l10n_cl/account_tax.xml
+++ b/addons/l10n_cl/account_tax.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-  <data noupdate="1">
+  <data>
         <record id="action_client_l10n_cl_menu" model="ir.actions.client">
             <field name="name">Open Account Dashboard Menu</field>
             <field name="tag">reload</field>
@@ -13,13 +13,103 @@
   </data>
      <!-- Account Tags -->
 
-    <record id="tag_IVA_19%_Venta" model="account.account.tag">
-        <field name="name">IVA 19% Venta</field>
+     <record id="tag_cl_01" model="account.account.tag">
+        <field name="name">Impuestos Directos a Pagar</field>
         <field name="applicability">taxes</field>
     </record>
 
-    <record id="tag_IVA_19%_Compra" model="account.account.tag">
-        <field name="name">IVA 19% Compra</field>
+    <record id="tag_cl_02" model="account.account.tag">
+        <field name="name">Impuesto a la Renta Primera Categoría a Pagar</field>
+        <field name="applicability">taxes</field>
+    </record>
+
+    <record id="tag_cl_03" model="account.account.tag">
+        <field name="name">Impuesto General a las Ventas (IVA) Total a Pagar</field>
+        <field name="applicability">taxes</field>
+    </record>
+
+    <record id="tag_cl_04" model="account.account.tag">
+        <field name="name">Impuesto Pagado</field>
+        <field name="applicability">taxes</field>
+    </record>
+
+    <record id="tag_cl_05" model="account.account.tag">
+        <field name="name">Impuesto Pagado IVA</field>
+        <field name="applicability">taxes</field>
+    </record>
+
+    <record id="tag_cl_06" model="account.account.tag">
+        <field name="name">Impuesto Pagado de Exonerados al IVA</field>
+        <field name="applicability">taxes</field>
+    </record>
+
+    <record id="tag_cl_07" model="account.account.tag">
+        <field name="name">Impuesto Pagado Fuera de Ámbito</field>
+        <field name="applicability">taxes</field>
+    </record>
+
+    <record id="tag_cl_08" model="account.account.tag">
+        <field name="name">Impuesto Cobrado</field>
+        <field name="applicability">taxes</field>
+    </record>
+
+    <record id="tag_cl_09" model="account.account.tag">
+        <field name="name">Impuesto Cobrado IVA</field>
+        <field name="applicability">taxes</field>
+    </record>
+
+    <record id="tag_cl_10" model="account.account.tag">
+        <field name="name">Impuesto Cobrado de Exonerados al IVA</field>
+        <field name="applicability">taxes</field>
+    </record>
+
+    <record id="tag_cl_11" model="account.account.tag">
+        <field name="name">Impuesto Cobrado Fuera de Ámbito</field>
+        <field name="applicability">taxes</field>
+    </record>
+
+   <record id="tag_cl_12" model="account.account.tag">
+        <field name="name">Base Imponible</field>
+        <field name="applicability">taxes</field>
+    </record>
+
+    <record id="tag_cl_13" model="account.account.tag">
+        <field name="name">Base Imponible - Ventas</field>
+        <field name="applicability">taxes</field>
+    </record>
+
+    <record id="tag_cl_14" model="account.account.tag">
+        <field name="name">Ventas Gravadas con IVA</field>
+        <field name="applicability">taxes</field>
+    </record>
+
+    <record id="tag_cl_15" model="account.account.tag">
+        <field name="name">Ventas NO Gravadas (Exoneradas)</field>
+        <field name="applicability">taxes</field>
+    </record>
+
+    <record id="tag_cl_16" model="account.account.tag">
+        <field name="name">Ventas Gravadas Fuera de Ámbito</field>
+        <field name="applicability">taxes</field>
+    </record>
+
+    <record id="tag_cl_17" model="account.account.tag">
+        <field name="name">Base Imponible - Compras</field>
+        <field name="applicability">taxes</field>
+    </record>
+
+    <record id="tag_cl_18" model="account.account.tag">
+        <field name="name">Compras Gravadas con IVA</field>
+        <field name="applicability">taxes</field>
+    </record>
+
+    <record id="tag_cl_19" model="account.account.tag">
+        <field name="name">Compras NO Gravadas (Exoneradas)</field>
+        <field name="applicability">taxes</field>
+    </record>
+
+    <record id="tag_cl_20" model="account.account.tag">
+        <field name="name">Compras Gravadas Fuera de Ámbito</field>
         <field name="applicability">taxes</field>
     </record>
 
@@ -32,7 +122,7 @@
       <field name="type_tax_use">sale</field>
       <field name="refund_account_id" ref="231"/>
       <field name="account_id" ref="231"/>
-      <field name="tag_ids" eval="[(6,0,[ref('tag_IVA_19%_Venta')])]"/>
+      <field name="tag_ids" eval="[(6,0,[ref('tag_cl_09'), ref('tag_cl_14')])]"/>
     </record>
 
     <record id="OTAX_19" model="account.tax.template">
@@ -44,7 +134,7 @@
       <field name="type_tax_use">purchase</field>
       <field name="refund_account_id" ref="231"/>
       <field name="account_id" ref="231"/>
-      <field name="tag_ids" eval="[(6,0,[ref('tag_IVA_19%_Compra')])]"/>
+      <field name="tag_ids" eval="[(6,0,[ref('tag_cl_05'), ref('tag_cl_18')])]"/>
     </record>
 
 </odoo>
diff --git a/addons/l10n_cl/migrations/2.0/post-migrate_tags_on_taxes.py b/addons/l10n_cl/migrations/2.0/post-migrate_tags_on_taxes.py
new file mode 100644
index 00000000000..fa56fd00dfa
--- /dev/null
+++ b/addons/l10n_cl/migrations/2.0/post-migrate_tags_on_taxes.py
@@ -0,0 +1,6 @@
+from openerp.modules.registry import RegistryManager
+
+def migrate(cr, version):
+    registry = RegistryManager.get(cr.dbname)
+    from openerp.addons.account.models.chart_template import migrate_tags_on_taxes
+    migrate_tags_on_taxes(cr, registry)
diff --git a/addons/l10n_cl/migrations/2.0/pre-set_tags_and_taxes_updatable.py b/addons/l10n_cl/migrations/2.0/pre-set_tags_and_taxes_updatable.py
new file mode 100644
index 00000000000..55d15581a7d
--- /dev/null
+++ b/addons/l10n_cl/migrations/2.0/pre-set_tags_and_taxes_updatable.py
@@ -0,0 +1,6 @@
+from openerp.modules.registry import RegistryManager
+
+def migrate(cr, version):
+    registry = RegistryManager.get(cr.dbname)
+    from openerp.addons.account.models.chart_template import migrate_set_tags_and_taxes_updatable
+    migrate_set_tags_and_taxes_updatable(cr, registry, 'l10n_cl')
diff --git a/addons/mail/static/src/js/chat_manager.js b/addons/mail/static/src/js/chat_manager.js
index d1c17e1b965..14551a258c0 100644
--- a/addons/mail/static/src/js/chat_manager.js
+++ b/addons/mail/static/src/js/chat_manager.js
@@ -338,7 +338,7 @@ function make_channel (data, options) {
     } else if (data.public === "private") {
         channel.type = "private";
     }
-    if ('direct_partner' in data) {
+    if (_.size(data.direct_partner) > 0) {
         channel.type = "dm";
         channel.name = data.direct_partner[0].name;
         channel.direct_partner_id = data.direct_partner[0].id;
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 2ac1033f67e..d2fcfbdfc6c 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -313,7 +313,7 @@ class mrp_bom(osv.osv):
                 continue
 
             if previous_products and bom_line_id.product_id.product_tmpl_id.id in previous_products:
-                raise UserError(_('BoM "%s" contains a BoM line with a product recursion: "%s".') % (master_bom.name,bom_line_id.product_id.name_get()[0][1]))
+                raise UserError(_('BoM "%s" contains a BoM line with a product recursion: "%s".') % (master_bom.code or "", bom_line_id.product_id.name_get()[0][1]))
 
             quantity = _factor(bom_line_id.product_qty * factor, bom_line_id.product_efficiency, bom_line_id.product_rounding)
             bom_id = self._bom_find(cr, uid, product_id=bom_line_id.product_id.id, properties=properties, context=context)
diff --git a/addons/point_of_sale/static/src/css/pos.css b/addons/point_of_sale/static/src/css/pos.css
index cdc92f94def..42372a7fb6f 100644
--- a/addons/point_of_sale/static/src/css/pos.css
+++ b/addons/point_of_sale/static/src/css/pos.css
@@ -1507,6 +1507,12 @@ td {
         font-size: 13px !important;
         width: 266px !important;
     }
+    .o_debug_manager {
+        display: none !important;
+    }
+    .o_chat_window {
+        display: none !important;
+    }
 }
 
 /* d) The Scale screen */
diff --git a/addons/point_of_sale/static/src/js/chrome.js b/addons/point_of_sale/static/src/js/chrome.js
index 0c7d90612ca..ea2febfbf23 100644
--- a/addons/point_of_sale/static/src/js/chrome.js
+++ b/addons/point_of_sale/static/src/js/chrome.js
@@ -759,7 +759,13 @@ var Chrome = PosBaseWidget.extend({
 
 return {
     Chrome: Chrome,
+    DebugWidget: DebugWidget,
+    HeaderButtonWidget: HeaderButtonWidget,
     OrderSelectorWidget: OrderSelectorWidget,
+    ProxyStatusWidget: ProxyStatusWidget,
+    StatusWidget: StatusWidget,
+    SynchNotificationWidget: SynchNotificationWidget,
+    UsernameWidget: UsernameWidget,
 };
 });
 
diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js
index 22c3b662867..e3a217c93cc 100644
--- a/addons/point_of_sale/static/src/js/models.js
+++ b/addons/point_of_sale/static/src/js/models.js
@@ -1537,6 +1537,19 @@ exports.Order = Backbone.Model.extend({
         this.session_id    = json.pos_session_id;
         this.uid = json.uid;
         this.name = _t("Order ") + this.uid;
+
+        if (json.fiscal_position_id) {
+            var fiscal_position = _.find(this.pos.fiscal_positions, function (fp) {
+                return fp.id === json.fiscal_position_id;
+            });
+
+            if (fiscal_position) {
+                this.fiscal_position = fiscal_position;
+            } else {
+                console.error('ERROR: trying to load a fiscal position not available in the pos');
+            }
+        }
+
         if (json.partner_id) {
             client = this.pos.db.get_partner_by_id(json.partner_id);
             if (!client) {
diff --git a/addons/point_of_sale/static/src/js/screens.js b/addons/point_of_sale/static/src/js/screens.js
index beffd60af28..15fba3f1975 100644
--- a/addons/point_of_sale/static/src/js/screens.js
+++ b/addons/point_of_sale/static/src/js/screens.js
@@ -1962,6 +1962,11 @@ return {
     ProductScreenWidget: ProductScreenWidget,
     ProductListWidget: ProductListWidget,
     ClientListScreenWidget: ClientListScreenWidget,
+    ActionpadWidget: ActionpadWidget,
+    DomCache: DomCache,
+    ProductCategoriesWidget: ProductCategoriesWidget,
+    ScaleScreenWidget: ScaleScreenWidget,
+    set_fiscal_position_button: set_fiscal_position_button,
 };
 
 });
diff --git a/addons/project/i18n/project.pot b/addons/project/i18n/project.pot
index 9c05ae7364d..e376d3e83c5 100644
--- a/addons/project/i18n/project.pot
+++ b/addons/project/i18n/project.pot
@@ -1242,6 +1242,13 @@ msgstr ""
 msgid "Development Process"
 msgstr ""
 
+#. module: project
+#. openerp-web
+#: code:addons/project/static/src/js/project.js:50
+#, python-format
+msgid "Discard"
+msgstr ""
+
 #. module: project
 #: model:ir.model.fields,field_description:project.field_project_config_settings_display_name
 #: model:ir.model.fields,field_description:project.field_project_project_display_name
@@ -1410,6 +1417,11 @@ msgid "Every business is different.<br/>\n"
 "                    Odoo allows you to customize every application and it's usually a good idea to customize screens to fit your project needs."
 msgstr ""
 
+#. module: project
+#: model:web.tip,description:project.project_tip_3
+msgid "Every event on a task is logged in this section. Send a new message to notify followers or log an internal note."
+msgstr ""
+
 #. module: project
 #: model:ir.ui.view,arch_db:project.project_planner
 msgid "Examples"
@@ -2385,6 +2397,12 @@ msgstr ""
 msgid "Project Tasks"
 msgstr ""
 
+#. module: project
+#: model:ir.model.fields,field_description:project.field_res_company_project_time_mode_id
+#: model:ir.model.fields,field_description:project.project_time_mode_id_duplicate_xmlid
+msgid "Project Time Unit"
+msgstr ""
+
 #. module: project
 #: model:res.request.link,name:project.req_link_task
 msgid "Project task"
@@ -2399,15 +2417,23 @@ msgstr ""
 #: code:addons/project/project.py:282
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.actions.act_window,name:project.open_view_project_all_config
+#: model:ir.model.fields,field_description:project.field_account_analytic_account_project_ids
+#: model:ir.model.fields,field_description:project.field_project_project_project_ids
 #: model:ir.model.fields,field_description:project.field_project_task_type_project_ids
 #: model:ir.ui.menu,name:project.menu_projects_config
 #: model:ir.ui.menu,name:project.portal_services_projects
+#: model:ir.ui.view,arch_db:project.analytic_account_inherited_form
 #: model:ir.ui.view,arch_db:project.task_company
 #: model:ir.ui.view,arch_db:project.view_project
 #, python-format
 msgid "Projects"
 msgstr ""
 
+#. module: project
+#: model:ir.ui.view,arch_db:project.task_type_edit
+msgid "Projects using this stage"
+msgstr ""
+
 #. module: project
 #: model:ir.model.fields,help:project.field_project_config_settings_module_project_issue_sheet
 msgid "Provides timesheet support for the issues/bugs management in project.\n"
@@ -2511,6 +2537,13 @@ msgstr ""
 msgid "Remaining Time"
 msgstr ""
 
+#. module: project
+#. openerp-web
+#: code:addons/project/static/src/js/project.js:48
+#, python-format
+msgid "Remove Cover Image"
+msgstr ""
+
 #. module: project
 #: model:ir.ui.view,arch_db:project.project_planner
 msgid "Repair Workshop"
@@ -2583,6 +2616,13 @@ msgstr ""
 msgid "Search Project"
 msgstr ""
 
+#. module: project
+#. openerp-web
+#: code:addons/project/static/src/js/project.js:46
+#, python-format
+msgid "Select"
+msgstr ""
+
 #. module: project
 #: model:ir.ui.view,arch_db:project.project_planner
 msgid "Send an alert when a task is stuck in red for more than a few days"
@@ -2722,6 +2762,11 @@ msgstr ""
 msgid "Starting Date"
 msgstr ""
 
+#. module: project
+#: model:ir.model.fields,field_description:project.field_project_project_account_type
+msgid "State"
+msgstr ""
+
 #. module: project
 #: model:ir.model.fields,field_description:project.field_project_project_state
 #: model:ir.model.fields,field_description:project.field_report_project_task_user_state
@@ -2729,6 +2774,11 @@ msgstr ""
 msgid "Status"
 msgstr ""
 
+#. module: project
+#: model:ir.model.fields,field_description:project.field_project_project_subscription_ids
+msgid "Subscriptions"
+msgstr ""
+
 #. module: project
 #: sql_constraint:project.tags:0
 msgid "Tag name already exists !"
@@ -2866,6 +2916,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:project.action_view_task
 #: model:ir.model.fields,field_description:project.field_account_analytic_account_use_tasks
 #: model:ir.model.fields,field_description:project.field_project_project_task_count
+#: model:ir.model.fields,field_description:project.field_project_project_task_needaction_count
 #: model:ir.model.fields,field_description:project.field_project_project_use_tasks
 #: model:ir.model.fields,field_description:project.field_res_partner_task_ids
 #: model:ir.ui.menu,name:project.menu_action_view_task
@@ -3024,6 +3075,7 @@ msgstr ""
 
 #. module: project
 #: model:ir.model.fields,help:project.field_res_company_project_time_mode_id
+#: model:ir.model.fields,help:project.project_time_mode_id_duplicate_xmlid
 msgid "This will set the unit of measure used in projects and tasks.\n"
 "If you use the timesheet linked to projects (project_timesheet module), don't forget to setup the right unit of measure in your employees."
 msgstr ""
@@ -3423,6 +3475,9 @@ msgid "to describe<br/> your experience or to suggest improvements !"
 msgstr ""
 
 #. module: project
+#: model:ir.model.fields,field_description:project.field_account_analytic_account_project_count
+#: model:ir.model.fields,field_description:project.field_project_project_project_count
+#: model:ir.model.fields,field_description:project.field_project_project_subscription_count
 #: model:ir.model.fields,field_description:project.field_project_project_task_ids
 msgid "unknown"
 msgstr ""
diff --git a/addons/project_issue_sheet/project_issue_sheet_view.xml b/addons/project_issue_sheet/project_issue_sheet_view.xml
index bd34c011bd2..4f54078ab27 100644
--- a/addons/project_issue_sheet/project_issue_sheet_view.xml
+++ b/addons/project_issue_sheet/project_issue_sheet_view.xml
@@ -24,7 +24,7 @@
                                 <field name="date"/>
                                 <field name="user_id" required="1"/>
                                 <field name="name"/>
-                                <field name="account_id" invisible="0" domain="[('account_type, '=', 'normal'), ('partner_id', '=', parent.partner_id)]" options="{'no_open': True, 'no_create': True}" groups="analytic.group_analytic_accounting"/>
+                                <field name="account_id" invisible="0" domain="[('account_type', '=', 'normal'), ('partner_id', '=', parent.partner_id)]" options="{'no_open': True, 'no_create': True}" groups="analytic.group_analytic_accounting"/>
                                 <field name="unit_amount" string="Duration" widget="float_time"/>
                                 <field name="is_timesheet" invisible="1"/>
                             </tree>
diff --git a/addons/purchase/i18n/purchase.pot b/addons/purchase/i18n/purchase.pot
index 6e49fef5436..0f726bcc722 100644
--- a/addons/purchase/i18n/purchase.pot
+++ b/addons/purchase/i18n/purchase.pot
@@ -446,6 +446,11 @@ msgstr ""
 msgid "Click to define a new product."
 msgstr ""
 
+#. module: purchase
+#: model:web.tip,description:purchase.purchase_tip_1
+msgid "Click to mark products as received."
+msgstr ""
+
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_open_invoice
 msgid "Click to record a vendor bill related to this purchase."
@@ -578,6 +583,11 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
+#. module: purchase
+#: model:ir.model.fields,field_description:purchase.field_purchase_order_default_location_dest_id_usage
+msgid "Destination Location Type"
+msgstr ""
+
 #. module: purchase
 #: model:ir.model.fields,field_description:purchase.field_purchase_config_settings_display_name
 #: model:ir.model.fields,field_description:purchase.field_purchase_order_display_name
@@ -664,6 +674,11 @@ msgstr ""
 msgid "Get 2 levels of approvals to confirm a purchase order"
 msgstr ""
 
+#. module: purchase
+#: model:web.tip,description:purchase.purchase_tip_3
+msgid "Get all the shipments related to this order."
+msgstr ""
+
 #. module: purchase
 #: model:ir.ui.view,arch_db:purchase.purchase_order_line_search
 #: model:ir.ui.view,arch_db:purchase.view_purchase_order_filter
@@ -684,6 +699,11 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
+#. module: purchase
+#: model:web.tip,description:purchase.purchase_tip_2
+msgid "If a product has been broken or damaged during the transport, you can scrap it with this button."
+msgstr ""
+
 #. module: purchase
 #: model:ir.ui.view,arch_db:purchase.purchase_order_form
 msgid "If a purchase order is done, you cannot modify it manually anymore. You will not be able to receive invoices anymore for this purchase order."
@@ -1108,6 +1128,11 @@ msgstr ""
 msgid "Provide a double validation mechanism for purchases"
 msgstr ""
 
+#. module: purchase
+#: model:ir.model.fields,field_description:purchase.field_mail_mail_website_published
+msgid "Published"
+msgstr ""
+
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_procurement_management
 msgid "Purchase"
@@ -1460,6 +1485,11 @@ msgstr ""
 msgid "Taxes"
 msgstr ""
 
+#. module: purchase
+#: model:ir.model.fields,help:purchase.field_purchase_order_default_location_dest_id_usage
+msgid "Technical field used to display the Drop Ship Address"
+msgstr ""
+
 #. module: purchase
 #: model:ir.model.fields,field_description:purchase.field_purchase_order_notes
 msgid "Terms and Conditions"
@@ -1671,6 +1701,11 @@ msgid "Vendors bills can be pre-generated based on purchase\n"
 "                    document in Odoo."
 msgstr ""
 
+#. module: purchase
+#: model:ir.model.fields,help:purchase.field_mail_mail_website_published
+msgid "Visible on the website as a comment"
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.order,invoice_status:0
 msgid "Waiting Invoices"
@@ -1725,3 +1760,8 @@ msgstr ""
 msgid "purchase.config.settings"
 msgstr ""
 
+#. module: purchase
+#: model:ir.model.fields,field_description:purchase.field_mail_mail_description
+msgid "unknown"
+msgstr ""
+
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 8408a1d5f9a..1d45ea88278 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -537,7 +537,7 @@
 
         <record model="ir.actions.act_window" id="action_purchase_line_product_tree">
             <field name="context">{}</field>
-            <field name="domain">[('product_id','in',active_ids)]</field>
+            <field name="domain">[('product_id.product_tmpl_id','in',active_ids)]</field>
             <field name="name">Purchases</field>
             <field name="res_model">purchase.order.line</field>
             <field name="view_id" ref="purchase_order_line_tree"/>
diff --git a/addons/sale/i18n/sale.pot b/addons/sale/i18n/sale.pot
index 2ce03cb92df..193c460faf2 100644
--- a/addons/sale/i18n/sale.pot
+++ b/addons/sale/i18n/sale.pot
@@ -394,6 +394,7 @@ msgid "Customer Reference"
 msgstr ""
 
 #. module: sale
+#: model:ir.model.fields,field_description:sale.field_product_product_taxes_id
 #: model:ir.model.fields,field_description:sale.field_sale_advance_payment_inv_deposit_taxes_id
 msgid "Customer Taxes"
 msgstr ""
@@ -585,6 +586,11 @@ msgstr ""
 msgid "Enable customer portal to track orders, delivery and invoices"
 msgstr ""
 
+#. module: sale
+#: model:ir.model.fields,field_description:sale.field_product_product_property_account_expense_id
+msgid "Expense Account"
+msgstr ""
+
 #. module: sale
 #: model:ir.model.fields,field_description:sale.field_sale_order_validity_date
 msgid "Expiration Date"
@@ -664,6 +670,7 @@ msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: sale
+#: model:ir.model.fields,field_description:sale.field_product_product_property_account_income_id
 #: model:ir.model.fields,field_description:sale.field_sale_advance_payment_inv_deposit_account_id
 msgid "Income Account"
 msgstr ""
@@ -1628,11 +1635,33 @@ msgstr ""
 msgid "There is no income account defined for this product: \"%s\". You may have to install a chart of account from Accounting app, settings menu."
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:316
+#, python-format
+msgid "There is no invoicable line."
+msgstr ""
+
 #. module: sale
 #: model:ir.ui.view,arch_db:sale.view_order_product_search
 msgid "This Year"
 msgstr ""
 
+#. module: sale
+#: model:ir.model.fields,help:sale.field_product_product_property_account_expense_id
+msgid "This account will be used for invoices instead of the default one to value expenses for the current product."
+msgstr ""
+
+#. module: sale
+#: model:ir.model.fields,help:sale.field_product_product_property_account_income_id
+msgid "This account will be used for invoices instead of the default one to value sales for the current product."
+msgstr ""
+
+#. module: sale
+#: model:web.tip,description:sale.sale_tip_1
+msgid "This progress bar shows the stages your quotation will go through.\n"
+"                Use buttons on the left to move forward to the next stages."
+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."
@@ -1720,6 +1749,11 @@ msgstr ""
 msgid "Untaxed Amount"
 msgstr ""
 
+#. module: sale
+#: model:ir.model.fields,field_description:sale.field_sale_report_price_subtotal
+msgid "Untaxed Total Price"
+msgstr ""
+
 #. module: sale
 #: model:ir.ui.view,arch_db:sale.view_sales_order_filter
 msgid "Upselling"
@@ -1731,6 +1765,12 @@ msgstr ""
 msgid "Upselling Opportunity"
 msgstr ""
 
+#. module: sale
+#: model:web.tip,description:sale.sale_tip_2
+msgid "Use pivot and graph views to analyze your sales pipeline.\n"
+"                Select measures, filter and group dimensions to get the perfect report according to your needs."
+msgstr ""
+
 #. module: sale
 #: model:ir.model.fields,field_description:sale.field_sale_config_settings_group_sale_pricelist
 msgid "Use pricelists to adapt your price per customers"
diff --git a/addons/web_tip/i18n/web_tip.pot b/addons/web_tip/i18n/web_tip.pot
index ba49b02dcbb..906161d1911 100644
--- a/addons/web_tip/i18n/web_tip.pot
+++ b/addons/web_tip/i18n/web_tip.pot
@@ -41,6 +41,11 @@ msgstr ""
 msgid "Consumed by"
 msgstr ""
 
+#. module: web_tip
+#: model:web.tip,description:web_tip.web_tip_3
+msgid "Create one column per stage in your working process. For example, in a development project, stages might be: Specifications, Development, Test, Done."
+msgstr ""
+
 #. module: web_tip
 #: model:ir.model.fields,field_description:web_tip.field_web_tip_create_uid
 msgid "Created by"
@@ -81,6 +86,11 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
+#. module: web_tip
+#: model:web.tip,description:web_tip.web_tip_4
+msgid "If you're done with this item, click here to archive it. It won't appear again, but you can display it with the 'Archived' filter, and reactivate it if necessary."
+msgstr ""
+
 #. module: web_tip
 #: model:ir.model.fields,field_description:web_tip.field_web_tip___last_update
 msgid "Last Modified on"
@@ -127,6 +137,11 @@ msgstr ""
 msgid "Model type, e.g. lead or opportunity for crm.lead"
 msgstr ""
 
+#. module: web_tip
+#: model:web.tip,description:web_tip.web_tip_1
+msgid "Navigate easily between documents using the navigation path to go back to previous screens."
+msgstr ""
+
 #. module: web_tip
 #: model:ir.model.fields,field_description:web_tip.field_web_tip_placement
 msgid "Placement"
@@ -137,6 +152,11 @@ msgstr ""
 msgid "Popover placement, bottom, top, left or right"
 msgstr ""
 
+#. module: web_tip
+#: model:web.tip,description:web_tip.web_tip_2
+msgid "Save time and change the document stage right here, no need to go back to your pipeline."
+msgstr ""
+
 #. module: web_tip
 #: model:ir.model.fields,help:web_tip.field_web_tip_action_id
 msgid "The action that will trigger the tip"
diff --git a/addons/web_tip/web_tip.py b/addons/web_tip/web_tip.py
index 0ff1068b20b..f13631fbd46 100644
--- a/addons/web_tip/web_tip.py
+++ b/addons/web_tip/web_tip.py
@@ -13,7 +13,7 @@ class tip(models.Model):
         self.is_consumed = self.env.user in self.user_ids
 
     title = fields.Char('Tip title')
-    description = fields.Html('Tip Description', required=True)
+    description = fields.Html('Tip Description', required=True, translate=True)
     action_id = fields.Many2one('ir.actions.act_window', string="Action",
         help="The action that will trigger the tip")
     model = fields.Char("Model", help="Model name on which to trigger the tip, e.g. 'res.partner'.")
diff --git a/addons/website_event_sale/views/website_event_sale.xml b/addons/website_event_sale/views/website_event_sale.xml
index 047e9e5a4d1..f58e426bf94 100644
--- a/addons/website_event_sale/views/website_event_sale.xml
+++ b/addons/website_event_sale/views/website_event_sale.xml
@@ -80,6 +80,9 @@
         <button type="submit" t-if="event.state == 'confirm' and (event.seats_available or event.seats_availability == 'unlimited')"
             class="btn btn-primary btn-lg pull-right a-submit" t-attf-id="#{event.id}">Order Now</button>
     </xpath>
+    <xpath expr="//form[@id='registration_form']" position="attributes">
+        <attribute name="t-if">event.event_ticket_ids</attribute>
+    </xpath>
 </template>
 
 <template id="cart" inherit_id="website_sale.cart_lines" name="Hide product reduction for event tickets">
diff --git a/addons/website_event_track/i18n/website_event_track.pot b/addons/website_event_track/i18n/website_event_track.pot
index a60ec8ed568..08c1350a70c 100644
--- a/addons/website_event_track/i18n/website_event_track.pot
+++ b/addons/website_event_track/i18n/website_event_track.pot
@@ -771,6 +771,11 @@ msgstr ""
 msgid "Submit Proposal"
 msgstr ""
 
+#. module: website_event_track
+#: model:web.tip,description:website_event_track.event_track_tip_1
+msgid "Switch to the calendar view to see the availability of each room."
+msgstr ""
+
 #. module: website_event_track
 #: model:ir.model.fields,field_description:website_event_track.field_event_track_tag_name
 msgid "Tag"
diff --git a/addons/website_quote/i18n/website_quote.pot b/addons/website_quote/i18n/website_quote.pot
index 09702446222..1225de3941f 100644
--- a/addons/website_quote/i18n/website_quote.pot
+++ b/addons/website_quote/i18n/website_quote.pot
@@ -97,6 +97,11 @@ msgid "\n"
 "            "
 msgstr ""
 
+#. module: website_quote
+#: model:ir.ui.view,arch_db:website_quote.so_quotation
+msgid "! You can"
+msgstr ""
+
 #. module: website_quote
 #: model:mail.template,report_name:website_quote.email_template_edi_sale
 msgid "${(object.name or '').replace('/','_')}_${object.state == 'draft' and 'draft' or ''}"
@@ -1041,6 +1046,11 @@ msgstr ""
 msgid "Payment Transaction"
 msgstr ""
 
+#. module: website_quote
+#: model:web.tip,description:website_quote.quotation_tip_1
+msgid "Preview the online quotation. You'll be able to edit the quotation content before send it to the customer."
+msgstr ""
+
 #. module: website_quote
 #: model:ir.ui.view,arch_db:website_quote.optional_products
 #: model:ir.ui.view,arch_db:website_quote.pricing
@@ -1359,6 +1369,11 @@ msgstr ""
 msgid "These courses feature the same high quality course content found in our traditional classroom trainings, supplemented with modular sessions and cloud-based labs. Many of our online learning courses also include dozens of recorded webinars and live sessions by our senior instructors. At the end of the training, you can pass the Odoo Certification exam in one of the 5000+ Pearson VUE test centers worldwide."
 msgstr ""
 
+#. module: website_quote
+#: model:ir.ui.view,arch_db:website_quote.so_quotation
+msgid "This order"
+msgstr ""
+
 #. module: website_quote
 #: model:ir.ui.view,arch_db:website_quote.so_quotation
 msgid "This order has been validated. Thanks for your trust\n"
@@ -1580,6 +1595,21 @@ msgid "for\n"
 "                          any question."
 msgstr ""
 
+#. module: website_quote
+#: model:ir.ui.view,arch_db:website_quote.so_quotation
+msgid "has already been cancelled"
+msgstr ""
+
+#. module: website_quote
+#: model:ir.ui.view,arch_db:website_quote.so_quotation
+msgid "has already been validated"
+msgstr ""
+
+#. module: website_quote
+#: model:ir.ui.view,arch_db:website_quote.so_quotation
+msgid "has not yet been sent"
+msgstr ""
+
 #. module: website_quote
 #: model:ir.ui.view,arch_db:website_quote.so_quotation
 msgid "if you want a new one."
diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index 7001a4d30d0..e71f56b7fa0 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -633,7 +633,8 @@ class website_sale(http.Controller):
                 shipping_info['lang'] = partner_lang
             shipping_info['parent_id'] = partner_id
             checkout['shipping_id'] = orm_partner.create(cr, SUPERUSER_ID, shipping_info, context)
-            order.write({'partner_shipping_id': checkout.get('shipping_id')})
+        if checkout.get('shipping_id'):
+            order.write({'partner_shipping_id': checkout['shipping_id']})
 
         order_obj.onchange_partner_shipping_id(cr, SUPERUSER_ID, [order.id], context=context)
         order.order_line._compute_tax_id()
diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml
index 6784fb9eeca..3dc01f720e8 100644
--- a/addons/website_sale/views/templates.xml
+++ b/addons/website_sale/views/templates.xml
@@ -541,13 +541,13 @@
       <div class="container mt32" t-if="product.alternative_product_ids">
           <h3>Suggested alternatives:</h3>
           <div class='row mt16' style="">
-          <t t-foreach="product.alternative_product_ids" t-as="product">
+          <t t-foreach="product.alternative_product_ids" t-as="alt_product">
               <div class='col-md-2 thumbnail' style='width: 170px; height:130px; float:left; display:inline; margin-right: 10px; overflow:hidden;'>
                   <div class='mt16 text-center' style="height: 100%;">
-                      <div t-field="product.image_small" t-field-options='{"widget": "image", "class": "img-rounded shadow o_alternative_product" }'/>
+                      <div t-field="alt_product.image_small" t-field-options='{"widget": "image", "class": "img-rounded shadow o_alternative_product" }'/>
                       <h5>
-                          <a t-attf-href="/shop/product/#{ slug(product) }" style="display: block">
-                              <span t-att-title='product.name' t-field='product.name' style="display: block;"/>
+                          <a t-attf-href="/shop/product/#{ slug(alt_product) }" style="display: block">
+                              <span t-att-title='alt_product.name' t-field='alt_product.name' style="display: block;"/>
                           </a>
                       </h5>
                   </div>
diff --git a/doc/cla/individual/cpyou.md b/doc/cla/individual/cpyou.md
new file mode 100644
index 00000000000..b512f63d8f4
--- /dev/null
+++ b/doc/cla/individual/cpyou.md
@@ -0,0 +1,11 @@
+China, 2016-01-14
+
+I hereby agree to the terms of the Odoo Individual Contributor License
+Agreement v1.0.
+
+I declare that I am authorized and able to make this agreement and sign this
+declaration.
+
+Signed,
+
+Chen puyu neptunesaber@gmail.com https://github.com/cpyou
\ No newline at end of file
diff --git a/doc/cla/individual/iceseyes.md b/doc/cla/individual/iceseyes.md
new file mode 100644
index 00000000000..3ab72ac9fb0
--- /dev/null
+++ b/doc/cla/individual/iceseyes.md
@@ -0,0 +1,11 @@
+Italy, 22 January 2016
+
+I hereby agree to the terms of the Odoo Individual Contributor License
+Agreement v1.0.
+
+I declare that I am authorized and able to make this agreement and sign this
+declaration.
+
+Signed,
+
+Bianchi Massimo bianchi.massimo@gmail.com https://github.com/iceseyes
diff --git a/doc/cla/individual/tstonis.md b/doc/cla/individual/tstonis.md
new file mode 100644
index 00000000000..7b571b73c65
--- /dev/null
+++ b/doc/cla/individual/tstonis.md
@@ -0,0 +1,12 @@
+USA, 2016-01-16
+
+I hereby agree to the terms of the Odoo Individual Contributor License
+Agreement v1.0.
+
+I declare that I am authorized and able to make this agreement and sign this
+declaration.
+
+Signed,
+
+Timothy Stonis tim@opoet.com https://github.com/tstonis
+
diff --git a/openerp/addons/base/ir/ir_model.py b/openerp/addons/base/ir/ir_model.py
index c48a0a322aa..5fd40315cd8 100644
--- a/openerp/addons/base/ir/ir_model.py
+++ b/openerp/addons/base/ir/ir_model.py
@@ -602,7 +602,9 @@ class ir_model_constraint(Model):
         ids.reverse()
         for data in self.browse(cr, uid, ids, context):
             model = data.model.model
-            model_obj = self.pool[model]
+            model_obj = self.pool.get(model)
+            if not model_obj:
+                continue
             name = openerp.tools.ustr(data.name)
             typ = data.type
 
@@ -1219,7 +1221,7 @@ class ir_model_data(osv.osv):
                         _logger.info('Deleting orphan external_ids %s', external_ids)
                         self.unlink(cr, uid, external_ids)
                         continue
-                    if field.name in openerp.models.LOG_ACCESS_COLUMNS and self.pool[field.model]._log_access:
+                    if field.name in openerp.models.LOG_ACCESS_COLUMNS and field.model in self.pool and self.pool[field.model]._log_access:
                         continue
                     if field.name == 'id':
                         continue
diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index 1a51dec4f57..f3459e090b8 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -548,8 +548,9 @@ class res_partner(osv.Model, format_address):
 
     @api.model
     def create(self, vals):
-        if vals.get('type') and not self._context.get('partner_type'):
-            self = self.with_context(partner_type=vals['type'])
+        if vals.get('type') in ['delivery', 'invoice'] and not vals.get('image'):
+            # force no colorize for images with no transparency
+            vals['image'] = self.with_context(partner_type=vals['type'])._get_default_image(False, False)
         if vals.get('website'):
             vals['website'] = self._clean_website(vals['website'])
         # function field not correctly triggered at create -> remove me when
diff --git a/openerp/models.py b/openerp/models.py
index 0861956eec2..98c462ff067 100644
--- a/openerp/models.py
+++ b/openerp/models.py
@@ -2091,7 +2091,7 @@ class BaseModel(object):
             self._inherits_join_calc(cr, uid, self._table, f, query, context=context),
             f,
         )
-        select_terms = ["%s(%s) AS %s" % field_formatter(f) for f in aggregated_fields]
+        select_terms = ['%s(%s) AS "%s" ' % field_formatter(f) for f in aggregated_fields]
 
         for gb in annotated_groupbys:
             select_terms.append('%s as "%s" ' % (gb['qualified_field'], gb['groupby']))