diff --git a/addons/account/partner.py b/addons/account/partner.py
index ecc8c7facb2..9c1f13f6e81 100644
--- a/addons/account/partner.py
+++ b/addons/account/partner.py
@@ -30,7 +30,8 @@ class account_fiscal_position(osv.osv):
         'name': fields.char('Fiscal Position', size=64, translate=True, required=True),
         'company_id': fields.many2one('res.company', 'Company'),
         'account_ids': fields.one2many('account.fiscal.position.account', 'position_id', 'Account Mapping'),
-        'tax_ids': fields.one2many('account.fiscal.position.tax', 'position_id', 'Tax Mapping')
+        'tax_ids': fields.one2many('account.fiscal.position.tax', 'position_id', 'Tax Mapping'),
+        'note': fields.text('Notes', translate=True),
     }
 
     def map_tax(self, cr, uid, fposition_id, taxes, context={}):
diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index 33aeda3640b..d93349d9f62 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -11,7 +11,8 @@
                     <field name="name" select="1"/>
                     <field name="company_id"/>
                     <newline/>
-                    <field name="tax_ids" colspan="4">
+                    <field name="note" colspan="4"/>
+                    <field name="tax_ids" colspan="4" widget="one2many_list">
                         <tree string="Tax Mapping" editable="bottom">
                             <field name="tax_src_id" domain="[('parent_id','=',False)]"/>
                             <field name="tax_dest_id" domain="[('parent_id','=',False)]"/>
@@ -21,7 +22,7 @@
                             <field name="tax_dest_id" domain="[('parent_id','=',False)]"/>
                         </form>
                     </field>
-                    <field name="account_ids" colspan="4">
+                    <field name="account_ids" colspan="4" widget="one2many_list">
                         <tree string="Account Mapping" editable="bottom">
                             <field name="account_src_id"/>
                             <field name="account_dest_id"/>
diff --git a/addons/account/report/invoice.rml b/addons/account/report/invoice.rml
index 876b6bc4813..10d50610720 100644
--- a/addons/account/report/invoice.rml
+++ b/addons/account/report/invoice.rml
@@ -404,5 +404,19 @@
     <para style="terp_default_2">
       <font color="white"> </font>
     </para>
+    <blockTable colWidths="128.0,402.0" style="Table1">
+      <tr>
+        <td>
+          <para style="terp_default_Bold_9">Fiscal Position Remark :</para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[ o.fiscal_position and format(o.fiscal_position.note) or removeParentNode('blockTable') ]]</para>
+        </td>
+       </tr>
+     </blockTable>
+     <para style="terp_default_2">
+       <font color="white"> </font>
+     </para>
+    
   </story>
 </document>
diff --git a/addons/purchase/wizard/wizard_group.py b/addons/purchase/wizard/wizard_group.py
index 0ddfec5fbce..65c09f33593 100644
--- a/addons/purchase/wizard/wizard_group.py
+++ b/addons/purchase/wizard/wizard_group.py
@@ -27,13 +27,20 @@ import netsvc
 import pooler
 from osv.orm import browse_record, browse_null
 
+
 merge_form = """<?xml version="1.0"?>
 <form string="Merge orders">
     <separator string="Are you sure you want to merge these orders ?"/>
     <newline/>
-    <label string="Please note that orders will only be merged if they are to the same partner and going to the same location, and lines will only be merged if they are exactly the same except for the quantity and unit."/>
+    <label>Please note that:
+      - orders will only be merged if:
+        * their status is draft
+        * they belong to the same partner
+        * are going to the same location
+      - lines will only be merged if:
+        * they are exactly the same except for the quantity and unit</label>
 </form>
-"""
+""" 
 
 merge_fields = {
 }
diff --git a/addons/report_task/i18n/ar_AR.po b/addons/report_task/i18n/ar_AR.po
index 06f4007a448..75cc7a86d42 100644
--- a/addons/report_task/i18n/ar_AR.po
+++ b/addons/report_task/i18n/ar_AR.po
@@ -168,5 +168,3 @@ msgstr ""
 #: field:report.closed.task,project_id:0
 msgid "Project"
 msgstr ""
-
-#. module: repo
\ No newline at end of file
diff --git a/addons/report_task/i18n/bg_BG.po b/addons/report_task/i18n/bg_BG.po
index a0505c84ae3..724965b4579 100644
--- a/addons/report_task/i18n/bg_BG.po
+++ b/addons/report_task/i18n/bg_BG.po
@@ -157,4 +157,14 @@ msgstr ""
 #. module: report_task
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "Невалиден XML за преглед
\ No newline at end of file
+msgstr "Невалиден XML за преглед"
+
+#. module: report_task
+#: field:report.closed.task,delay_hours:0
+msgid "Delay Hours"
+msgstr ""
+
+#. module: report_task
+#: field:report.closed.task,project_id:0
+msgid "Project"
+msgstr ""
diff --git a/addons/report_task/i18n/bs_BS.po b/addons/report_task/i18n/bs_BS.po
index 0c44d1ba279..af1743751a3 100644
--- a/addons/report_task/i18n/bs_BS.po
+++ b/addons/report_task/i18n/bs_BS.po
@@ -165,4 +165,6 @@ msgid "Delay Hours"
 msgstr ""
 
 #. module: report_task
-#: field:report.closed.task,project_id:0
\ No newline at end of file
+#: field:report.closed.task,project_id:0
+msgid "Project"
+msgstr ""
diff --git a/addons/report_task/i18n/ca_ES.po b/addons/report_task/i18n/ca_ES.po
index 15571a391d2..1471669afe0 100644
--- a/addons/report_task/i18n/ca_ES.po
+++ b/addons/report_task/i18n/ca_ES.po
@@ -161,4 +161,10 @@ msgstr "XML invàlid per a la definició de la vista!"
 
 #. module: report_task
 #: field:report.closed.task,delay_hours:0
-ms
\ No newline at end of file
+msgid "Delay Hours"
+msgstr ""
+
+#. module: report_task
+#: field:report.closed.task,project_id:0
+msgid "Project"
+msgstr ""
\ No newline at end of file
diff --git a/addons/report_task/i18n/cs_CS.po b/addons/report_task/i18n/cs_CS.po
index bb86578a3d3..af2b6458328 100644
--- a/addons/report_task/i18n/cs_CS.po
+++ b/addons/report_task/i18n/cs_CS.po
@@ -169,4 +169,3 @@ msgstr ""
 msgid "Project"
 msgstr ""
 
-#. module: repo
\ No newline at end of file
diff --git a/addons/report_task/i18n/cs_CZ.po b/addons/report_task/i18n/cs_CZ.po
index bfd8c0305c2..419eadaf046 100644
--- a/addons/report_task/i18n/cs_CZ.po
+++ b/addons/report_task/i18n/cs_CZ.po
@@ -168,5 +168,3 @@ msgstr ""
 #: field:report.closed.task,project_id:0
 msgid "Project"
 msgstr ""
-
-#. module: repo
\ No newline at end of file
diff --git a/addons/report_task/i18n/de_DE.po b/addons/report_task/i18n/de_DE.po
index 80aa37c3abd..2e0fc9473a3 100644
--- a/addons/report_task/i18n/de_DE.po
+++ b/addons/report_task/i18n/de_DE.po
@@ -169,4 +169,3 @@ msgstr ""
 msgid "Project"
 msgstr ""
 
-#. module: repo
\ No newline at end of file
diff --git a/addons/report_task/i18n/es_AR.po b/addons/report_task/i18n/es_AR.po
index 9b12dcb2603..855e8864046 100644
--- a/addons/report_task/i18n/es_AR.po
+++ b/addons/report_task/i18n/es_AR.po
@@ -169,4 +169,3 @@ msgstr ""
 msgid "Project"
 msgstr ""
 
-#. module: repo
\ No newline at end of file
diff --git a/addons/report_task/i18n/es_ES.po b/addons/report_task/i18n/es_ES.po
index 2efb4e53dae..c0cb073759b 100644
--- a/addons/report_task/i18n/es_ES.po
+++ b/addons/report_task/i18n/es_ES.po
@@ -160,4 +160,12 @@ msgid "Invalid XML for View Architecture!"
 msgstr "¡XML inválido para la definición de la vista!"
 
 #. module: report_task
-#: field:report.closed.task,delay_hours:
\ No newline at end of file
+#: field:report.closed.task,delay_hours:0
+msgid "Delay Hours"
+msgstr ""
+
+#. module: report_task
+#: field:report.closed.task,project_id:0
+msgid "Project"
+msgstr ""
+
diff --git a/addons/report_task/i18n/et_EE.po b/addons/report_task/i18n/et_EE.po
index 999dc8e2151..917c52e295d 100644
--- a/addons/report_task/i18n/et_EE.po
+++ b/addons/report_task/i18n/et_EE.po
@@ -160,4 +160,12 @@ msgid "Invalid XML for View Architecture!"
 msgstr "Vigane XML vaate arhitektuurile!"
 
 #. module: report_task
-#: field:report.close
\ No newline at end of file
+#: field:report.closed.task,delay_hours:0
+msgid "Delay Hours"
+msgstr ""
+
+#. module: report_task
+#: field:report.closed.task,project_id:0
+msgid "Project"
+msgstr ""
+
diff --git a/addons/report_task/i18n/fr_FR.po b/addons/report_task/i18n/fr_FR.po
index 6caaac91dc9..3555e02a532 100644
--- a/addons/report_task/i18n/fr_FR.po
+++ b/addons/report_task/i18n/fr_FR.po
@@ -168,5 +168,3 @@ msgstr ""
 #: field:report.closed.task,project_id:0
 msgid "Project"
 msgstr ""
-
-#. module: repo
\ No newline at end of file
diff --git a/addons/report_task/i18n/hr_HR.po b/addons/report_task/i18n/hr_HR.po
index d0839a03f6a..a8320aef6d8 100644
--- a/addons/report_task/i18n/hr_HR.po
+++ b/addons/report_task/i18n/hr_HR.po
@@ -169,4 +169,3 @@ msgstr ""
 msgid "Project"
 msgstr ""
 
-#. module: repo
\ No newline at end of file
diff --git a/addons/report_task/i18n/hu_HU.po b/addons/report_task/i18n/hu_HU.po
index c9cea9f3cfe..c7aa5591ce3 100644
--- a/addons/report_task/i18n/hu_HU.po
+++ b/addons/report_task/i18n/hu_HU.po
@@ -169,4 +169,3 @@ msgstr ""
 msgid "Project"
 msgstr ""
 
-#. module: repo
\ No newline at end of file
diff --git a/addons/report_task/i18n/it_IT.po b/addons/report_task/i18n/it_IT.po
index a02ed0373f9..ce2f19502d5 100644
--- a/addons/report_task/i18n/it_IT.po
+++ b/addons/report_task/i18n/it_IT.po
@@ -160,4 +160,12 @@ msgid "Invalid XML for View Architecture!"
 msgstr "XML non valido per Visualizzazione Architettura!"
 
 #. module: report_task
-#: field:report.closed.task,delay_hou
\ No newline at end of file
+#: field:report.closed.task,delay_hours:0
+msgid "Delay Hours"
+msgstr ""
+
+#. module: report_task
+#: field:report.closed.task,project_id:0
+msgid "Project"
+msgstr ""
+
diff --git a/addons/report_task/i18n/lt_LT.po b/addons/report_task/i18n/lt_LT.po
index 91e24ed5f5a..d2c83df0ef1 100644
--- a/addons/report_task/i18n/lt_LT.po
+++ b/addons/report_task/i18n/lt_LT.po
@@ -169,4 +169,3 @@ msgstr ""
 msgid "Project"
 msgstr ""
 
-#. module: repo
\ No newline at end of file
diff --git a/addons/report_task/i18n/nl_BE.po b/addons/report_task/i18n/nl_BE.po
index aa79109b3b9..26382d06424 100644
--- a/addons/report_task/i18n/nl_BE.po
+++ b/addons/report_task/i18n/nl_BE.po
@@ -165,4 +165,7 @@ msgid "Delay Hours"
 msgstr ""
 
 #. module: report_task
-#: fiel
\ No newline at end of file
+#: field:report.closed.task,project_id:0
+msgid "Project"
+msgstr ""
+
diff --git a/addons/report_task/i18n/nl_NL.po b/addons/report_task/i18n/nl_NL.po
index 56e69e13356..cefb0d894e5 100644
--- a/addons/report_task/i18n/nl_NL.po
+++ b/addons/report_task/i18n/nl_NL.po
@@ -162,4 +162,10 @@ msgstr "Ongeldige XML voor overzicht"
 #. module: report_task
 #: field:report.closed.task,delay_hours:0
 msgid "Delay Hours"
-m
\ No newline at end of file
+msgstr ""
+
+#. module: report_task
+#: field:report.closed.task,project_id:0
+msgid "Project"
+msgstr ""
+
diff --git a/addons/report_task/i18n/pl_PL.po b/addons/report_task/i18n/pl_PL.po
index 0b41059e48e..4b4fe77c1cf 100644
--- a/addons/report_task/i18n/pl_PL.po
+++ b/addons/report_task/i18n/pl_PL.po
@@ -160,4 +160,12 @@ msgid "Invalid XML for View Architecture!"
 msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
 
 #. module: report_task
-#: field:report.closed.task,
\ No newline at end of file
+#: field:report.closed.task,delay_hours:0
+msgid "Delay Hours"
+msgstr ""
+
+#. module: report_task
+#: field:report.closed.task,project_id:0
+msgid "Project"
+msgstr ""
+
diff --git a/addons/report_task/i18n/pt_BR.po b/addons/report_task/i18n/pt_BR.po
index 99ba1039cd7..6013e9bccd6 100644
--- a/addons/report_task/i18n/pt_BR.po
+++ b/addons/report_task/i18n/pt_BR.po
@@ -161,4 +161,11 @@ msgstr "Invalido XML para Arquitetura da View"
 
 #. module: report_task
 #: field:report.closed.task,delay_hours:0
-msgid "Del
\ No newline at end of file
+msgid "Delay Hours"
+msgstr ""
+
+#. module: report_task
+#: field:report.closed.task,project_id:0
+msgid "Project"
+msgstr ""
+
diff --git a/addons/report_task/i18n/pt_PT.po b/addons/report_task/i18n/pt_PT.po
index bd8f192c291..fb144115dfd 100644
--- a/addons/report_task/i18n/pt_PT.po
+++ b/addons/report_task/i18n/pt_PT.po
@@ -161,4 +161,11 @@ msgstr "XML inválido para a arquitectura de vista"
 
 #. module: report_task
 #: field:report.closed.task,delay_hours:0
-msgid
\ No newline at end of file
+msgid "Delay Hours"
+msgstr ""
+
+#. module: report_task
+#: field:report.closed.task,project_id:0
+msgid "Project"
+msgstr ""
+
diff --git a/addons/report_task/i18n/report_task.pot b/addons/report_task/i18n/report_task.pot
index 8c8160dae23..28f5dcf9742 100644
--- a/addons/report_task/i18n/report_task.pot
+++ b/addons/report_task/i18n/report_task.pot
@@ -169,4 +169,3 @@ msgstr ""
 msgid "Project"
 msgstr ""
 
-#. module: repo
\ No newline at end of file
diff --git a/addons/report_task/i18n/ro_RO.po b/addons/report_task/i18n/ro_RO.po
index 5a65c4ef14f..cc5a7e15945 100644
--- a/addons/report_task/i18n/ro_RO.po
+++ b/addons/report_task/i18n/ro_RO.po
@@ -169,4 +169,3 @@ msgstr ""
 msgid "Project"
 msgstr ""
 
-#. module: repo
\ No newline at end of file
diff --git a/addons/report_task/i18n/ru_RU.po b/addons/report_task/i18n/ru_RU.po
index b26ab5fbb10..df07cb5601e 100644
--- a/addons/report_task/i18n/ru_RU.po
+++ b/addons/report_task/i18n/ru_RU.po
@@ -157,4 +157,15 @@ msgstr ""
 #. module: report_task
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "Неправильный XML д
\ No newline at end of file
+msgstr "Неправильный XML д!"
+
+#. module: report_task
+#: field:report.closed.task,delay_hours:0
+msgid "Delay Hours"
+msgstr ""
+
+#. module: report_task
+#: field:report.closed.task,project_id:0
+msgid "Project"
+msgstr ""
+
diff --git a/addons/report_task/i18n/sl_SL.po b/addons/report_task/i18n/sl_SL.po
index 3b1cff02e71..edeeb98081c 100644
--- a/addons/report_task/i18n/sl_SL.po
+++ b/addons/report_task/i18n/sl_SL.po
@@ -161,4 +161,11 @@ msgstr "Neveljaven XML za arhitekturo pogleda."
 
 #. module: report_task
 #: field:report.closed.task,delay_hours:0
-msgid "Delay Hou
\ No newline at end of file
+msgid "Delay Hours"
+msgstr ""
+
+#. module: report_task
+#: field:report.closed.task,project_id:0
+msgid "Project"
+msgstr ""
+
diff --git a/addons/report_task/i18n/sv_SE.po b/addons/report_task/i18n/sv_SE.po
index f414cc4630f..051cb7381d1 100644
--- a/addons/report_task/i18n/sv_SE.po
+++ b/addons/report_task/i18n/sv_SE.po
@@ -165,4 +165,7 @@ msgid "Delay Hours"
 msgstr ""
 
 #. module: report_task
-#: 
\ No newline at end of file
+#: field:report.closed.task,project_id:0
+msgid "Project"
+msgstr ""
+
diff --git a/addons/report_task/i18n/sv_SV.po b/addons/report_task/i18n/sv_SV.po
index 859a526b645..542aa51581b 100644
--- a/addons/report_task/i18n/sv_SV.po
+++ b/addons/report_task/i18n/sv_SV.po
@@ -165,4 +165,7 @@ msgid "Delay Hours"
 msgstr ""
 
 #. module: report_task
-#: 
\ No newline at end of file
+#: field:report.closed.task,project_id:0
+msgid "Project"
+msgstr ""
+
diff --git a/addons/report_task/i18n/tr_TR.po b/addons/report_task/i18n/tr_TR.po
index b0310457714..ba807c47638 100644
--- a/addons/report_task/i18n/tr_TR.po
+++ b/addons/report_task/i18n/tr_TR.po
@@ -165,4 +165,7 @@ msgid "Delay Hours"
 msgstr ""
 
 #. module: report_task
-#: field:report.closed.task,project_id:0
\ No newline at end of file
+#: field:report.closed.task,project_id:0
+msgid "Project"
+msgstr ""
+
diff --git a/addons/report_task/i18n/uk_UK.po b/addons/report_task/i18n/uk_UK.po
index a7454f42fa5..1530dae5e85 100644
--- a/addons/report_task/i18n/uk_UK.po
+++ b/addons/report_task/i18n/uk_UK.po
@@ -157,4 +157,15 @@ msgstr ""
 #. module: report_task
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "Неправильний XML для Архітектури �
\ No newline at end of file
+msgstr "Неправильний XML для Архітектури �"
+
+#. module: report_task
+#: field:report.closed.task,delay_hours:0
+msgid "Delay Hours"
+msgstr ""
+
+#. module: report_task
+#: field:report.closed.task,project_id:0
+msgid "Project"
+msgstr ""
+
diff --git a/addons/report_task/i18n/zh_CN.po b/addons/report_task/i18n/zh_CN.po
index 4045dfd4475..679c0c1ac11 100644
--- a/addons/report_task/i18n/zh_CN.po
+++ b/addons/report_task/i18n/zh_CN.po
@@ -169,4 +169,3 @@ msgstr ""
 msgid "Project"
 msgstr ""
 
-#. module
\ No newline at end of file
diff --git a/addons/report_task/i18n/zh_TW.po b/addons/report_task/i18n/zh_TW.po
index 445fe8a6d57..d95473ea87e 100644
--- a/addons/report_task/i18n/zh_TW.po
+++ b/addons/report_task/i18n/zh_TW.po
@@ -169,4 +169,3 @@ msgstr ""
 msgid "Project"
 msgstr ""
 
-#. module: repo
\ No newline at end of file